diff --git a/src/database.rs b/src/database.rs index 0868d91..ece2049 100644 --- a/src/database.rs +++ b/src/database.rs @@ -1,3 +1,5 @@ +use std::path::Path; + use log::debug; use sqlx::{migrate::MigrateDatabase, Sqlite, SqlitePool}; @@ -8,8 +10,9 @@ pub struct Database { } impl Database { - pub async fn setup(database_path: &str) -> sqlx::Result { - let connection = Database::create_connection(database_path).await?; + pub async fn setup(database_path: impl AsRef) -> sqlx::Result { + let connection = + Database::create_connection(database_path.as_ref().to_str().unwrap()).await?; sqlx::migrate!("./db-migrations").run(&connection).await?; Ok(Database { connection }) } diff --git a/src/main.rs b/src/main.rs index 5fb701a..a891f66 100644 --- a/src/main.rs +++ b/src/main.rs @@ -32,7 +32,9 @@ async fn main() { process::exit(1); } - let database = Database::setup("./testdb.sqlite").await.unwrap(); + let database = Database::setup(cli.directory.join("database.sqlite")) + .await + .unwrap(); // database.insert_sheet(Sheet::new_debug()).await.unwrap(); let sheets = database.fetch_all_sheets().await.unwrap(); let orphan_files = database.fetch_all_orphan_files().await.unwrap(); diff --git a/src/ui/sheet_model.rs b/src/ui/sheet_model.rs index 3f81794..c5a4e25 100644 --- a/src/ui/sheet_model.rs +++ b/src/ui/sheet_model.rs @@ -83,17 +83,13 @@ impl FactoryComponent for SheetModel { fn init_model(value: Self::Init, _index: &DynamicIndex, _sender: FactorySender) -> Self { let label = match &value { SheetModelType::Sheet { sheet } => sheet.name.to_string(), - SheetModelType::Orphan { orphan } => { - orphan - .path - .file_name() - .unwrap() - .to_str() - .unwrap() - .to_string() - + " " - + &orphan.last_opened.to_string() - } + SheetModelType::Orphan { orphan } => orphan + .path + .file_name() + .unwrap() + .to_str() + .unwrap() + .to_string(), }; SheetModel {