From b38fa40faaaaf6a866968e803fd9c4cadf9605fd Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 23 Jul 2018 23:36:31 +0300 Subject: build: Factorize reading a number of builds * build-farm-build.el (build-farm-build-read-number-maybe): New function. (build-farm-build-latest-prompt-args, build-farm-queued-builds): Use it. --- build-farm-build.el | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build-farm-build.el b/build-farm-build.el index 56e8066..5937583 100644 --- a/build-farm-build.el +++ b/build-farm-build.el @@ -46,14 +46,20 @@ for the number of builds." :type 'integer :group 'build-farm-build) +(defun build-farm-build-read-number-maybe (&optional prompt) + "Read from minibuffer (using PROMPT) a number of builds. +If `current-prefix-arg' is specified, just return +`build-farm-number-of-builds' without reading." + (if (or current-prefix-arg + (null build-farm-number-of-builds)) + (read-number (or prompt "Number of builds: ") + build-farm-number-of-builds) + build-farm-number-of-builds)) + (cl-defun build-farm-build-latest-prompt-args (&key project jobset job system) "Prompt for and return a list of 'latest builds' arguments." - (let* ((number (if (or current-prefix-arg - (null build-farm-number-of-builds)) - (read-number "Number of latest builds: " - build-farm-number-of-builds) - build-farm-number-of-builds)) + (let* ((number (build-farm-build-read-number-maybe)) (project (if current-prefix-arg (build-farm-read-project nil project) project)) @@ -400,11 +406,7 @@ ARGS." Interactively, use `build-farm-number-of-builds' variable for NUMBER. With prefix argument, prompt for it." (interactive - (list (if (or current-prefix-arg - (null build-farm-number-of-builds)) - (read-number "Number of queued builds: " - build-farm-number-of-builds) - build-farm-number-of-builds))) + (list (build-farm-build-read-number-maybe))) (build-farm-get-display build-farm-url 'build 'queue number)) ;;;###autoload -- cgit v1.3