all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65230@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Christopher Baines" <guix@cbaines.net>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Ludovic Courtès" <ludo@gnu.org>,
	"Mathieu Othacehe" <othacehe@gnu.org>,
	"Ricardo Wurmus" <rekado@elephly.net>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: [bug#65230] [PATCH v2 06/13] gnu-maintenance: Extract url->links procedure.
Date: Tue, 15 Aug 2023 16:29:30 -0400	[thread overview]
Message-ID: <ae444e17b3e5983bbc44619113d2cc0435e88473.1692131377.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com>

* guix/gnu-maintenance.scm (url->links): New procedure.
(import-html-release): Use it.
---

(no changes since v1)

 guix/gnu-maintenance.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index a314923d3b..2e0fc3e8ab 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -483,6 +483,14 @@ (define (html-links sxml)
       (_
        links))))
 
+(define (url->links url)
+  "Return the unique links on the HTML page accessible at URL."
+  (let* ((uri   (string->uri url))
+         (port  (http-fetch/cached uri #:ttl 3600))
+         (sxml  (html->sxml port)))
+    (close-port port)
+    (delete-duplicates (html-links sxml))))
+
 (define* (import-html-release base-url package
                               #:key
                               (version #f)
@@ -499,12 +507,10 @@ (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* ((uri   (string->uri (if (string-null? directory)
-                                 base-url
-                                 (string-append base-url directory "/"))))
-         (port  (http-fetch/cached uri #:ttl 3600))
-         (sxml  (html->sxml port))
-         (links (delete-duplicates (html-links sxml))))
+  (let* ((url (if (string-null? directory)
+                  base-url
+                  (string-append base-url directory "/")))
+         (links (url->links url)))
     (define (file->signature/guess url)
       (let ((base (basename url)))
         (any (lambda (link)
@@ -562,7 +568,6 @@ (define* (import-html-release base-url package
     (define candidates
       (filter-map url->release links))
 
-    (close-port port)
     (match candidates
       (() #f)
       ((first . _)
-- 
2.41.0





  parent reply	other threads:[~2023-08-15 20:32 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-11 18:42 [bug#65230] [PATCH 00/13] Fix 'guix refresh' for Qt and other packages Maxim Cournoyer
2023-08-11 18:44 ` [bug#65230] [PATCH 01/13] gnu-maintenance: Make base-url argument of import-html-release required Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 02/13] download: Add mirrors for Qt Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 03/13] gnu: qt: Streamline qt-urls Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 04/13] gnu: qt-creator: Use mirror://qt for source URI Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 05/13] gnu-maintenance: Fix docstring Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 06/13] gnu-maintenance: Extract url->links procedure Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 07/13] gnu-maintenance: Fix indentation Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 08/13] gnu-maintenance: Accept package object in 'import-html-release' procedure Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 09/13] gnu-maintenance: Document nested procedures in 'import-html-release' Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 10/13] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release' Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 11/13] gnu-maintenance: Add support to rewrite version in URL path Maxim Cournoyer
2023-08-11 18:44   ` [bug#65230] [PATCH 12/13] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater Maxim Cournoyer
2023-08-11 18:45   ` [bug#65230] [PATCH 13/13] gnu-maintenance: Consider Qt source tarballs as "release files" Maxim Cournoyer
2023-08-15 20:29 ` [bug#65230] [PATCH v2 01/13] gnu-maintenance: Make base-url argument of import-html-release required Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 02/13] download: Add mirrors for Qt Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 03/13] gnu: qt: Streamline qt-urls Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 04/13] gnu: qt-creator: Use mirror://qt for source URI Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 05/13] gnu-maintenance: Fix docstring Maxim Cournoyer
2023-08-15 20:29   ` Maxim Cournoyer [this message]
2023-08-15 20:29   ` [bug#65230] [PATCH v2 07/13] gnu-maintenance: Fix indentation Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 08/13] gnu-maintenance: Accept package object in 'import-html-release' procedure Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 09/13] gnu-maintenance: Document nested procedures in 'import-html-release' Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 10/13] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release' Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 11/13] gnu-maintenance: Add support to rewrite version in URL path Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 12/13] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater Maxim Cournoyer
2023-08-15 20:29   ` [bug#65230] [PATCH v2 13/13] gnu-maintenance: Consider Qt source tarballs as "release files" Maxim Cournoyer
2023-08-21 18:06 ` [bug#65230] [PATCH v3 01/10] gnu-maintenance: Make base-url argument of import-html-release required Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 02/10] gnu-maintenance: Fix docstring Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 03/10] gnu-maintenance: Extract url->links procedure Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 04/10] gnu-maintenance: Fix indentation Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 05/10] gnu-maintenance: Accept package object in 'import-html-release' procedure Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 06/10] gnu-maintenance: Document nested procedures in 'import-html-release' Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 07/10] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release' Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 08/10] gnu-maintenance: Add support to rewrite version in URL path Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 09/10] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater Maxim Cournoyer
2023-08-21 18:06   ` [bug#65230] [PATCH v3 10/10] gnu-maintenance: Consider Qt source tarballs as "release files" Maxim Cournoyer
2023-08-22 16:52 ` [bug#65230] [PATCH v4 01/10] gnu-maintenance: Make base-url argument of import-html-release required Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 02/10] gnu-maintenance: Fix docstring Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 03/10] gnu-maintenance: Extract url->links procedure Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 04/10] gnu-maintenance: Fix indentation Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 05/10] gnu-maintenance: Accept package object in 'import-html-release' procedure Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 06/10] gnu-maintenance: Document nested procedures in 'import-html-release' Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 07/10] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release' Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 08/10] gnu-maintenance: Add support to rewrite version in URL path Maxim Cournoyer
2023-08-26 20:21     ` bug#65230: " Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 09/10] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater Maxim Cournoyer
2023-08-22 16:52   ` [bug#65230] [PATCH v4 10/10] gnu-maintenance: Consider Qt source tarballs as "release files" Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ae444e17b3e5983bbc44619113d2cc0435e88473.1692131377.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=65230@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=guix@cbaines.net \
    --cc=ludo@gnu.org \
    --cc=me@tobias.gr \
    --cc=othacehe@gnu.org \
    --cc=rekado@elephly.net \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.