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

Rename some derivation comparison procedures

Browse source 
As they actually just relate to package derivations.
This commit is contained in:
Christopher Baines 2020-10-31 13:52:08 +00:00
parent 54616bc9e4
commit c05cbd8438
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
guix-data-service/web/compare/controller.scm
View file

@ -126,8 +126,8 @@
(build_status ,parse-build-status #:multi-value))) (build_status ,parse-build-status #:multi-value)))
'((base_commit base_datetime) '((base_commit base_datetime)
(target_commit target_datetime))))) (target_commit target_datetime)))))
(render-compare-by-datetime/derivations mime-types (render-compare-by-datetime/package-derivations mime-types
parsed-query-parameters))) parsed-query-parameters)))
(('GET "compare" "packages") (('GET "compare" "packages")
(let* ((parsed-query-parameters (let* ((parsed-query-parameters
(parse-query-parameters (parse-query-parameters
@ -531,7 +531,7 @@
(with-thread-postgresql-connection (with-thread-postgresql-connection
valid-targets))) valid-targets)))
(render-html (render-html
#:sxml (compare/derivations #:sxml (compare/package-derivations
query-parameters query-parameters
systems systems
(valid-targets->options targets) (valid-targets->options targets)
@ -576,7 +576,7 @@
(with-thread-postgresql-connection (with-thread-postgresql-connection
valid-targets))) valid-targets)))
(render-html (render-html
#:sxml (compare/derivations #:sxml (compare/package-derivations
query-parameters query-parameters
systems systems
(valid-targets->options targets) (valid-targets->options targets)
@ -584,8 +584,8 @@
derivation-changes) derivation-changes)
#:extra-headers http-headers-for-unchanging-content))))))))))) #:extra-headers http-headers-for-unchanging-content)))))))))))
(define (render-compare-by-datetime/derivations mime-types (define (render-compare-by-datetime/package-derivations mime-types
query-parameters) query-parameters)
(define (derivations->alist derivations) (define (derivations->alist derivations)
(map (match-lambda (map (match-lambda
((file-name system target buildstatus) ((file-name system target buildstatus)
@ -606,7 +606,7 @@
'((error . "invalid query")))) '((error . "invalid query"))))
(else (else
(render-html (render-html
#:sxml (compare-by-datetime/derivations #:sxml (compare-by-datetime/package-derivations
query-parameters query-parameters
(parallel-via-thread-pool-channel (parallel-via-thread-pool-channel
(with-thread-postgresql-connection valid-systems)) (with-thread-postgresql-connection valid-systems))
@ -663,7 +663,7 @@
#:extra-headers http-headers-for-unchanging-content)) #:extra-headers http-headers-for-unchanging-content))
(else (else
(render-html (render-html
#:sxml (compare-by-datetime/derivations #:sxml (compare-by-datetime/package-derivations
query-parameters query-parameters
(parallel-via-thread-pool-channel (parallel-via-thread-pool-channel
(with-thread-postgresql-connection valid-systems)) (with-thread-postgresql-connection valid-systems))

28
guix-data-service/web/compare/html.scm
View file

@ -25,8 +25,8 @@
#:use-module (guix-data-service web view html) #:use-module (guix-data-service web view html)
#:export (compare #:export (compare
compare/derivation compare/derivation
compare/derivations compare/package-derivations
compare-by-datetime/derivations compare-by-datetime/package-derivations
compare/packages compare/packages
compare-invalid-parameters)) compare-invalid-parameters))
@ -598,11 +598,11 @@
target-value)))))))))))) target-value))))))))))))
environment-variables)))))))))) environment-variables))))))))))
(define (compare/derivations query-parameters (define (compare/package-derivations query-parameters
valid-systems valid-systems
valid-targets valid-targets
valid-build-statuses valid-build-statuses
derivation-changes) derivation-changes)
(layout (layout
#:body #:body
`(,(header) `(,(header)
@ -760,12 +760,12 @@
(cdr data-columns)))))) (cdr data-columns))))))
(vector->list derivation-changes))))))))))) (vector->list derivation-changes)))))))))))
(define (compare-by-datetime/derivations query-parameters (define (compare-by-datetime/package-derivations query-parameters
valid-systems valid-systems
valid-build-statuses valid-build-statuses
base-revision-details base-revision-details
target-revision-details target-revision-details
derivation-changes) derivation-changes)
(layout (layout
#:body #:body
`(,(header) `(,(header)
@ -832,7 +832,7 @@
(href ,(let ((query-parameter-string (href ,(let ((query-parameter-string
(query-parameters->string query-parameters))) (query-parameters->string query-parameters)))
(string-append (string-append
"/compare/derivations.json" "/compare/package-derivations.json"
(if (string-null? query-parameter-string) (if (string-null? query-parameter-string)
"" ""
(string-append "?" query-parameter-string)))))) (string-append "?" query-parameter-string))))))