From patchwork Tue Aug 22 16:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53098 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 B720827BBE9; Tue, 22 Aug 2023 17:55:21 +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 D18CA27BBE2 for ; Tue, 22 Aug 2023 17:55:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUeo-0004D5-Av; Tue, 22 Aug 2023 12:55:06 -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 1qYUen-0004CE-2D for guix-patches@gnu.org; Tue, 22 Aug 2023 12:55:05 -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 1qYUem-0000Wj-7R; Tue, 22 Aug 2023 12:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYUel-0007fx-7v; Tue, 22 Aug 2023 12:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v4 03/10] gnu-maintenance: Extract url->links procedure. 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, 22 Aug 2023 16:55:03 +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.169272330129476 (code B ref 65230); Tue, 22 Aug 2023 16:55:03 +0000 Received: (at 65230) by debbugs.gnu.org; 22 Aug 2023 16:55:01 +0000 Received: from localhost ([127.0.0.1]:60313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUei-0007fH-VU for submit@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:01 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:61931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUeh-0007eh-P2 for 65230@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:00 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-76daeaded2aso105687485a.3 for <65230@debbugs.gnu.org>; Tue, 22 Aug 2023 09:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692723291; x=1693328091; 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=37M+iDjItsOpyggqYwMPNyGHNORkbOtVIycZBTzDwa0=; b=fQ85RG2MEDcBxoHQmNApo+SmhEhTDIt3plPG02/V5uhd/ZjZiqPN207A+PD/oR+Iwx lxip0gPSRA6LKeJnQI8PsHuy275q57mNazsW8akDmNaSrqIT8xHGYy4RGRGlsLH7ITEk MCvp3Wo1n9KhK4IZ65ugCIyYbnQiPvaVAOUkiHYWxZHskVez73dbnl3qGg8L5sg5wSFD ybkA4C081ViGT2ydmlEGd0mXbvB2HLqGdWS0eVv1vjP8VpsCJL6rR2XlSAv1f8jLEEhB iqbeq4rzsSdERSPjnXOTIqH8SwR9VKW8HCS8V5Fuqird/+2w+CRrh5UvWuomg7M1Agjb Bjnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723291; x=1693328091; 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=37M+iDjItsOpyggqYwMPNyGHNORkbOtVIycZBTzDwa0=; b=esR450yJbjrxRFXH0C1BX8CMjp1ZO+mWcrtFDTeDvCstzU6uC0i+lbOe11Nh19AC01 HLP+ENZ7hIRmbLLzxSovlO6H5AV0umaigyXa9axWnOaZZiDi2cx5u3nLse52nerkorB8 5kngMtqGTdwu+IGqSO/w0gS6Zv2phiBVoFR5DMfUKPUziI5kHCksY4YGTvBkuXaZRG9A x5OUXc0OmgD1ZFk8g7E23YxjD4tVWAJfQoY9xO4oX03S6X9hFFPhkqTIXjDUHgXk0huR Hh3rFfp7NyKsz4owbOFuv188zZgaI2iPB1l9tm3VR01Gd0oTG++p9semvGRtIDp+5+Iv Nf2g== X-Gm-Message-State: AOJu0Yw9ve3D/iNXJA4pB5cvpYhxOsHJIwnhzswJu8WhVLffl/37L2dj wBhnOHnEdXH5BuauZarnmjQF5gAW7mQ= X-Google-Smtp-Source: AGHT+IG0fvYzAlanJOXmXcXRB3VjhgX/In1WK7Lv866bSGJ86ol4hFLwxm8wXmBOcpUgNWMvD4/eAg== X-Received: by 2002:a05:620a:1993:b0:76d:aeb8:a5bb with SMTP id bm19-20020a05620a199300b0076daeb8a5bbmr4164179qkb.76.1692723291117; Tue, 22 Aug 2023 09:54:51 -0700 (PDT) Received: from localhost.localdomain (dsl-158-129.b2b2c.ca. [66.158.158.129]) by smtp.gmail.com with ESMTPSA id p12-20020ae9f30c000000b007678973eaa1sm3336262qkg.127.2023.08.22.09.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 09:54:50 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 22 Aug 2023 12:52:20 -0400 Message-ID: <20596c553f28278506543195ef414aeb8b05e14c.1692723147.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.git.maxim.cournoyer@gmail.com> References: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.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 (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 6db0dd952c..fc9cf50f29 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 . _)