From 157db5d7ff264a5ca6923e95c861feca221b94c0 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 17 Jan 2025 14:11:07 +0800 Subject: [PATCH] import: %cloudflare-warp-updater: Use recutils->alist. * guix/import/rosenthal-updaters.scm (cloudflare-warp-import): Use recutils->alist. --- guix/import/rosenthal-updaters.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/guix/import/rosenthal-updaters.scm b/guix/import/rosenthal-updaters.scm index d7c52ef..883997c 100644 --- a/guix/import/rosenthal-updaters.scm +++ b/guix/import/rosenthal-updaters.scm @@ -1,32 +1,28 @@ (define-module (guix import rosenthal-updaters) - #:use-module (ice-9 regex) - #:use-module (rnrs bytevectors) #:use-module (srfi srfi-71) #:use-module (web client) #:use-module (guix packages) + #:use-module (guix records) #:use-module (guix upstream) #:export (%cloudflare-warp-updater)) (define* (cloudflare-warp-import pkg #:key (version #f)) (let* ((source-uri (assq-ref (package-properties pkg) 'release-monitoring-url)) - (response content (http-get source-uri)) - (content (utf8->string content)) + (response port (http-get source-uri #:streaming? #t)) + (content (recutils->alist port)) + (_ (close port)) (name (package-upstream-name pkg)) (newest-version (or version - (match:substring - (string-match "\nVersion: (.*)\nLicense" content) - 1))) + (assoc-ref content "Version"))) (url (if version (string-append "https://pkg.cloudflareclient.com/" "pool/bookworm/main/c/cloudflare-warp/" "cloudflare-warp_" version "_amd64.deb") (string-append "https://pkg.cloudflareclient.com/" - (match:substring - (string-match "\nFilename: (.*)\nSize" content) - 1))))) + (assoc-ref content "Filename"))))) (upstream-source (package name) (version newest-version)