From 5fd3f63a40cb0314032ef9bafef8b9afede66a57 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 16 Jul 2018 22:55:13 +0300 Subject: Use key arguments for 'build-farm-jobset-url' This should have been done in commit 43684ea5d4b9e67ef4ca2a9583e5ce7af433a255. * build-farm-url.el (build-farm-jobset-url): Use key arguments. * build-farm-jobset.el (build-farm-jobset-info-insert-url): Adjust accordingly. * build-farm-project.el (build-farm-project-info-insert-jobset): Likewise. --- build-farm-jobset.el | 3 ++- build-farm-project.el | 3 ++- build-farm-url.el | 13 ++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-farm-jobset.el b/build-farm-jobset.el index 6d4f3e8..b8de158 100644 --- a/build-farm-jobset.el +++ b/build-farm-jobset.el @@ -102,7 +102,8 @@ See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." (defun build-farm-jobset-info-insert-url (entry) "Insert URL for the jobset ENTRY." - (bui-insert-button (build-farm-jobset-url (bui-entry-id entry)) + (bui-insert-button (build-farm-jobset-url + :jobset-id (bui-entry-id entry)) 'bui-url) (bui-newline)) diff --git a/build-farm-project.el b/build-farm-project.el index f83c2db..bc0f417 100644 --- a/build-farm-project.el +++ b/build-farm-project.el @@ -94,7 +94,8 @@ See `build-farm-search-url' for the meaning of SEARCH-TYPE and ARGS." (defun build-farm-project-info-insert-jobset (project jobset) "Insert info about JOBSET of the PROJECT at point." - (let ((url (build-farm-jobset-url project jobset))) + (let ((url (build-farm-jobset-url :project project + :jobset jobset))) (bui-insert-button jobset 'bui-url 'url url 'help-echo (format "Browse %s" url))) diff --git a/build-farm-url.el b/build-farm-url.el index 0280d24..cc21150 100644 --- a/build-farm-url.el +++ b/build-farm-url.el @@ -123,14 +123,13 @@ Skip ARG, if VALUE is nil or an empty string." (build-farm-api-url "queue" `(("nr" . ,number)))) -(defun build-farm-jobset-url (project-or-id &optional jobset) +(cl-defun build-farm-jobset-url (&key project jobset jobset-id) "Return URL of a PROJECT's JOBSET. -If a single argument (PROJECT-OR-ID) is specified, it should have -a form 'project/jobset'." - (let ((jobset-id (if jobset - (concat project-or-id "/" jobset) - project-or-id))) - (build-farm-url "jobset/" jobset-id))) +You should specify either a single JOBSET-ID argument (it should have +a form 'project/jobset') or PROJECT and JOBSET arguments." + (build-farm-url "jobset/" + (or jobset-id + (concat project "/" jobset)))) (defun build-farm-jobset-api-url (project) "Return API URL for jobsets by PROJECT." -- cgit v1.3