From 5c295d09dfa92c9c4c421047399481ccc25848fc Mon Sep 17 00:00:00 2001 From: Greg Shuflin Date: Sun, 2 Feb 2025 16:55:34 -0800 Subject: [PATCH] Use sqlite database from command line arg --- Rocket.toml | 4 +--- src/main.rs | 13 +++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Rocket.toml b/Rocket.toml index 3231109..293fd72 100644 --- a/Rocket.toml +++ b/Rocket.toml @@ -1,4 +1,2 @@ -[default.databases.rss_data] -url = "sqlite:data.sqlite" - +[default] secret_key = "MHSePvm1msyOkYuJ7u+MtyJYCzgdHCS7QNvrk9ts+rI=" diff --git a/src/main.rs b/src/main.rs index d931d07..9aa4640 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,7 +20,7 @@ use user::AuthenticatedUser; struct Args { /// Path to the SQLite database file #[arg(short, long)] - database: Option, + database: String, } #[derive(Database)] @@ -44,9 +44,14 @@ fn login() -> Template { #[launch] fn rocket() -> _ { - let _args = Args::parse(); - - rocket::build() + let args = Args::parse(); + + let figment = rocket::Config::figment().merge(( + "databases.rss_data.url", + format!("sqlite:{}", args.database), + )); + + rocket::custom(figment) .mount( "/", routes![