me
/
guix
Archived
1
0
Fork 0
Code

progress: Factorize erase-in-line. 

* guix/progress.scm (erase-in-line): New procedure.
(progress-reporter/file): Use it.
master
Ludovic Courtès 2017-11-22 14:05:35 +01:00
parent e695d79dc6
commit 1252dd325b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/progress.scm
View File

@ -153,6 +153,11 @@ width of the bar is BAR-WIDTH."
(make-string filled #\#) (make-string filled #\#)
(make-string empty #\space)))) (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 (define* (progress-reporter/file file size
#:optional (log-port (current-output-port)) #:optional (log-port (current-output-port))
#:key (abbreviation basename)) #:key (abbreviation basename))
@ -176,7 +181,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput) (byte-count->string throughput)
(seconds->string elapsed) (seconds->string elapsed)
(progress-bar %) %))) (progress-bar %) %)))
(display "\r\x1b[K" log-port) (erase-in-line log-port)
(display (string-pad-middle left right (display (string-pad-middle left right
(current-terminal-columns)) (current-terminal-columns))
log-port) log-port)
@ -188,7 +193,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput) (byte-count->string throughput)
(seconds->string elapsed) (seconds->string elapsed)
(byte-count->string transferred)))) (byte-count->string transferred))))
(display "\r\x1b[K" log-port) (erase-in-line log-port)
(display (string-pad-middle left right (display (string-pad-middle left right
(current-terminal-columns)) (current-terminal-columns))
log-port) log-port)