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

database: 'register-items' shows a progress bar. 

* guix/store/database.scm (register-items): Add #:log-port.  Use
'progress-reporter/bar' to show a progress report.
(register-path): Pass #:log-port to 'register-items'.
This commit is contained in:
Ludovic Courtès 2018-09-23 22:51:51 +02:00
parent a387b0bebb
commit f0addd6461
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/store/database.scm
View File

@ -23,6 +23,7 @@
#:use-module (guix serialization) #:use-module (guix serialization)
#:use-module (guix store deduplication) #:use-module (guix store deduplication)
#:use-module (guix base16) #:use-module (guix base16)
#:use-module (guix progress)
#:use-module (guix build syscalls) #:use-module (guix build syscalls)
#:use-module ((guix build utils) #:use-module ((guix build utils)
#:select (mkdir-p executable-file?)) #:select (mkdir-p executable-file?))
@ -234,7 +235,8 @@ be used internally by the daemon's build hook."
#:prefix prefix #:state-directory state-directory #:prefix prefix #:state-directory state-directory
#:deduplicate? deduplicate? #:deduplicate? deduplicate?
#:reset-timestamps? reset-timestamps? #:reset-timestamps? reset-timestamps?
#:schema schema)) #:schema schema
#:log-port (%make-void-port "w")))
(define %epoch (define %epoch
;; When it all began. ;; When it all began.
@ -245,12 +247,14 @@ be used internally by the daemon's build hook."
(deduplicate? #t) (deduplicate? #t)
(reset-timestamps? #t) (reset-timestamps? #t)
registration-time registration-time
(schema (sql-schema))) (schema (sql-schema))
(log-port (current-error-port)))
"Register all of ITEMS, a list of <store-info> records as returned by "Register all of ITEMS, a list of <store-info> records as returned by
'read-reference-graph', in the database under PREFIX/STATE-DIRECTORY. ITEMS 'read-reference-graph', in the database under PREFIX/STATE-DIRECTORY. ITEMS
must be in topological order (with leaves first.) If the database is must be in topological order (with leaves first.) If the database is
initially empty, apply SCHEMA to initialize it. REGISTRATION-TIME must be the initially empty, apply SCHEMA to initialize it. REGISTRATION-TIME must be the
registration time to be recorded in the database; #f means \"now\"." registration time to be recorded in the database; #f means \"now\".
Write a progress report to LOG-PORT."
;; Priority for options: first what is given, then environment variables, ;; Priority for options: first what is given, then environment variables,
;; then defaults. %state-directory, %store-directory, and ;; then defaults. %state-directory, %store-directory, and
@ -302,4 +306,12 @@ registration time to be recorded in the database; #f means \"now\"."
(mkdir-p db-dir) (mkdir-p db-dir)
(parameterize ((sql-schema schema)) (parameterize ((sql-schema schema))
(with-database (string-append db-dir "/db.sqlite") db (with-database (string-append db-dir "/db.sqlite") db
(for-each (cut register db <>) items)))) (let* ((prefix (format #f "registering ~a items" (length items)))
(progress (progress-reporter/bar (length items)
prefix log-port)))
(call-with-progress-reporter progress
(lambda (report)
(for-each (lambda (item)
(register db item)
(report))
items)))))))