cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow filtering by substitute availability for derivation outputs

Browse source
This commit is contained in:
Christopher Baines 2020-05-03 21:22:36 +01:00
parent 3cc14ae03a
commit 6d3e8660bd
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
guix-data-service/web/revision/controller.scm
View file

@ -199,6 +199,10 @@
request request
`((search_query ,identity) `((search_query ,identity)
(after_path ,identity) (after_path ,identity)
(substitutes_available_from ,parse-number
#:multi-value)
(substitutes_not_available_from ,parse-number
#:multi-value)
(output_consistency ,identity (output_consistency ,identity
#:default "any") #:default "any")
(system ,parse-system #:default "x86_64-linux") (system ,parse-system #:default "x86_64-linux")
@ -849,6 +853,10 @@
conn conn
commit-hash commit-hash
#:search-query (assq-ref query-parameters 'search_query) #:search-query (assq-ref query-parameters 'search_query)
#:nars-from-build-servers
(assq-ref query-parameters 'substitutes_available_from)
#:no-nars-from-build-servers
(assq-ref query-parameters 'substitutes_not_available_from)
#:output-consistency #:output-consistency
(assq-ref query-parameters 'output_consistency) (assq-ref query-parameters 'output_consistency)
#:system (assq-ref query-parameters 'system) #:system (assq-ref query-parameters 'system)

16
guix-data-service/web/revision/html.scm
View file

@ -1231,6 +1231,12 @@ figure {
#:key (path-base "/revision/") #:key (path-base "/revision/")
header-text header-text
header-link) header-link)
(define substitute-availability-options
(map (match-lambda
((id url)
(cons url id)))
build-server-urls))
(layout (layout
#:body #:body
`(,(header) `(,(header)
@ -1258,6 +1264,16 @@ figure {
"Search query" query-parameters "Search query" query-parameters
#:help-text #:help-text
"List outputs where the file name matches this query.") "List outputs where the file name matches this query.")
,(form-horizontal-control
"Substitutes available from" query-parameters
#:options substitute-availability-options
#:help-text ""
#:font-family "monospace")
,(form-horizontal-control
"Substitutes not available from" query-parameters
#:options substitute-availability-options
#:help-text ""
#:font-family "monospace")
,(form-horizontal-control ,(form-horizontal-control
"Output consistency" query-parameters "Output consistency" query-parameters
#:allow-selecting-multiple-options #f #:allow-selecting-multiple-options #f