From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aKxFN1/vAGJdBgAAgWs5BA (envelope-from ) for ; Mon, 07 Feb 2022 11:07:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AGgcMF/vAGIv8gAAG6o9tA (envelope-from ) for ; Mon, 07 Feb 2022 11:07:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F6953D3C4 for ; Mon, 7 Feb 2022 11:07:27 +0100 (CET) Received: from localhost ([::1]:51154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH0ve-0002oN-H0 for larch@yhetil.org; Mon, 07 Feb 2022 05:07:26 -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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644228447; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KGnmJSu9Rb12ycEVGSc8hZA/7M8jUHmu3RBtBxIxyEs=; b=jCzrv+x8Rv4Gqhdov0TGzTQaujLlQ/wJx27tDNQ8oIm5dRwoIK/ZhVLaZhn89ZjxQSJ/x1 N6H/8dkRdtINx56Bo3vVY5RlMZZRiZeaj4KynW3vnZjQ/kml2o0Whq1KfrCr0Rcl8g/Wmn UU5MgffUzbnNoNKGAs85q/MCBFUTE7FKbO1UkK7WsBHnR9hKV8OAAVdip6xUc/Hk4Zasvo 2jQaKnAZTGopT818KXW1s9NbhGV4s2rzB8ydUNC12U0g9lxjK7cR4o4fQsrNSArX4nzhdN I6NrvAu/vrxB5ug4XU37PMVBKL7JYV8MEXbnX7eYyFDixSE48+fGCesTnDXGsg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644228447; a=rsa-sha256; cv=none; b=P7DTDSaLNNejQrwvElzGfUX6CjNUnTgiMDomNIzEOZnHh+JcHoFzH4iFsyiUCJ9xJsQcLu fvIQMZA76Mlb5ZKqtcby6/HS+g1Hz+DD255Ujx1vtUQjnTJg/+J0907Nxb/hVdJE8UvfV0 qOhXCrTITyNc4nG6LVt7rd5mCpv+eSay1wEZZ2wN27oUOVrvWZeg/jl+zn65SsJMUEePsi qgiQBT0D7OUWPtLWaWb54F5mM5nj/WPjCXH8WXOzbOWRii0ItT8ixTj+s/j6H/ITyIgL0z bUp/xSM5gRvPKrFaTzN7w0EU+KNFd1EGPuAxK6v2krg7fwPr3XZlLEB+fc6n1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=ogsHEGSj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=ogsHEGSj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4F6953D3C4 X-Spam-Score: -1.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: VDMXkoz0ONYy * json.scm (json-fetch): Add =E2=80=98#:cached?=E2=80=99 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 =C2=A9 2015, 2016 Eric Bavier ;;; Copyright =C2=A9 2018, 2019 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2020 Ricardo Wurmus +;;; Copyright =C2=A9 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 UR= L." (guard (c ((and (http-get-error? c) (let ((error (http-get-error-code c))) (or (=3D 403 error) (=3D 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))) --=20 2.34.1