cage
/
tinmop
mirror of https://codeberg.org/cage/tinmop/
1
0
Fork 0
Code Issues

- prevented quitting program when users does not input a valid answer at prompt asking for deleting temp files.

This commit is contained in:
cage 2021-09-09 15:22:50 +02:00
parent 2d03b99e99
commit 686ebd619b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ui-goodies.lisp
View File

@ -43,13 +43,21 @@
(db-utils:close-db) (db-utils:close-db)
(os-utils:exit-program)) (os-utils:exit-program))
(defmacro with-valid-yes-at-prompt ((input-text y-pressed-p) &body body)
(with-gensyms (not-null-input-p)
`(multiple-value-bind (,y-pressed-p ,not-null-input-p)
(boolean-input-accepted-p ,input-text)
(when ,not-null-input-p
,@body))))
(defun clean-temporary-files () (defun clean-temporary-files ()
"Use this to close the program" "Use this to close the program"
(flet ((on-input-complete (maybe-accepted) (flet ((on-input-complete (maybe-accepted)
(when (boolean-input-accepted-p maybe-accepted) (with-valid-yes-at-prompt (maybe-accepted y-pressed-p)
(fs:clean-temporary-directories) (when y-pressed-p
(fs:clean-temporary-files)) (fs:clean-temporary-directories)
(push-event (make-instance 'quit-program-event)))) (fs:clean-temporary-files))
(push-event (make-instance 'quit-program-event)))))
(let ((temporary-text (strcat (format nil (let ((temporary-text (strcat (format nil
(_ "~a Temporary files~2%") (_ "~a Temporary files~2%")
(swconf:gemini-h1-prefix)) (swconf:gemini-h1-prefix))
@ -75,15 +83,13 @@
(defun clean-close-program () (defun clean-close-program ()
"Use this to close the program" "Use this to close the program"
(flet ((on-input-complete (maybe-accepted) (flet ((on-input-complete (maybe-accepted)
(multiple-value-bind (y-pressed-p not-null-input-p) (with-valid-yes-at-prompt (maybe-accepted y-pressed-p)
(boolean-input-accepted-p maybe-accepted)
(when not-null-input-p
(if y-pressed-p (if y-pressed-p
(let ((delete-event (make-instance 'delete-all-status-event))) (let ((delete-event (make-instance 'delete-all-status-event)))
(push-event delete-event)) (push-event delete-event))
(db-utils:with-ready-database (:connect nil) (db-utils:with-ready-database (:connect nil)
(db:renumber-all-timelines '()))) (db:renumber-all-timelines '())))
(clean-temporary-files))))) (clean-temporary-files))))
(let ((delete-count (db:count-status-marked-to-delete)) (let ((delete-count (db:count-status-marked-to-delete))
(stop-download-event (make-instance 'gemini-abort-all-downloading-event (stop-download-event (make-instance 'gemini-abort-all-downloading-event
:priority +maximum-event-priority+))) :priority +maximum-event-priority+)))