civodul pushed a commit to branch wip-pull-reload
in repository guix.
commit 6ca7e3b69008900de36b5acac2782c51c73d943c
Author: Ludovic Courtès <[email protected]>
Date: Wed Nov 22 14:05:35 2017 +0100
progress: Factorize erase-in-line.
* guix/progress.scm (erase-in-line): New procedure.
(progress-reporter/file): Use it.
---
guix/progress.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/progress.scm b/guix/progress.scm
index beca2c2..1993c74 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)
