Patchwork [05/12] import: utils: Refactor license->symbol.

login
register
mail settings
Submitter David Craven
Date Sept. 22, 2016, 1:18 p.m.
Message ID <20160922131903.1606-5-david@craven.ch>
Download mbox | patch
Permalink /patch/15917/
State New
Headers show

Comments

David Craven - Sept. 22, 2016, 1:18 p.m.
* guix/import/utils.scm (license->symbol): Work for all licenses.
* tests/import-utils.scm (license->symbol): Add test.
---
 guix/import/utils.scm  | 14 +++++---------
 tests/import-utils.scm |  5 +++++
 2 files changed, 10 insertions(+), 9 deletions(-)
Ludovic Courtès - Sept. 26, 2016, 9:39 a.m.
David Craven <david@craven.ch> skribis:

> * guix/import/utils.scm (license->symbol): Work for all licenses.
> * tests/import-utils.scm (license->symbol): Add test.

OK!

Patch

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index ca00baf..8dab72a 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -3,6 +3,7 @@ 
 ;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
+;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -178,15 +179,10 @@  recursively apply the procedure to the sub-list."
 (define (license->symbol license)
   "Convert license to a symbol representing the variable the object is bound
 to in the (guix licenses) module, or #f if there is no such known license."
-  ;; TODO: Traverse list public variables in (guix licenses) instead so we
-  ;; don't have to maintain a list manualy.
-  (assoc-ref `((,license:lgpl2.0 . license:lgpl2.0)
-               (,license:gpl3 . license:gpl3)
-               (,license:bsd-3 . license:bsd-3)
-               (,license:expat . license:expat)
-               (,license:public-domain . license:public-domain)
-               (,license:asl2.0 . license:asl2.0))
-             license))
+  (define licenses
+    (module-map (lambda (sym var) `(,(variable-ref var) . ,sym))
+                (resolve-interface '(guix licenses) #:prefix 'license:)))
+  (assoc-ref licenses license))
 
 (define (snake-case str)
   "Return a downcased version of the string STR where underscores are replaced
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
index 3b11875..8d44b9e 100644
--- a/tests/import-utils.scm
+++ b/tests/import-utils.scm
@@ -20,6 +20,7 @@ 
 (define-module (test-import-utils)
   #:use-module (guix tests)
   #:use-module (guix import utils)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (srfi srfi-64))
 
 (test-begin "import-utils")
@@ -33,4 +34,8 @@ 
   "This package provides a function to establish world peace"
   (beautify-description "A function to establish world peace"))
 
+(test-equal "license->symbol"
+  'license:lgpl2.0
+  (license->symbol license:lgpl2.0))
+
 (test-end "import-utils")