simponic/speedrun-timer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a searching feature that isn't working too well at the moment

Browse Source
This commit is contained in:
Logan Hunt 2022-05-31 00:35:30 -07:00
parent d4e9417c32
commit f1a99a78d1
Signed by untrusted user who does not match committer: simponic
GPG Key ID: 52B3774857EB24B1
2 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
main.lisp
View File

@ -4,38 +4,65 @@
(load "database/category.lisp") (load "database/category.lisp")
(load "database/run.lisp") (load "database/run.lisp")
(defun get-input (prompt validation) (defparameter *lispruns-logo*
'("db d888888b .d8888. d8888b. d8888b. db db d8b db .d8888."
"88 `88' 88' YP 88 `8D 88 `8D 88 88 888o 88 88' YP"
"88 88 `8bo. 88oodD' 88oobY' 88 88 88V8o 88 `8bo. "
"88 88 `Y8b. 88~~~ 88`8b 88 88 88 V8o88 `Y8b."
"88booo. .88. db 8D 88 88 `88. 88b d88 88 V888 db 8D"
"Y88888P Y888888P `8888Y' 88 88 YD ~Y8888P' VP V8P `8888Y'"))
(defun get-input (prompt &optional (validator (lambda (x) t)))
(clear-input) (clear-input)
(write-string prompt) (write-string prompt)
(finish-output) (finish-output)
(let ((input (read-line))) (let ((input (read-line)))
(if (ignore-errors (funcall validation input)) (if (ignore-errors (funcall validator input))
input input
(get-input prompt validation)))) (get-input prompt validator))))
;; Options is an alist with the prompt string as the car and the value as the cdr ;; Options is an alist with the prompt string as the car and the value as the cdr
(defun get-option (options) (defun select-option (options)
(let ((i 0)) (let ((i 0))
(loop for x in options (loop for x in options
do do
(inc i) (inc i)
(format t " [~a] ~a~%" i (car x)))) (format t " [~a] ~a~%" i (car x))))
(cdr (nth (1- (parse-integer (get-input (let ((user-input (get-input (format nil "Select [~a - ~a] or search: " 1 (length options)))))
(format nil "[~a - ~a]: " 1 (length options)) (lambda (x) (let ((user-integer (parse-integer x))) (if (every #'digit-char-p user-input)
(and (let ((user-integer (parse-integer user-input)))
(>= user-integer 1) (if (and (>= user-integer 1) (<= user-integer (length options)))
(<= user-integer (length options)))))))) (cdr (nth (1- user-integer) options))
options))) (select-option options)))
(let* ((scanner (cl-ppcre:create-scanner user-input :case-insensitive-mode t))
(filtered
(remove-if-not
(lambda (option) (cl-ppcre:scan scanner (car option)))
options)))
(if filtered
(case (length filtered)
(1 (let ((searched (car filtered)))
(if (y-or-n-p "Use \"~a\"" (car searched))
(cdr searched)
(select-option options))))
(t
(format t "That search came up with multiple results:")
(select-option filtered)))
(progn (format t "E: Could not find option that matched query.~%")
(select-option options))))))
(format t "~%"))
(defun main () (defun main ()
(mapcar #'(lambda (x) (format t "~a~%" x)) *lispruns-logo*) (let ((choice (select-option '(("Help" . HELP)
(let ((choice (get-option '(("Help" . HELP) ("Import a category" . IMPORT-CATEGORY)
("Import a category" . IMPORT-CATEGORY) ("Make a new category" . NEW-CATEGORY)
("Make a new category" . NEW-CATEGORY) ("Start a speedrun" . START-SPEEDRUN)
("Start a speedrun" . START-SPEEDRUN) ("Statistics" . LIST-CATEGORIES)
("Statistics" . LIST-CATEGORIES) ("Exit" . EXIT)))))
("Exit" . EXIT))))) (format t "~a~%" choice)
(case choice (case choice
('HELP
(mapcar #'(lambda (x) (format t "~a~%" x)) *lispruns-logo*))
('IMPORT-CATEGORY ('IMPORT-CATEGORY
(import-category (get-input (format nil "Relative or absolute path to configuration file [~a]: " (uiop/os:getcwd)) 'probe-file))) (import-category (get-input (format nil "Relative or absolute path to configuration file [~a]: " (uiop/os:getcwd)) 'probe-file)))
('NEW-CATEGORY ('NEW-CATEGORY
@ -46,7 +73,7 @@
(quit)))) (quit))))
(format t "~%") (format t "~%")
(main)) (main))
;; (let ((options (opts:get-opts))) ;; (let ((options (opts:get-opts)))
;; (when-option (options :import) ;; (when-option (options :import)

8
ui.lisp
View File

@ -1,11 +1,3 @@
(defparameter *lispruns-logo*
'("db d888888b .d8888. d8888b. d8888b. db db d8b db .d8888."
"88 `88' 88' YP 88 `8D 88 `8D 88 88 888o 88 88' YP"
"88 88 `8bo. 88oodD' 88oobY' 88 88 88V8o 88 `8bo. "
"88 88 `Y8b. 88~~~ 88`8b 88 88 88 V8o88 `Y8b."
"88booo. .88. db 8D 88 88 `88. 88b d88 88 V888 db 8D"
"Y88888P Y888888P `8888Y' 88 88 YD ~Y8888P' VP V8P `8888Y'"))
(defparameter *colors* (defparameter *colors*
'((main . (:green :black)) '((main . (:green :black))
(timer-box . (:red :black)) (timer-box . (:red :black))