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

download: Fix some minor progress-logging regressions. 

* guix/build/download.scm
  (string-pad-middle): Allow resulting padded string to overflow.
  (store-url-abbreviation): Remove unnecessary procedure.
  (progress-proc): Use BASENAME as default for parameter 'abbreviation'.
  (url-fetch): Display extra newlines for readability.
This commit is contained in:
Steve Sprang 2015-09-17 04:22:01 -07:00 committed by Mark H Weaver
parent 1a6c4c2f37
commit 9462882889
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
guix/build/download.scm
View File

@ -101,15 +101,14 @@ width of the bar is BAR-WIDTH."
(define (string-pad-middle left right len) (define (string-pad-middle left right len)
"Combine LEFT and RIGHT with enough padding in the middle so that the "Combine LEFT and RIGHT with enough padding in the middle so that the
resulting string has length at least LEN. This right justifies RIGHT." resulting string has length at least LEN (it may overflow). If the string
(string-append left does not overflow, the last char in RIGHT will be flush with the LEN
(string-pad right (max 0 (- len (string-length left)))))) column."
(let* ((total-used (+ (string-length left)
(define (store-url-abbreviation url) (string-length right)))
"Return a friendlier version of URL for display." (num-spaces (max 1 (- len total-used)))
(let ((store-path (string-append (%store-directory) "/" (basename url)))) (padding (make-string num-spaces #\space)))
;; Take advantage of the implementation for store paths. (string-append left padding right)))
(store-path-abbreviation store-path)))
(define* (store-path-abbreviation store-path #:optional (prefix-length 6)) (define* (store-path-abbreviation store-path #:optional (prefix-length 6))
"Return an abbreviation of STORE-PATH for display, showing PREFIX-LENGTH "Return an abbreviation of STORE-PATH for display, showing PREFIX-LENGTH
@ -121,7 +120,7 @@ characters of the hash."
(define* (progress-proc file size (define* (progress-proc file size
#:optional (log-port (current-output-port)) #:optional (log-port (current-output-port))
#:key (abbreviation identity)) #:key (abbreviation basename))
"Return a procedure to show the progress of FILE's download, which is SIZE "Return a procedure to show the progress of FILE's download, which is SIZE
bytes long. The returned procedure is suitable for use as an argument to bytes long. The returned procedure is suitable for use as an argument to
`dump-port'. The progress report is written to LOG-PORT, with ABBREVIATION `dump-port'. The progress report is written to LOG-PORT, with ABBREVIATION
@ -519,7 +518,7 @@ on success."
(_ (list (string->uri url)))))) (_ (list (string->uri url))))))
(define (fetch uri file) (define (fetch uri file)
(format #t "starting download of `~a' from `~a'...~%" (format #t "~%Starting download of ~a~%From ~a...~%"
file (uri->string uri)) file (uri->string uri))
(case (uri-scheme uri) (case (uri-scheme uri)
((http https) ((http https)