me/guix
Archived
1
0
Fork 0
Code Activity

utils: Support zstd compression via Guile-zstd.

Browse source 
* guix/utils.scm (lzip-port): Return a single value.
(zstd-port): New procedure.
(decompressed-port, compressed-output-port): Add 'zstd' case.
* tests/utils.scm (test-compression/decompression): Test 'zstd' when
the (zstd) module is available.
This commit is contained in:
Ludovic Courtès 2020-12-26 23:01:05 +01:00
parent 0d04658710
commit db0cecdf6b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/utils.scm
View file

@ -210,7 +210,13 @@ buffered data is lost."
"Return the lzip port produced by calling PROC (a symbol) on PORT and ARGS. "Return the lzip port produced by calling PROC (a symbol) on PORT and ARGS.
Raise an error if lzlib support is missing." Raise an error if lzlib support is missing."
(let ((make-port (module-ref (resolve-interface '(lzlib)) proc))) (let ((make-port (module-ref (resolve-interface '(lzlib)) proc)))
(values (make-port port) '()))) (make-port port)))
(define (zstd-port proc port . args)
"Return the zstd port produced by calling PROC (a symbol) on PORT and ARGS.
Raise an error if zstd support is missing."
(let ((make-port (module-ref (resolve-interface '(zstd)) proc)))
(make-port port)))
(define (decompressed-port compression input) (define (decompressed-port compression input)
"Return an input port where INPUT is decompressed according to COMPRESSION, "Return an input port where INPUT is decompressed according to COMPRESSION,
@ -222,6 +228,8 @@ a symbol such as 'xz."
('gzip (filtered-port `(,%gzip "-dc") input)) ('gzip (filtered-port `(,%gzip "-dc") input))
('lzip (values (lzip-port 'make-lzip-input-port input) ('lzip (values (lzip-port 'make-lzip-input-port input)
'())) '()))
('zstd (values (zstd-port 'make-zstd-input-port input)
'()))
(_ (error "unsupported compression scheme" compression)))) (_ (error "unsupported compression scheme" compression))))
(define (call-with-decompressed-port compression port proc) (define (call-with-decompressed-port compression port proc)
@ -281,6 +289,8 @@ program--e.g., '(\"--fast\")."
('gzip (filtered-output-port `(,%gzip "-c" ,@options) output)) ('gzip (filtered-output-port `(,%gzip "-c" ,@options) output))
('lzip (values (lzip-port 'make-lzip-output-port output) ('lzip (values (lzip-port 'make-lzip-output-port output)
'())) '()))
('zstd (values (zstd-port 'make-zstd-output-port output)
'()))
(_ (error "unsupported compression scheme" compression)))) (_ (error "unsupported compression scheme" compression))))
(define* (call-with-compressed-output-port compression port proc (define* (call-with-compressed-output-port compression port proc

6
tests/utils.scm
View file

@ -228,8 +228,10 @@ skip these tests."
get-bytevector-all))))) get-bytevector-all)))))
(for-each test-compression/decompression (for-each test-compression/decompression
'(gzip xz lzip) `(gzip xz lzip zstd)
(list (const #t) (const #t) (const #t))) (list (const #t) (const #t) (const #t)
(lambda ()
(resolve-module '(zstd) #t #f #:ensure #f))))
;; This is actually in (guix store). ;; This is actually in (guix store).
(test-equal "store-path-package-name" (test-equal "store-path-package-name"