[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/09: guix system: 'init' displays a progress bar while copying.

From: Ludovic Courtès
Subject: 06/09: guix system: 'init' displays a progress bar while copying.
Date: Fri, 1 Dec 2017 10:00:38 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit e261e27676c018f23fb6c6fdc282e2dd40fa1985
Author: Ludovic Courtès <address@hidden>
Date:   Thu Nov 30 14:38:13 2017 +0100

    guix system: 'init' displays a progress bar while copying.
    Until now it would print the name of each store item being copied, which
    was verbose and unhelpful.
    * guix/scripts/system.scm (copy-closure): Use 'progress-reporter/bar'
    and 'call-with-progress-reporter'.
    (guix-system): Parameterize 'current-terminal-columns'.
 guix/scripts/system.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index acfa5fd..91d151d 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -36,6 +36,8 @@
   #:use-module (guix graph)
   #:use-module (guix scripts graph)
   #:use-module (guix build utils)
+  #:use-module (guix progress)
+  #:use-module ((guix build syscalls) #:select (terminal-columns))
   #:use-module (gnu build install)
   #:autoload   (gnu build file-systems)
                  (find-partition-by-label find-partition-by-uuid)
@@ -141,8 +143,18 @@ REFERENCES as its set of references."
 TARGET, and register them."
   (mlet* %store-monad ((to-copy (topologically-sorted* (list item)))
                        (refs    (mapm %store-monad references* to-copy)))
-    (for-each (cut copy-item <> <> target #:log-port log-port)
-              to-copy refs)
+    (define progress-bar
+      (progress-reporter/bar (length to-copy)
+                             (format #f (G_ "copying to '~a'...")
+                                     target)))
+    (call-with-progress-reporter progress-bar
+      (lambda (report)
+        (let ((void (%make-void-port "w")))
+          (for-each (lambda (item refs)
+                      (copy-item item refs target #:log-port void)
+                      (report))
+                    to-copy refs))))
     (return *unspecified*)))
@@ -1092,7 +1104,8 @@ argument list and OPTS is the option alist."
            (args     (option-arguments opts))
            (command  (assoc-ref opts 'action)))
-      (parameterize ((%graft? (assoc-ref opts 'graft?)))
+      (parameterize ((%graft? (assoc-ref opts 'graft?))
+                     (current-terminal-columns (terminal-columns)))
         (process-command command args opts)))))
 ;;; Local Variables:

reply via email to

[Prev in Thread] Current Thread [Next in Thread]