* [PATCH 1/7] import cran: Remove more invalid characters from package names.
@ 2016-05-23 15:32 Ricardo Wurmus
2016-05-23 21:54 ` Ludovic Courtès
0 siblings, 1 reply; 5+ messages in thread
From: Ricardo Wurmus @ 2016-05-23 15:32 UTC (permalink / raw)
To: guix-devel
* guix/import/cran.scm (guix-name): Replace period and underscore with
dash; always prepend package names with "r-".
---
guix/import/cran.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index c1a9e8e..8b368af 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -151,9 +151,9 @@ empty list when the FIELD cannot be found."
"Return the `package' s-expression for an R package published on REPOSITORY
from the alist META, which was derived from the R package's DESCRIPTION file."
(define (guix-name name)
- (if (string-prefix? "r-" name)
- (string-downcase name)
- (string-append "r-" (string-downcase name))))
+ (string-append "r-" (string-downcase
+ (regexp-substitute/global #f "(_|\\.)" name
+ 'pre "-" 'post))))
(let* ((base-url (case repository
((cran) %cran-url)
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/7] import cran: Remove more invalid characters from package names.
2016-05-23 15:40 [PATCH] Add recursive CRAN importer Ricardo Wurmus
@ 2016-05-23 15:40 ` Ricardo Wurmus
2016-05-30 8:48 ` Ludovic Courtès
0 siblings, 1 reply; 5+ messages in thread
From: Ricardo Wurmus @ 2016-05-23 15:40 UTC (permalink / raw)
To: guix-devel
* guix/import/cran.scm (guix-name): Replace period and underscore with
dash; always prepend package names with "r-".
---
guix/import/cran.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index c1a9e8e..8b368af 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -151,9 +151,9 @@ empty list when the FIELD cannot be found."
"Return the `package' s-expression for an R package published on REPOSITORY
from the alist META, which was derived from the R package's DESCRIPTION file."
(define (guix-name name)
- (if (string-prefix? "r-" name)
- (string-downcase name)
- (string-append "r-" (string-downcase name))))
+ (string-append "r-" (string-downcase
+ (regexp-substitute/global #f "(_|\\.)" name
+ 'pre "-" 'post))))
(let* ((base-url (case repository
((cran) %cran-url)
--
2.7.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/7] import cran: Remove more invalid characters from package names.
2016-05-23 15:32 [PATCH 1/7] import cran: Remove more invalid characters from package names Ricardo Wurmus
@ 2016-05-23 21:54 ` Ludovic Courtès
0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2016-05-23 21:54 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
> * guix/import/cran.scm (guix-name): Replace period and underscore with
> dash; always prepend package names with "r-".
[...]
> + (string-append "r-" (string-downcase
> + (regexp-substitute/global #f "(_|\\.)" name
> + 'pre "-" 'post))))
I’d have a preference for ‘string-map’ here. WDYT?
Otherwise looks good!
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/7] import cran: Remove more invalid characters from package names.
2016-05-23 15:40 ` [PATCH 1/7] import cran: Remove more invalid characters from package names Ricardo Wurmus
@ 2016-05-30 8:48 ` Ludovic Courtès
2016-06-14 15:02 ` Ricardo Wurmus
0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2016-05-30 8:48 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
> * guix/import/cran.scm (guix-name): Replace period and underscore with
> dash; always prepend package names with "r-".
[...]
> + (string-append "r-" (string-downcase
> + (regexp-substitute/global #f "(_|\\.)" name
> + 'pre "-" 'post))))
I have a preference fro ‘string-map’, which I find more readable than
‘regexp-substitute/global’ in simple cases. Thoughts?
Otherwise LGTM!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/7] import cran: Remove more invalid characters from package names.
2016-05-30 8:48 ` Ludovic Courtès
@ 2016-06-14 15:02 ` Ricardo Wurmus
0 siblings, 0 replies; 5+ messages in thread
From: Ricardo Wurmus @ 2016-06-14 15:02 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ludovic Courtès <ludo@gnu.org> writes:
> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
>
>> * guix/import/cran.scm (guix-name): Replace period and underscore with
>> dash; always prepend package names with "r-".
>
> [...]
>
>> + (string-append "r-" (string-downcase
>> + (regexp-substitute/global #f "(_|\\.)" name
>> + 'pre "-" 'post))))
>
> I have a preference fro ‘string-map’, which I find more readable than
> ‘regexp-substitute/global’ in simple cases. Thoughts?
>
> Otherwise LGTM!
Using “string-map” is indeed nicer! I’m not a fan of
“regexp-substitute/global” (and regular expressions in general), but it
didn’t occur to me to use “string-map”. Thanks for the hint.
~~ Ricardo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-06-15 7:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-23 15:32 [PATCH 1/7] import cran: Remove more invalid characters from package names Ricardo Wurmus
2016-05-23 21:54 ` Ludovic Courtès
-- strict thread matches above, loose matches on Subject: below --
2016-05-23 15:40 [PATCH] Add recursive CRAN importer Ricardo Wurmus
2016-05-23 15:40 ` [PATCH 1/7] import cran: Remove more invalid characters from package names Ricardo Wurmus
2016-05-30 8:48 ` Ludovic Courtès
2016-06-14 15:02 ` Ricardo Wurmus
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).