diff --git a/src/rust/image_model.rs b/src/rust/image_model.rs index 94181ac..8be3c3f 100644 --- a/src/rust/image_model.rs +++ b/src/rust/image_model.rs @@ -136,11 +136,15 @@ mod image_model { } fn get_db(self: Pin<&mut Self>) -> SqliteConnection { - const DATABASE_URL: &str = "sqlite:///home/chris/.local/share/librepresenter/Libre Presenter/library-db.sqlite3"; + let mut data = dirs::data_local_dir().unwrap(); + data.push("librepresenter"); + data.push("library-db.sqlite3"); + let mut db_url = String::from("sqlite://"); + db_url.push_str(data.to_str().unwrap()); + println!("DB: {:?}", db_url); - SqliteConnection::establish(DATABASE_URL) - .unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) - // self.rust().db = db; + SqliteConnection::establish(&db_url) + .unwrap_or_else(|_| panic!("error connecting to {}", db_url)) } #[qinvokable] diff --git a/src/rust/presentation_model.rs b/src/rust/presentation_model.rs index 4a8ca88..6982253 100644 --- a/src/rust/presentation_model.rs +++ b/src/rust/presentation_model.rs @@ -145,11 +145,15 @@ mod presentation_model { } fn get_db(self: Pin<&mut Self>) -> SqliteConnection { - const DATABASE_URL: &str = "sqlite:///home/chris/.local/share/librepresenter/Libre Presenter/library-db.sqlite3"; + let mut data = dirs::data_local_dir().unwrap(); + data.push("librepresenter"); + data.push("library-db.sqlite3"); + let mut db_url = String::from("sqlite://"); + db_url.push_str(data.to_str().unwrap()); + println!("DB: {:?}", db_url); - SqliteConnection::establish(DATABASE_URL) - .unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) - // self.rust().db = db; + SqliteConnection::establish(&db_url) + .unwrap_or_else(|_| panic!("error connecting to {}", db_url)) } #[qinvokable] diff --git a/src/rust/song_model.rs b/src/rust/song_model.rs index 9d6c87b..94542ab 100644 --- a/src/rust/song_model.rs +++ b/src/rust/song_model.rs @@ -165,11 +165,15 @@ mod song_model { } fn get_db(self: Pin<&mut Self>) -> SqliteConnection { - const DATABASE_URL: &str = "sqlite:///home/chris/.local/share/librepresenter/Libre Presenter/library-db.sqlite3"; + let mut data = dirs::data_local_dir().unwrap(); + data.push("librepresenter"); + data.push("library-db.sqlite3"); + let mut db_url = String::from("sqlite://"); + db_url.push_str(data.to_str().unwrap()); + println!("DB: {:?}", db_url); - SqliteConnection::establish(DATABASE_URL) - .unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) - // self.rust().db = db; + SqliteConnection::establish(&db_url) + .unwrap_or_else(|_| panic!("error connecting to {}", db_url)) } #[qinvokable] diff --git a/src/rust/video_model.rs b/src/rust/video_model.rs index 1c5e583..fcd85e3 100644 --- a/src/rust/video_model.rs +++ b/src/rust/video_model.rs @@ -141,11 +141,15 @@ mod video_model { } fn get_db(self: Pin<&mut Self>) -> SqliteConnection { - const DATABASE_URL: &str = "sqlite:///home/chris/.local/share/librepresenter/Libre Presenter/library-db.sqlite3"; + let mut data = dirs::data_local_dir().unwrap(); + data.push("librepresenter"); + data.push("library-db.sqlite3"); + let mut db_url = String::from("sqlite://"); + db_url.push_str(data.to_str().unwrap()); + println!("DB: {:?}", db_url); - SqliteConnection::establish(DATABASE_URL) - .unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) - // self.rust().db = db; + SqliteConnection::establish(&db_url) + .unwrap_or_else(|_| panic!("error connecting to {}", db_url)) } #[qinvokable]