From ffa83bc8b0794f5e20c6ee909e963436f5f06371 Mon Sep 17 00:00:00 2001 From: Simponic Date: Sun, 29 May 2022 21:57:21 -0700 Subject: [PATCH] Update documentation; fix some bugs on first run --- README.org | 5 ----- database/seeds.lisp | 8 -------- lispruns.asd | 8 ++++---- main.lisp | 7 ++----- ui.lisp | 2 +- 5 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 database/seeds.lisp diff --git a/README.org b/README.org index c64eadf..49744dd 100644 --- a/README.org +++ b/README.org @@ -3,8 +3,3 @@ This is a complete rewrite of my first Lisp project: a speedrun timer. It uses n ** Requirements + [[https://www.quicklisp.org/beta/][Quicklisp]] + [[http://www.sbcl.org/platform-table.html][SBCL]] -** Usage -*** Importing categories -Config files are documented by the examples in ~configs~. Once a config file is written, import that category and its splits by running ~sbcl --load main.lisp -i ~. This will add the category and its splits to the timer's SQLite database. -*** Running -Simply ~sbcl --load main.lisp~ diff --git a/database/seeds.lisp b/database/seeds.lisp deleted file mode 100644 index 769676d..0000000 --- a/database/seeds.lisp +++ /dev/null @@ -1,8 +0,0 @@ -(mito:create-dao 'category :name "Super Metroid" :percentage "Any%")) - -(mito:create-dao 'category :name "Portal 1" :percentage "Any%")) - -(mito:create-dao 'category :name "Super Mario 64" :percentage "16 Stars")) - -(mito:create-dao 'category :name "Minecraft" :percentage "Any% RSG")) -(mito:create-dao 'category :name "Minecraft" :percentage "Any% SSG")) diff --git a/lispruns.asd b/lispruns.asd index ef870b7..4f6b6d8 100644 --- a/lispruns.asd +++ b/lispruns.asd @@ -17,9 +17,9 @@ (:file "speedrun" :depends-on ("util")) ;; The actual timer logic (:file "database/category") ;; Category DAO (:file "database/run") ;; Run DAO - (:file "main" :depends-on ("util" + (:file "main" :depends-on ("database/category" + "database/run" + "util" "config" "ui" - "speedrun" - "database/category" - "database/run")))) + "speedrun")))) diff --git a/main.lisp b/main.lisp index 8cafce9..a15daca 100644 --- a/main.lisp +++ b/main.lisp @@ -11,10 +11,7 @@ :arg-parser #'identity)) (defun main () - (let ((options (opts:get-opts)) - (category (car (mito:select-dao 'category)))) + (let ((options (opts:get-opts))) (when-option (options :import) (import-config (getf options :import))) - (run-ui category))) - -(main) + (run-ui (car (mito:select-dao 'category))))) diff --git a/ui.lisp b/ui.lisp index 03d47b4..1e20091 100644 --- a/ui.lisp +++ b/ui.lisp @@ -104,7 +104,7 @@ (start-speedrun speedrun) (setf state 'RUNNING)) ('RUNNING (next-split speedrun)))) - (:resize (nil)) + (:resize nil) ((nil) (case state ('TITLE