From patchwork Mon Feb 7 09:07:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 37054 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 E460727BBEA; Mon, 7 Feb 2022 10:07:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 B13B127BBE9 for ; Mon, 7 Feb 2022 10:07:31 +0000 (GMT) Received: from localhost ([::1]:51154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH0vi-0002oN-RZ for patchwork@mira.cbaines.net; Mon, 07 Feb 2022 05:07:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH00C-000684-K1 for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH00A-0004Jg-Ia for guix-patches@gnu.org; Mon, 07 Feb 2022 04:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nH00A-0002ux-EV; Mon, 07 Feb 2022 04:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53818] [PATCH v2 4/7] import: json: Make 'json-fetch' take '#:cached?' argument. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: maximedevos@telenet.be, guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 09:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53818@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-Xcc: Maxime Devos Received: via spool by 53818-submit@debbugs.gnu.org id=B53818.164422484011123 (code B ref 53818); Mon, 07 Feb 2022 09:08:02 +0000 Received: (at 53818) by debbugs.gnu.org; 7 Feb 2022 09:07:20 +0000 Received: from localhost ([127.0.0.1]:40927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzT-0002tF-Gb for submit@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:19 -0500 Received: from h178-251-242-94.cust.a3fiber.se ([178.251.242.94]:55284 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzzH-0002s5-Hn for 53818@debbugs.gnu.org; Mon, 07 Feb 2022 04:07:08 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yoctocell.xyz; s=mail; t=1644224821; bh=KGnmJSu9Rb12ycEVGSc8hZA/7M8jUHmu3RBtBxIxyEs=; h=From:To:Subject:In-Reply-To:References:Date; b=ogsHEGSjq3rwzjMUnTBfm5VEyTpQhvgVCoJVp3/Im++obZqfmtzQAVcA0bBE0gR/P /wiSqN5AnGxslRdcpr2Ipo5Uk4FvLIB9Q+LlTVFYFnYbeGBESYnYOHxwXwySUzsRm3 O9TWoUw+oZIHXE0x17WF8C97WGVTALijeuQiE0oM= In-Reply-To: References: Message-Id: <92ca3095e8a5cf1197afd8883017c6b3729184f3.1644224421.git.public@yoctocell.xyz> Date: Mon, 07 Feb 2022 10:07:01 +0100 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" X-getmail-retrieved-from-mailbox: Patches * json.scm (json-fetch): Add ‘#:cached?’ keyword argument. --- guix/import/json.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/guix/import/json.scm b/guix/import/json.scm index 0c98bb25b8..6f88353659 100644 --- a/guix/import/json.scm +++ b/guix/import/json.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2022 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,17 +38,22 @@ (define-module (guix import json) (define* (json-fetch url ;; Note: many websites returns 403 if we omit a ;; 'User-Agent' header. - #:key (headers `((user-agent . "GNU Guile") - (Accept . "application/json")))) + #:key + (headers `((user-agent . "GNU Guile") + (Accept . "application/json"))) + cached?) "Return a representation of the JSON resource URL (a list or hash table), or #f if URL returns 403 or 404. HEADERS is a list of HTTP headers to pass in -the query." +the query. If CACHED? is #t, 'http-fetch/cached' will be used to fetch URL." (guard (c ((and (http-get-error? c) (let ((error (http-get-error-code c))) (or (= 403 error) (= 404 error)))) #f)) - (let* ((port (http-fetch url #:headers headers)) + (let* ((port ((if cached? + http-fetch/cached + http-fetch) + url #:headers headers)) (result (json->scm port))) (close-port port) result)))