ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: Show better progress bars.

Browse source 
Style provides information on the characters to use before and after the
progress bar content (`[` and `]` for the ascii style), as well as the
character for filled step (`#` for ascii style).  When supported, it
provides intermediate steps.  This is used for unicode style, to show
better precision.

* guix/progress.scm (<progress-bar-style>): New record type.
(ascii-bar-style, unicode-bar-style): New variables.
(progress-bar): Draw progress depending on style.  When supported, use
unicode style.  Fall back to ascii style.
This commit is contained in:
Julien Lepiller 2023-02-03 12:56:03 +01:00
parent 01334a61c7
commit 189525412e
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
guix/progress.scm
View file

@ -166,16 +166,47 @@ (define current-terminal-columns
;; Number of columns of the terminal. ;; Number of columns of the terminal.
(make-parameter 80)) (make-parameter 80))
(define-record-type* <progress-bar-style>
progress-bar-style make-progress-bar-style progress-bar-style?
(start progress-bar-style-start)
(stop progress-bar-style-stop)
(filled progress-bar-style-filled)
(steps progress-bar-style-steps))
(define ascii-bar-style
(progress-bar-style
(start #\[)
(stop #\])
(filled #\#)
(steps '())))
(define unicode-bar-style
(progress-bar-style
(start #\x2595)
(stop #\x258f)
(filled #\x2588)
(steps '(#\x258F #\x258E #\x258D #\x258C #\x258B #\x258A #\x2589))))
(define* (progress-bar % #:optional (bar-width 20)) (define* (progress-bar % #:optional (bar-width 20))
"Return % as a string representing an ASCII-art progress bar. The total "Return % as a string representing an ASCII-art progress bar. The total
width of the bar is BAR-WIDTH." width of the bar is BAR-WIDTH."
(let* ((bar-width (max 3 (- bar-width 2))) (let* ((bar-style (if (equal? (port-encoding (current-output-port)) "UTF-8")
(fraction (/ % 100)) unicode-bar-style
(filled (inexact->exact (floor (* fraction bar-width)))) ascii-bar-style))
(empty (- bar-width filled))) (bar-width (max 3 (- bar-width 2)))
(format #f "[~a~a]" (intermediates (+ (length (progress-bar-style-steps bar-style)) 1))
(make-string filled #\#) (step (inexact->exact (floor (/ (* % bar-width intermediates) 100))))
(make-string empty #\space)))) (filled (quotient step intermediates))
(intermediate
(list-ref (cons #f (progress-bar-style-steps bar-style))
(modulo step intermediates)))
(empty (- bar-width filled (if intermediate 1 0))))
(simple-format #f "~a~a~a~a~a"
(string (progress-bar-style-start bar-style))
(make-string filled (progress-bar-style-filled bar-style))
(if intermediate (string intermediate) "")
(make-string empty #\space)
(string (progress-bar-style-stop bar-style)))))
(define (erase-current-line port) (define (erase-current-line port)
"Write an ANSI erase-current-line sequence to PORT to erase the whole line and "Write an ANSI erase-current-line sequence to PORT to erase the whole line and