nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

progress: Add 'display-download-progress'. 

* guix/progress.scm (display-download-progress): New procedure.
(progress-reporter/file)[render]: Rewrite in terms of
'display-download-progress'.
This commit is contained in:
Ludovic Courtès 2018-09-25 10:30:21 +02:00
parent 363d7d6608
commit fe65b559a6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
guix/progress.scm
View File

@ -39,6 +39,7 @@
progress-reporter/file progress-reporter/file
progress-reporter/bar progress-reporter/bar
display-download-progress
byte-count->string byte-count->string
current-terminal-columns current-terminal-columns
@ -183,6 +184,42 @@ width of the bar is BAR-WIDTH."
move the cursor to the beginning of the line." move the cursor to the beginning of the line."
(display "\r\x1b[K" port)) (display "\r\x1b[K" port))
(define* (display-download-progress file size
#:key
start-time (transferred 0)
(log-port (current-error-port)))
"Write the progress report to LOG-PORT. Use START-TIME (a SRFI-19 time
object) and TRANSFERRED (a total number of bytes) to determine the
throughput."
(define elapsed
(duration->seconds
(time-difference (current-time time-monotonic) start-time)))
(if (number? size)
(let* ((% (* 100.0 (/ transferred size)))
(throughput (/ transferred elapsed))
(left (format #f " ~a ~a" file
(byte-count->string size)))
(right (format #f "~a/s ~a ~a~6,1f%"
(byte-count->string throughput)
(seconds->string elapsed)
(progress-bar %) %)))
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
(force-output log-port))
(let* ((throughput (/ transferred elapsed))
(left (format #f " ~a" file))
(right (format #f "~a/s ~a | ~a transferred"
(byte-count->string throughput)
(seconds->string elapsed)
(byte-count->string transferred))))
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
(force-output log-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))
@ -192,37 +229,10 @@ ABBREVIATION used to shorten FILE for display."
(let ((start-time (current-time time-monotonic)) (let ((start-time (current-time time-monotonic))
(transferred 0)) (transferred 0))
(define (render) (define (render)
"Write the progress report to LOG-PORT." (display-download-progress (abbreviation file) size
(define elapsed #:start-time start-time
(duration->seconds #:transferred transferred
(time-difference (current-time time-monotonic) start-time))) #:log-port log-port))
(if (number? size)
(let* ((% (* 100.0 (/ transferred size)))
(throughput (/ transferred elapsed))
(left (format #f " ~a ~a"
(abbreviation file)
(byte-count->string size)))
(right (format #f "~a/s ~a ~a~6,1f%"
(byte-count->string throughput)
(seconds->string elapsed)
(progress-bar %) %)))
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
(force-output log-port))
(let* ((throughput (/ transferred elapsed))
(left (format #f " ~a"
(abbreviation file)))
(right (format #f "~a/s ~a | ~a transferred"
(byte-count->string throughput)
(seconds->string elapsed)
(byte-count->string transferred))))
(erase-current-line log-port)
(display (string-pad-middle left right
(current-terminal-columns))
log-port)
(force-output log-port))))
(progress-reporter (progress-reporter
(start render) (start render)