From: Ricardo Wurmus <rekado@elephly.net>
To: 40629@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: [bug#40629] [PATCH 3/5] import/json: Add json->scheme-file.
Date: Tue, 14 Apr 2020 19:19:57 +0200 [thread overview]
Message-ID: <20200414171959.3428-3-rekado@elephly.net> (raw)
In-Reply-To: <20200414171959.3428-1-rekado@elephly.net>
* guix/import/json.scm (json->code, json->scheme-file): New procedures.
---
guix/import/json.scm | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/guix/import/json.scm b/guix/import/json.scm
index 8900724dcd..16dc2ad5cb 100644
--- a/guix/import/json.scm
+++ b/guix/import/json.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,8 +23,12 @@
#:use-module (json)
#:use-module (guix http-client)
#:use-module (guix import utils)
+ #:use-module (guix import print)
+ #:use-module (ice-9 rdelim)
+ #:use-module (srfi srfi-2)
#:use-module (srfi srfi-34)
- #:export (json-fetch))
+ #:export (json-fetch
+ json->scheme-file))
(define* (json-fetch url
;; Note: many websites returns 403 if we omit a
@@ -42,3 +47,31 @@ the query."
(result (json->scm port)))
(close-port port)
result)))
+
+(define (json->code file-name)
+ "Read FILE-NAME containing a JSON package definition and return an
+S-expression, or return #F when the JSON is invalid."
+ (catch 'json-invalid
+ (lambda ()
+ (let ((json (json-string->scm
+ (with-input-from-file file-name read-string))))
+ (package->code (alist->package json))))
+ (const #f)))
+
+(define (json->scheme-file file)
+ "Convert the FILE containing a JSON package definition to a Scheme
+representation and return the new file name (or #F on error)."
+ (and-let* ((json (json->code file))
+ (file* (let* ((tempdir (or (getenv "TMPDIR") "/tmp"))
+ (template (string-append tempdir "/guix-XXXXXX"))
+ (port (mkstemp! template)))
+ (close-port port)
+ template)))
+ (call-with-output-file file*
+ (lambda (port)
+ (write '(use-modules (gnu)
+ (guix)
+ ((guix licenses) #:prefix license:))
+ port)
+ (write json port)))
+ file*))
--
2.25.1
next prev parent reply other threads:[~2020-04-14 17:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 15:44 [bug#40629] Build and install packages from JSON definitions Ricardo Wurmus
2020-04-14 17:19 ` [bug#40629] [PATCH 1/5] import/print: Return license with prefix Ricardo Wurmus
2020-04-14 17:19 ` [bug#40629] [PATCH 2/5] import/print: package->code: Wrap build system value in module reference Ricardo Wurmus
2020-04-14 17:19 ` Ricardo Wurmus [this message]
2020-04-14 17:19 ` [bug#40629] [PATCH 4/5] scripts/build: options->things-to-build: Handle .json files Ricardo Wurmus
2020-04-16 21:45 ` Ludovic Courtès
2020-04-16 21:53 ` Ludovic Courtès
2020-04-14 17:19 ` [bug#40629] [PATCH 5/5] scripts/package: Handle JSON files Ricardo Wurmus
2020-04-14 22:48 ` [bug#40629] [PATCH 6/9] import/json: Use json->code Ricardo Wurmus
2020-04-14 22:48 ` [bug#40629] [PATCH 7/9] import/print: package->code: Wrap S-expression in definition Ricardo Wurmus
2020-04-14 22:48 ` [bug#40629] [PATCH 8/9] import/utils: alist->package: Ignore known inputs Ricardo Wurmus
2020-04-14 22:48 ` [bug#40629] [PATCH 9/9] import/json: json->code: Handle files with more than one definition Ricardo Wurmus
2020-04-14 22:59 ` [bug#40629] [PATCH v2 8/9] import/utils: alist->package: Ignore known inputs Ricardo Wurmus
2020-04-14 22:59 ` [bug#40629] [PATCH v2 9/9] import/json: json->code: Handle files with more than one definition Ricardo Wurmus
2020-04-14 23:01 ` Ricardo Wurmus
2020-04-17 5:32 ` Jan Nieuwenhuizen
2020-04-18 20:23 ` Ricardo Wurmus
2020-04-15 18:26 ` [bug#40629] Build and install packages from JSON definitions Christopher Baines
2020-04-15 22:27 ` Ricardo Wurmus
2020-04-16 21:44 ` bug#40629: " Ricardo Wurmus
2020-04-17 17:45 ` [bug#40629] " Christopher Baines
2020-04-16 21:50 ` Ludovic Courtès
2020-04-17 8:25 ` Ricardo Wurmus
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200414171959.3428-3-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=40629@debbugs.gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).