diff options
| author | Alex Kost <alezost@gmail.com> | 2018-07-17 22:42:35 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2018-07-27 12:14:24 +0300 |
| commit | 2ab552a228804ce8983947e40f31225b3f32fbb3 (patch) | |
| tree | be2015537a0663001a76081f1c1c0e3d9d372d22 | |
| parent | Use key arguments for 'build-farm-jobset-url' (diff) | |
| download | emacs-build-farm-2ab552a228804ce8983947e40f31225b3f32fbb3.tar.gz | |
Add and use 'build-farm-get-display'
Instead of 'build-farm-ENTRY-TYPE-get-display' functions.
* build-farm.el (build-farm-get-display): New procedure.
* build-farm-build.el (build-farm-build-get-display): Remove.
(build-farm-build-info-insert-builds-button)
(build-farm-latest-builds, build-farm-queued-builds): Adjust accordingly.
* build-farm-jobset.el (build-farm-jobset-get-display): Remove.
(build-farm-jobsets): Adjust accordingly.
* build-farm-project.el (build-farm-project-get-display): Remove.
(build-farm-projects): Adjust accordingly.
| -rw-r--r-- | build-farm-build.el | 16 | ||||
| -rw-r--r-- | build-farm-jobset.el | 8 | ||||
| -rw-r--r-- | build-farm-project.el | 8 | ||||
| -rw-r--r-- | build-farm.el | 8 |
4 files changed, 15 insertions, 25 deletions
diff --git a/build-farm-build.el b/build-farm-build.el index 9c2ee6e..e919001 100644 --- a/build-farm-build.el +++ b/build-farm-build.el @@ -45,12 +45,6 @@ for the number of builds." :type 'integer :group 'build-farm-build) -(defun build-farm-build-get-display (search-type &rest args) - "Search for builds and show results. -See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." - (apply #'bui-list-get-display-entries - 'build-farm-build search-type args)) - (cl-defun build-farm-build-latest-prompt-args (&key project jobset job system) "Prompt for and return a list of 'latest builds' arguments." @@ -268,8 +262,8 @@ See `build-farm-build-status-alist'." :jobset (button-get btn 'jobset) :job (button-get btn 'job) :system (button-get btn 'system)))) - (apply #'build-farm-build-get-display - 'latest args))) + (apply #'build-farm-get-display + 'build 'latest args))) (concat "Show latest builds" (let ((thing (cond (job "job") (system "system") @@ -398,8 +392,8 @@ Interactively, use `build-farm-number-of-builds' variable for NUMBER. With prefix argument, prompt for it and for the other ARGS." (interactive (build-farm-build-latest-prompt-args)) - (apply #'build-farm-build-get-display - 'latest number args)) + (apply #'build-farm-get-display + 'build 'latest number args)) ;;;###autoload (defun build-farm-queued-builds (number) @@ -412,7 +406,7 @@ NUMBER. With prefix argument, prompt for it." (read-number "Number of queued builds: " build-farm-number-of-builds) build-farm-number-of-builds))) - (build-farm-build-get-display 'queue number)) + (build-farm-get-display 'build 'queue number)) (provide 'build-farm-build) diff --git a/build-farm-jobset.el b/build-farm-jobset.el index b8de158..617a889 100644 --- a/build-farm-jobset.el +++ b/build-farm-jobset.el @@ -40,12 +40,6 @@ "Return jobset ID from PROJECT name and JOBSET name." (concat project "/" jobset)) -(defun build-farm-jobset-get-display (search-type &rest args) - "Search for jobsets and show results. -See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." - (apply #'bui-list-get-display-entries - 'build-farm-jobset search-type args)) - ;;; Filters for processing raw entries @@ -154,7 +148,7 @@ ARGS." (defun build-farm-jobsets (project) "Display jobsets of PROJECT." (interactive (list (build-farm-read-project))) - (build-farm-jobset-get-display 'project project)) + (build-farm-get-display 'jobset 'project project)) ;; Info returned for multiple jobsets (from "api/jobsets") and for a ;; single jobset (from "jobset") are completely different! Compare: diff --git a/build-farm-project.el b/build-farm-project.el index bc0f417..0bd673e 100644 --- a/build-farm-project.el +++ b/build-farm-project.el @@ -36,12 +36,6 @@ ;; and vice versa. So `hidden' is not going to be used anywhere. :filter-boolean-params '(enabled)) -(defun build-farm-project-get-display (search-type &rest args) - "Search for projects and show results. -See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." - (apply #'bui-list-get-display-entries - 'build-farm-project search-type args)) - ;;; Project 'info' @@ -177,7 +171,7 @@ ARGS." (defun build-farm-projects () "Display build farm projects." (interactive) - (build-farm-project-get-display 'all)) + (build-farm-get-display 'project 'all)) (provide 'build-farm-project) diff --git a/build-farm.el b/build-farm.el index 6cde870..ecaec17 100644 --- a/build-farm.el +++ b/build-farm.el @@ -108,6 +108,14 @@ See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." (build-farm-filters entry-type)))) entries))) +(defun build-farm-get-display (entry-type search-type &rest args) + "Search for ENTRY-TYPE entries and show results. +ENTRY-TYPE should be `build', `jobset', etc. +See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." + (apply #'bui-list-get-display-entries + (build-farm-symbol entry-type) + search-type args)) + (defun build-farm-message (entries search-type &rest _) "Display a message after showing ENTRIES of SEARCH-TYPE." ;; XXX Add more messages maybe. |
