diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-05-20 10:52:27 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-06-01 09:10:32 +0200 |
| commit | 4f2fa2f9802d268284aa12accf5705e57dd73d5a (patch) | |
| tree | 32cf92197f17e17faa174b2a18a2112d3f2e4327 /guix | |
| parent | ea55e1355bb3d45d5f04e7cb390d2c6afa8e68e6 (diff) | |
| download | guix-patches-4f2fa2f9802d268284aa12accf5705e57dd73d5a.tar guix-patches-4f2fa2f9802d268284aa12accf5705e57dd73d5a.tar.gz | |
progress: Add a download-size argument to progress-report-port.
* guix/progress.scm (progress-report-port): Add a download-size argument.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/progress.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/guix/progress.scm b/guix/progress.scm index 334bd40547..0cbc804ec1 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -347,15 +347,25 @@ should be a <progress-reporter> object." (report total) (loop total (get-bytevector-n! in buffer 0 buffer-size)))))))) -(define* (progress-report-port reporter port #:key (close? #t)) +(define* (progress-report-port reporter port + #:key + (close? #t) + download-size) "Return a port that continuously reports the bytes read from PORT using REPORTER, which should be a <progress-reporter> object. When CLOSE? is true, -PORT is closed when the returned port is closed." +PORT is closed when the returned port is closed. + +When DOWNLOAD-SIZE is passed, do not read more than DOWNLOAD-SIZE bytes from +PORT. This is important to avoid blocking when the remote side won't close +the underlying connection." (match reporter (($ <progress-reporter> start report stop) (let* ((total 0) (read! (lambda (bv start count) - (let ((n (match (get-bytevector-n! port bv start count) + (let* ((count (if download-size + (min count (- download-size total)) + count)) + (n (match (get-bytevector-n! port bv start count) ((? eof-object?) 0) (x x)))) (set! total (+ total n)) |