From patchwork Tue Aug 15 20:29:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52872 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 816E727BBEA; Tue, 15 Aug 2023 21:33:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5371C27BBEB for ; Tue, 15 Aug 2023 21:33:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qW0i3-00056r-1M; Tue, 15 Aug 2023 16:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qW0i0-00054Q-AR for guix-patches@gnu.org; Tue, 15 Aug 2023 16:32:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qW0i0-0008MC-1W; Tue, 15 Aug 2023 16:32:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qW0hx-0005gh-O2; Tue, 15 Aug 2023 16:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v2 10/13] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 15 Aug 2023 20:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169213147821709 (code B ref 65230); Tue, 15 Aug 2023 20:32:05 +0000 Received: (at 65230) by debbugs.gnu.org; 15 Aug 2023 20:31:18 +0000 Received: from localhost ([127.0.0.1]:36806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0hB-0005dy-RW for submit@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:18 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]:56502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0h7-0005cr-Tw for 65230@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:14 -0400 Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3a78a29bca3so4554568b6e.0 for <65230@debbugs.gnu.org>; Tue, 15 Aug 2023 13:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692131468; x=1692736268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvDbRzPxClF/CYFUkNp+pm1g6bxCyyal/mrJmNA9dow=; b=Q54FghUx5cdwsuWy7l4lMCj3S1XYJasQp6eGhZKiWSFpSvfKHfaaKBjqYDEkuZV/ZT 1wwG7yRVQNP78HzLCeC1yTVU9rZ2ebQ6oeVsptzhNq0G1ZydU5FApG3b1NxkTeBPBbXS 5OAt+4l2atEvAsOCx4VrFp1iGVzpCtYVwuTEqqj2OvkYqV700A61ve4QRdPXNli6GIhm ejVWIHOq6uHeOAkaRQahp7BnhMm+HwAB1nKaw0Reh0mRaQQhjow3XtJHxC0xJGnbnOcV 2YhW8li1QXqFdBzSY7WVDJKFMAFkzA5qyT/6M1d9i9/C6WlufSHbtHU1yPkPRe98cVon +sSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692131468; x=1692736268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvDbRzPxClF/CYFUkNp+pm1g6bxCyyal/mrJmNA9dow=; b=VE3WFSh4PXNpivz24C6t7ZR1kEVlXpqhkI8voigL5yXTeIoD5Nm9x+477a6lc6+CSG FgWFFGGuRDO+PO7KfeomOK0G1OST5/QgWApZeC+1UQVioM7Ue42w5/JTqbwvHSi/Q70E qHGh4fjx4XXRe8nuVNZ9Cl6KAKeT3H2279nCS4J7K2jjzXe6ibyL6Geoi8wwShT3Ld0Q xfCJvWkfQqFtAd0WkPnz6FfILHt2R4SBjJSrPgbJXGzTZXK1pOFrUucKrurpW75A7hed UvGuXbkEQXp8Umrvczqo3201k7vGxvzA1Ax72BTpl81BLWQo66eL8g2WsMkKe0HV/kxt aKNQ== X-Gm-Message-State: AOJu0YxcqLDB1/BrLQf9w+vaubANUYjVjDzWYJQ4UotfAY0ktVdi9aP9 DXtMeHeQOo9N2b3qLLQ5P30NDEdADgI2gw== X-Google-Smtp-Source: AGHT+IH9kvmpPn4nxkZhT4Zzihz51TK4jZ4R3RyPYrIuIqoAaNZlrqpixOwqk870NkNdE2nYbhxAug== X-Received: by 2002:a05:6358:880a:b0:130:f1e5:acc6 with SMTP id hv10-20020a056358880a00b00130f1e5acc6mr36625rwb.8.1692131466521; Tue, 15 Aug 2023 13:31:06 -0700 (PDT) Received: from localhost.localdomain (dsl-148-65.b2b2c.ca. [66.158.148.65]) by smtp.gmail.com with ESMTPSA id f26-20020ac86eda000000b0040fe13251dasm4021078qtv.83.2023.08.15.13.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 13:31:06 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 15 Aug 2023 16:29:34 -0400 Message-ID: <7773174a5afd8623cd7bcce8f906248107f0c15f.1692131377.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com> References: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/gnu-maintenance.scm (canonicalize-url): New procedure, extracted from... (import-html-release): ... here. Use it. Rename inner PACKAGE variable to NAME, to explicit it is a string and not a package object. --- (no changes since v1) guix/gnu-maintenance.scm | 70 +++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 9bab8e9e5f..abba891d4b 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -491,6 +491,33 @@ (define (url->links url) (close-port port) (delete-duplicates (html-links sxml)))) +(define (canonicalize-url url base-url) + "Make relative URL absolute, by appending URL to BASE-URL as required. If +URL is a directory instead of a file, it should be suffixed with a slash (/)." + (cond ((and=> (string->uri url) uri-scheme) + ;; Fully specified URL. + url) + ((string-prefix? "//" url) + ;; Full URL lacking a URI scheme. Reuse the URI scheme of the + ;; document that contains the URL. + (string-append (symbol->string (uri-scheme (string->uri base-url))) + ":" url)) + ((string-prefix? "/" url) + ;; Absolute URL. + (let ((uri (string->uri base-url))) + (uri->string + (build-uri (uri-scheme uri) + #:host (uri-host uri) + #:port (uri-port uri) + #:path url)))) + ;; URL is relative to BASE-URL, which is assumed to be a directory. + ((string-suffix? "/" base-url) + (string-append base-url url)) + (else + ;; URL is relative to BASE-URL, which is assumed to denote a file + ;; within a directory. + (string-append (dirname base-url) "/" url)))) + (define* (import-html-release base-url package #:key (version #f) @@ -508,11 +535,12 @@ (define* (import-html-release base-url package if any. Otherwise, FILE->SIGNATURE must be a procedure; it is passed a source file URL and must return the corresponding signature URL, or #f it signatures are unavailable." - (let* ((package (package-upstream-name package)) + (let* ((name (package-upstream-name package)) (url (if (string-null? directory) base-url (string-append base-url directory "/"))) - (links (url->links url))) + (links (map (cut canonicalize-url <> url) (url->links url)))) + (define (file->signature/guess url) "Return the first link that matches a signature extension, else #f." (let ((base (basename url))) @@ -526,42 +554,12 @@ (define* (import-html-release base-url package (define (url->release url) "Return an object if a release file was found at URL, -else #f." - (let* ((base (basename url)) - (base-url (string-append base-url directory)) - (url (cond ((and=> (string->uri url) uri-scheme) ;full URL? - url) - ;; full URL, except for URI scheme. Reuse the URI - ;; scheme of the document that contains the link. - ((string-prefix? "//" url) - (string-append - (symbol->string (uri-scheme (string->uri base-url))) - ":" url)) - ((string-prefix? "/" url) ;absolute path? - (let ((uri (string->uri base-url))) - (uri->string - (build-uri (uri-scheme uri) - #:host (uri-host uri) - #:port (uri-port uri) - #:path url)))) - - ;; URL is a relative path and BASE-URL may or may not - ;; end in slash. - ((string-suffix? "/" base-url) - (string-append base-url url)) - (else - ;; If DIRECTORY is non-empty, assume BASE-URL - ;; denotes a directory; otherwise, assume BASE-URL - ;; denotes a file within a directory, and that URL - ;; is relative to that directory. - (string-append (if (string-null? directory) - (dirname base-url) - base-url) - "/" url))))) - (and (release-file? package base) +else #f. URL is assumed to fully specified." + (let ((base (basename url))) + (and (release-file? name base) (let ((version (tarball->version base))) (upstream-source - (package package) + (package name) (version version) ;; uri-mirror-rewrite: Don't turn nice mirror:// URIs into ftp:// ;; URLs during "guix refresh -u".