diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2019-01-21 01:43:09 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2019-01-21 17:59:15 +0530 |
| commit | cb5fe915d215af6accfc413bea109902f5618e47 (patch) | |
| tree | 2aec92b4d5022d16d5ceb22e2293077b3573ec94 /guix | |
| parent | 6b7ea49bedb6902ee620ec337cb234a34b2ab49b (diff) | |
| download | gnu-guix-cb5fe915d215af6accfc413bea109902f5618e47.tar gnu-guix-cb5fe915d215af6accfc413bea109902f5618e47.tar.gz | |
import: github: Improve readability.
* guix/import/github.scm (latest-released-version): Use any and cond instead
of a recursive loop and an if-else ladder respectively.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/import/github.scm | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/guix/import/github.scm b/guix/import/github.scm index c78469dac5..4d12339204 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -183,35 +183,32 @@ API when using a GitHub token") API. This may be fixed by using an access token and setting the environment variable GUIX_GITHUB_TOKEN, for instance one procured from https://github.com/settings/tokens")) - (let loop ((releases - (match (remove pre-release? json) - (() json) ; keep everything - (releases releases)))) - (match releases - (() ;empty release list - #f) - ((release . rest) ;one or more releases - (let ((tag (or (hash-ref release "tag_name") ;a "release" - (hash-ref release "name"))) ;a tag - (name-length (string-length package-name))) - ;; some tags include the name of the package e.g. "fdupes-1.51" - ;; so remove these - (if (and (< name-length (string-length tag)) - (string=? (string-append package-name "-") - (substring tag 0 (+ name-length 1)))) - (substring tag (+ name-length 1)) - ;; some tags start with a "v" e.g. "v0.25.0" - ;; where some are just the version number - (if (string-prefix? "v" tag) - (substring tag 1) - - ;; Finally, reject tags that don't start with a digit: - ;; they may not represent a release. - (if (and (not (string-null? tag)) - (char-set-contains? char-set:digit - (string-ref tag 0))) - tag - (loop rest))))))))))) + (any + (lambda (release) + (let ((tag (or (hash-ref release "tag_name") ;a "release" + (hash-ref release "name"))) ;a tag + (name-length (string-length package-name))) + (cond + ;; some tags include the name of the package e.g. "fdupes-1.51" + ;; so remove these + ((and (< name-length (string-length tag)) + (string=? (string-append package-name "-") + (substring tag 0 (+ name-length 1)))) + (substring tag (+ name-length 1))) + ;; some tags start with a "v" e.g. "v0.25.0" + ;; where some are just the version number + ((string-prefix? "v" tag) + (substring tag 1)) + ;; Finally, reject tags that don't start with a digit: + ;; they may not represent a release. + ((and (not (string-null? tag)) + (char-set-contains? char-set:digit + (string-ref tag 0))) + tag) + (else #f)))) + (match (remove pre-release? json) + (() json) ; keep everything + (releases releases)))))) (define (latest-release pkg) "Return an <upstream-source> for the latest release of PKG." |