added --confirm option. refactored run-item & co to accomodate

1 files changed, 28 insertions, 26 deletions

diff --git a/lib/client.lisp b/lib/client.lisp
index 9f34bb5..61c3130 100644
--- a/lib/client.lisp
+++ b/lib/client.lisp
@@ -92,47 +92,49 @@ running the body. If such a oneliner can be found."
 
 (defvar *ol-output-timeout* 1)
 
-(defun run-item (ident args &key force-clip (timeout nil timeout-p) draftp verbose)
+(defun run-item (ident args &key force-clip (timeout nil timeout-p) draftp verbose confirm)
   "Runs a oneliner identified by IDENT (if available) with arguments ARGS."
   (let ((ol (if draftp (fetch-draft ident) (the-oneliner ident))))
     (when ol
       (let ((*ol-output-timeout* (if timeout-p timeout *ol-output-timeout*)))
-        (bind-vars-and-run-oneliner ol args force-clip verbose)))))
+        (bind-vars-and-run-oneliner ol args force-clip verbose confirm)))))
 
-(defun bind-vars-and-run-oneliner (ol args &optional force-clip verbose)
+(defun bind-vars-and-run-oneliner (ol args &optional force-clip verbose confirm)
   (let* ((oneliner (oneliner-oneliner ol))
          (runstyle (oneliner-runstyle ol))
          (pos-args (get-positional-arguments ol))
          (named-args (get-named-arguments ol)))
+    
+    (loop for param in pos-args
+          for arg in args
+          do (setf oneliner (str:replace-all param arg oneliner)))
+      ;; substitute named args
+ 
+    (setf args
+          (mapcar (lambda (s) (str:split "=" s))
+                  (nthcdr (length pos-args) args)))
+    (loop for var in named-args
+          for bound = (assoc (subseq var 1) args :test #'equal)
+          when bound
+            do (setf oneliner
+                     (str:replace-all var (second bound) oneliner)))
+
     (when  (or (not (oneliner-isflagged ol))
                (y-or-n-p "This oneliner is flagged. Are you sure you want to run it?"))
+      (when (or verbose confirm) 
+        (format t "Attempting to run:~%")
+        (princ oneliner)
+        (princ #\newline))
       ;; substitute positional args
-      (loop for param in pos-args
-            for arg in args
-            do (setf oneliner (str:replace-all param arg oneliner)))
-      ;; substitute named args 
-      (setf args
-            (mapcar (lambda (s) (str:split "=" s))
-                    (nthcdr (length pos-args) args)))
-      (loop for var in named-args
-            for bound = (assoc (subseq var 1) args :test #'equal)
-            when bound
-              do (setf oneliner
-                       (str:replace-all var (second bound) oneliner)))
-      
-      (handle-run-oneliner oneliner (or force-clip (equalp runstyle "manual")) verbose))))
-
-(defun handle-run-oneliner (ol &optional clip (verbose t))
+      (when (or (not confirm)
+                (y-or-n-p "Proceed?")) 
+        (handle-run-oneliner oneliner (or force-clip (equalp runstyle "manual")))))))
+
+(defun handle-run-oneliner (ol &optional clip)
   (if clip
       (progn (trivial-clipboard:text ol)
              (format t "Copied oneliner to clipboard~%"))
-      (progn
-        (when verbose 
-          (format t "Attempting to run:~%")
-          (princ ol)
-          (princ #\newline)
-          (princ #\newline))
-        (run-with-shell ol :shell-name (or (shell) "bash") :await-output-p *ol-output-timeout*))))
+      (run-with-shell ol :shell-name (or (shell) "bash") :await-output-p *ol-output-timeout*)))
 
 ;;; ADDING ONELINERS