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 12/13] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater.
Date: Tue, 15 Aug 2023 16:29:36 -0400	[thread overview]
Message-ID: <4f3cd2f7afc562f9e0b93f87daf4aeadd0c7954e.1692131377.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com>

* guix/gnu-maintenance.scm (http-url?): Extract from html-updatable-package?,
modify to return the HTTP URL, and support the mirror:// scheme.
(%disallowed-hosting-sites): New variable, extracted from
html-updatable-package.
(html-updatable-package?): Rewrite a mirror:// URL to an HTTP or HTTPS one.
* guix/download.scm (%mirrors): Update comment.

---

Changes in v2:
- Update %mirrors comment to mention speed-related exceptions

 guix/download.scm        |  5 +++-
 guix/gnu-maintenance.scm | 58 +++++++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index ce6ebd0df8..31a41e8183 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -51,7 +51,10 @@ (define-module (guix download)
 ;;; Code:
 
 (define %mirrors
-  ;; Mirror lists used when `mirror://' URLs are passed.
+  ;; Mirror lists used when `mirror://' URLs are passed.  The first mirror
+  ;; entry of each set should ideally be the most authoritative one, as that's
+  ;; what the generic HTML updater will pick to look for updates, with
+  ;; possible exceptions when the authoritative mirror is too slow.
   (let* ((gnu-mirrors
           '(;; This one redirects to a (supposedly) nearby and (supposedly)
             ;; up-to-date mirror.
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 3cd84ee3d7..2574e0f827 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -928,27 +928,40 @@ (define* (import-kernel.org-release package #:key (version #f))
                          #:directory directory
                          #:file->signature file->signature)))
 
-(define html-updatable-package?
-  ;; Return true if the given package may be handled by the generic HTML
-  ;; updater.
-  (let ((hosting-sites '("github.com" "github.io" "gitlab.com"
-                         "notabug.org" "sr.ht" "gitlab.inria.fr"
-                         "ftp.gnu.org" "download.savannah.gnu.org"
-                         "pypi.org" "crates.io" "rubygems.org"
-                         "bioconductor.org")))
-    (define http-url?
-      (url-predicate (lambda (url)
-                       (match (string->uri url)
-                         (#f #f)
-                         (uri
-                          (let ((scheme (uri-scheme uri))
-                                (host   (uri-host uri)))
-                            (and (memq scheme '(http https))
-                                 (not (member host hosting-sites)))))))))
-
-    (lambda (package)
-      (or (assoc-ref (package-properties package) 'release-monitoring-url)
-          (http-url? package)))))
+;;; These sites are disallowed for the generic HTML updater as there are
+;;; better means to query them.
+(define %disallowed-hosting-sites
+  '("github.com" "github.io" "gitlab.com"
+    "notabug.org" "sr.ht" "gitlab.inria.fr"
+    "ftp.gnu.org" "download.savannah.gnu.org"
+    "pypi.org" "crates.io" "rubygems.org"
+    "bioconductor.org"))
+
+(define (http-url? url)
+  "Return URL if URL has HTTP or HTTPS as its protocol.  If URL uses the
+special mirror:// protocol, substitute it with the first HTTP or HTTPS URL
+prefix from its set."
+  (match (string->uri url)
+    (#f #f)
+    (uri
+     (let ((scheme (uri-scheme uri))
+           (host   (uri-host uri)))
+       (or (and (memq scheme '(http https))
+                (not (member host %disallowed-hosting-sites))
+                url)
+           (and (eq? scheme 'mirror)
+                (and=> (find http-url?
+                             (assoc-ref %mirrors
+                                        (string->symbol host)))
+                       (lambda (url)
+                         (string-append (strip-trailing-slash url)
+                                        (uri-path uri))))))))))
+
+(define (html-updatable-package? package)
+  "Return true if the given package may be handled by the generic HTML
+updater."
+  (or (assoc-ref (package-properties package) 'release-monitoring-url)
+      ((url-predicate http-url?) package)))
 
 (define* (import-html-updatable-release package #:key (version #f))
   "Return the latest release of PACKAGE.  Do that by crawling the HTML page of
@@ -956,6 +969,9 @@ (define* (import-html-updatable-release package #:key (version #f))
 string to fetch a specific version."
   (let* ((uri       (string->uri
                      (match (origin-uri (package-source package))
+                       ((? (cut string-prefix? "mirror://" <>) url)
+                        ;; Retrieve the authoritative HTTP URL from a mirror.
+                        (http-url? url))
                        ((? string? url) url)
                        ((url _ ...) url))))
          (custom    (assoc-ref (package-properties package)
-- 
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   ` [bug#65230] [PATCH v2 06/13] gnu-maintenance: Extract url->links procedure Maxim Cournoyer
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   ` Maxim Cournoyer [this message]
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=4f3cd2f7afc562f9e0b93f87daf4aeadd0c7954e.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.