ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: Make better use of the better progress bar.

Browse source 
Commit 189525412e introduced
‘high-resolution’ Unicode progress bars, but these require more granular
calls to reach their full potential.

* guix/git.scm (show-progress): Derive the number of PROGRESS-BAR
updates from its maximum resolution, rather than hard-coding 100.
This commit is contained in:
Tobias Geerinckx-Rice 2023-02-19 01:00:00 +01:00
parent 98e2a15b1e
commit 5d10644371
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
guix/git.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2021 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -141,11 +142,6 @@ (define (show-progress progress)
(define total
(indexer-progress-total-objects progress))
(define hundredth
(match (quotient total 100)
(0 1)
(x x)))
(define-values (done label)
(if (< (indexer-progress-received-objects progress) total)
(values (indexer-progress-received-objects progress)
@ -156,14 +152,22 @@ (define-values (done label)
(define %
(* 100. (/ done total)))
(when (and (< % 100) (zero? (modulo done hundredth)))
;; TODO: Both should be handled & exposed by the PROGRESS-BAR API instead.
(define width
(max (- (current-terminal-columns)
(string-length label) 7)
3))
(define grain
(match (quotient total (max 100 (* 8 width))) ; assume 1/8 glyph resolution
(0 1)
(x x)))
(when (and (< % 100) (zero? (modulo done grain)))
(erase-current-line (current-error-port))
(let ((width (max (- (current-terminal-columns)
(string-length label) 7)
3)))
(format (current-error-port) "~a ~3,d% ~a"
(format (current-error-port) "~a ~3,d% ~a"
label (inexact->exact (round %))
(progress-bar % width)))
(progress-bar % width))
(force-output (current-error-port)))
(when (= % 100.)