From patchwork Sun Dec 27 14:38:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 25966 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 69FE827BC05; Sun, 27 Dec 2020 14:39:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF9FB1794D for ; Sun, 27 Dec 2020 14:39:11 +0000 (GMT) Received: from localhost ([::1]:34396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktXCQ-0003hm-SW for patchwork@mira.cbaines.net; Sun, 27 Dec 2020 09:39:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktXCI-0003fx-U3 for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktXCI-0003Oj-MQ for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktXCI-0000Je-Kp for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45460] [PATCH 2/5] utils: Support zstd compression via Guile-zstd. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Dec 2020 14:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45460@debbugs.gnu.org Received: via spool by 45460-submit@debbugs.gnu.org id=B45460.16090799031119 (code B ref 45460); Sun, 27 Dec 2020 14:39:02 +0000 Received: (at 45460) by debbugs.gnu.org; 27 Dec 2020 14:38:23 +0000 Received: from localhost ([127.0.0.1]:60496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktXBf-0000Hu-1k for submit@debbugs.gnu.org; Sun, 27 Dec 2020 09:38:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktXBd-0000HT-6W for 45460@debbugs.gnu.org; Sun, 27 Dec 2020 09:38:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49700) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktXBY-00039k-09; Sun, 27 Dec 2020 09:38:16 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51504 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ktXBX-0001Rq-GK; Sun, 27 Dec 2020 09:38:15 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 27 Dec 2020 15:38:06 +0100 Message-Id: <20201227143809.18554-2-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201227143809.18554-1-ludo@gnu.org> References: <20201227143809.18554-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- guix/utils.scm | 12 +++++++++++- tests/utils.scm | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index e3c78959ed..09eee0ecfb 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -209,7 +209,13 @@ buffered data is lost." "Return the lzip port produced by calling PROC (a symbol) on PORT and ARGS. Raise an error if lzlib support is missing." (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) "Return an input port where INPUT is decompressed according to COMPRESSION, @@ -221,6 +227,8 @@ a symbol such as 'xz." ('gzip (filtered-port `(,%gzip "-dc") input)) ('lzip (values (lzip-port 'make-lzip-input-port input) '())) + ('zstd (values (zstd-port 'make-zstd-input-port input) + '())) (_ (error "unsupported compression scheme" compression)))) (define (call-with-decompressed-port compression port proc) @@ -280,6 +288,8 @@ program--e.g., '(\"--fast\")." ('gzip (filtered-output-port `(,%gzip "-c" ,@options) output)) ('lzip (values (lzip-port 'make-lzip-output-port output) '())) + ('zstd (values (zstd-port 'make-zstd-output-port output) + '())) (_ (error "unsupported compression scheme" compression)))) (define* (call-with-compressed-output-port compression port proc diff --git a/tests/utils.scm b/tests/utils.scm index c278b2a277..9bce446d98 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -228,8 +228,10 @@ skip these tests." get-bytevector-all))))) (for-each test-compression/decompression - '(gzip xz lzip) - (list (const #t) (const #t) (const #t))) + `(gzip xz lzip zstd) + (list (const #t) (const #t) (const #t) + (lambda () + (resolve-module '(zstd) #t #f #:ensure #f)))) ;; This is actually in (guix store). (test-equal "store-path-package-name"