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

publish: Introduce 'actual-compression'. 

* guix/scripts/publish.scm (actual-compression): New procedure.
(narinfo-string): Use it.
This commit is contained in:
Ludovic Courtès 2017-04-17 23:11:28 +02:00
parent 1563d6c79f
commit 905ae5276d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/scripts/publish.scm
View File

@ -110,6 +110,13 @@ Publish ~a over HTTP.\n") %store-directory)
;; Since we compress on the fly, default to fast compression. ;; Since we compress on the fly, default to fast compression.
(compression 'gzip 3)) (compression 'gzip 3))
(define (actual-compression item requested)
"Return the actual compression used for ITEM, which may be %NO-COMPRESSION
if ITEM is already compressed."
(if (compressed-file? item)
%no-compression
requested))
(define %options (define %options
(list (option '(#\h "help") #f #f (list (option '(#\h "help") #f #f
(lambda _ (lambda _
@ -218,9 +225,7 @@ compression disabled~%"))
if STORE-PATH is invalid. Produce a URL that corresponds to COMPRESSION. The if STORE-PATH is invalid. Produce a URL that corresponds to COMPRESSION. The
narinfo is signed with KEY. NAR-PATH specifies the prefix for nar URLs." narinfo is signed with KEY. NAR-PATH specifies the prefix for nar URLs."
(let* ((path-info (query-path-info store store-path)) (let* ((path-info (query-path-info store store-path))
(compression (if (compressed-file? store-path) (compression (actual-compression store-path compression))
%no-compression
compression))
(url (encode-and-join-uri-path (url (encode-and-join-uri-path
`(,@(split-and-decode-uri-path nar-path) `(,@(split-and-decode-uri-path nar-path)
,@(match compression ,@(match compression