From 410548529c832f9bd3c02577d2529d8dde5fc02f Mon Sep 17 00:00:00 2001
From: Tomas Sedlak <tomas.sedlak@masterminds.sk>
Date: Fri, 20 Jan 2023 20:51:25 +0100
Subject: [PATCH] Fix panic when the 'serve' subcommand is used for the first
 time (#25)

When the 'serve' subcommand is executed for the first time, sqlite will panic on missing .session_store directory.
---
 kitchen/src/main.rs            | 13 +++++++------
 kitchen/src/web/storage/mod.rs |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/kitchen/src/main.rs b/kitchen/src/main.rs
index 18d7562..42981de 100644
--- a/kitchen/src/main.rs
+++ b/kitchen/src/main.rs
@@ -38,13 +38,13 @@ fn create_app<'a>() -> clap::App<'a> {
         )
         (@subcommand groceries =>
             (about: "print out a grocery list for a set of recipes")
-            (@arg csv: --csv "output ingredeints as csv")
+            (@arg csv: --csv "output ingredients as csv")
             (@arg INPUT: +required "Input menu file to parse. One recipe file per line.")
         )
         (@subcommand serve =>
             (about: "Serve the interface via the web")
             (@arg recipe_dir: -d --dir +takes_value "Directory containing recipe files to use")
-            (@arg session_dir: --session_dir +takes_value "Session store directory to use")
+            (@arg session_dir: --session_dir +takes_value +required "Session store directory to use")
             (@arg tls: --tls "Use TLS to serve.")
             (@arg cert_path: --cert +takes_value "Certificate path. Required if you specified --tls.")
             (@arg key_path: --cert_key +takes_value "Certificate key path. Required if you specified --tls")
@@ -55,7 +55,7 @@ fn create_app<'a>() -> clap::App<'a> {
             (@arg recipe_dir: -d --dir +takes_value "Directory containing recipe files to load for user")
             (@arg user: -u --user +takes_value +required "username to add")
             (@arg pass: -p --pass +takes_value +required "password to add for this user")
-            (@arg session_dir: --session_dir +takes_value "Session store directory to use")
+            (@arg session_dir: --session_dir +takes_value +required "Session store directory to use")
         )
     )
     .setting(clap::AppSettings::SubcommandRequiredElseHelp)
@@ -65,9 +65,10 @@ fn get_session_store_path(matches: &ArgMatches) -> PathBuf {
     if let Some(dir) = matches.value_of("session_dir") {
         PathBuf::from(dir)
     } else {
-        let mut dir =
-            std::env::current_dir().expect("Unable to get current directory. Bailing out.");
-        dir.push(".session_store");
+        let mut dir = std::env::var("HOME")
+            .map(PathBuf::from)
+            .expect("Unable to get user home directory. Bailing out.");
+        dir.push(".kitchen");
         dir
     }
 }
diff --git a/kitchen/src/web/storage/mod.rs b/kitchen/src/web/storage/mod.rs
index 29db0ca..8ae1dbf 100644
--- a/kitchen/src/web/storage/mod.rs
+++ b/kitchen/src/web/storage/mod.rs
@@ -256,6 +256,7 @@ pub struct SqliteStore {
 
 impl SqliteStore {
     pub async fn new<P: AsRef<Path>>(path: P) -> sqlx::Result<Self> {
+        std::fs::create_dir_all(&path)?;
         let url = format!("sqlite://{}/store.db", path.as_ref().to_string_lossy());
         let options = SqliteConnectOptions::from_str(&url)?
             .journal_mode(SqliteJournalMode::Wal)
@@ -267,7 +268,7 @@ impl SqliteStore {
 
     #[instrument(fields(conn_string=self.url), skip_all)]
     pub async fn run_migrations(&self) -> sqlx::Result<()> {
-        info!("Running databse migrations");
+        info!("Running database migrations");
         sqlx::migrate!("./migrations")
             .run(self.pool.as_ref())
             .await?;