diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-22 14:05:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-01 16:00:14 +0100 |
| commit | 1252dd325bbb71387092e9e89ff1ede8ef3f1d5f (patch) | |
| tree | fa73a834c710d2b00d6d6f35b9b60c74cf6c0a52 | |
| parent | e695d79dc692e8e4829f6e5ce627113b328332eb (diff) | |
| download | patches-1252dd325bbb71387092e9e89ff1ede8ef3f1d5f.tar patches-1252dd325bbb71387092e9e89ff1ede8ef3f1d5f.tar.gz | |
progress: Factorize erase-in-line.
* guix/progress.scm (erase-in-line): New procedure.
(progress-reporter/file): Use it.
| -rw-r--r-- | guix/progress.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/guix/progress.scm b/guix/progress.scm index beca2c22a6..1993c74030 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -153,6 +153,11 @@ width of the bar is BAR-WIDTH." (make-string filled #\#) (make-string empty #\space)))) +(define (erase-in-line port) + "Write an ANSI erase-in-line sequence to PORT to erase the whole line and +move the cursor to the beginning of the line." + (display "\r\x1b[K" port)) + (define* (progress-reporter/file file size #:optional (log-port (current-output-port)) #:key (abbreviation basename)) @@ -176,7 +181,7 @@ ABBREVIATION used to shorten FILE for display." (byte-count->string throughput) (seconds->string elapsed) (progress-bar %) %))) - (display "\r\x1b[K" log-port) + (erase-in-line log-port) (display (string-pad-middle left right (current-terminal-columns)) log-port) @@ -188,7 +193,7 @@ ABBREVIATION used to shorten FILE for display." (byte-count->string throughput) (seconds->string elapsed) (byte-count->string transferred)))) - (display "\r\x1b[K" log-port) + (erase-in-line log-port) (display (string-pad-middle left right (current-terminal-columns)) log-port) |