diff options
Diffstat (limited to 'server/src/main.rs')
| -rw-r--r-- | server/src/main.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index 438051f..39d5513 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,5 +1,6 @@ #![feature(box_syntax)] +use config::{load_global_config, GlobalConfig}; use database::Database; use jellyremuxer::RemuxerContext; use library::Library; @@ -7,6 +8,7 @@ use rocket::launch; use routes::build_rocket; use std::sync::Arc; +pub mod config; pub mod database; pub mod library; pub mod routes; @@ -20,12 +22,11 @@ pub struct AppState { #[launch] fn rocket() -> _ { env_logger::init_from_env("LOG"); - let db_path = std::env::var("DB_PATH").unwrap_or("data/db".to_string()); - let lib_path = std::env::var("LIB_PATH").unwrap_or("data/library".to_string()); + let conf = load_global_config(); let state = AppState { remuxer: RemuxerContext::new(), - library: Library::open(&lib_path).unwrap(), - database: Database::open(&db_path).unwrap(), + library: Library::open(&conf.library_path).unwrap(), + database: Database::open(&conf.database_path).unwrap(), }; build_rocket(state) } |