Browse Source

progress: Rename 'erase-in-line' to 'erase-current-line'.

Suggested by Danny Milosavljevic <dannym@scratchpost.org>.

* guix/progress.scm (erase-in-line): Rename to...
(erase-current-line): ... this.  Adjust callers.
gn-latest-20200428
Ludovic Courtès 3 years ago
parent
commit
3e0a42973b
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      guix/progress.scm

+ 6
- 6
guix/progress.scm View File

@ -178,8 +178,8 @@ 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
(define (erase-current-line port)
"Write an ANSI erase-current-line sequence to PORT to erase the whole line and
move the cursor to the beginning of the line."
(display "\r\x1b[K" port))
@ -206,7 +206,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput)
(seconds->string elapsed)
(progress-bar %) %)))
(erase-in-line log-port)
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
@ -218,7 +218,7 @@ ABBREVIATION used to shorten FILE for display."
(byte-count->string throughput)
(seconds->string elapsed)
(byte-count->string transferred))))
(erase-in-line log-port)
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
@ -248,7 +248,7 @@ tasks is performed. Write PREFIX at the beginning of the line."
(set! done (+ 1 done))
(unless (> done total)
(let* ((ratio (* 100. (/ done total))))
(erase-in-line port)
(erase-current-line port)
(if (string-null? prefix)
(display (progress-bar ratio (current-terminal-columns)) port)
(let ((width (- (current-terminal-columns)
@ -263,7 +263,7 @@ tasks is performed. Write PREFIX at the beginning of the line."
(set! done 0)))
(report report-progress)
(stop (lambda ()
(erase-in-line port)
(erase-current-line port)
(unless (string-null? prefix)
(display prefix port)
(newline port))


Loading…
Cancel
Save