chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug: db is now dynamic for user

Browse source
This commit is contained in:
Chris Cochrun 2023-05-18 06:40:04 -05:00
parent ad2ed98968
commit a1d4dc6e52
4 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rust/image_model.rs
View file

@ -136,11 +136,15 @@ mod image_model {
} }
fn get_db(self: Pin<&mut Self>) -> SqliteConnection { 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) SqliteConnection::establish(&db_url)
.unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) .unwrap_or_else(|_| panic!("error connecting to {}", db_url))
// self.rust().db = db;
} }
#[qinvokable] #[qinvokable]

12
src/rust/presentation_model.rs
View file

@ -145,11 +145,15 @@ mod presentation_model {
} }
fn get_db(self: Pin<&mut Self>) -> SqliteConnection { 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) SqliteConnection::establish(&db_url)
.unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) .unwrap_or_else(|_| panic!("error connecting to {}", db_url))
// self.rust().db = db;
} }
#[qinvokable] #[qinvokable]

12
src/rust/song_model.rs
View file

@ -165,11 +165,15 @@ mod song_model {
} }
fn get_db(self: Pin<&mut Self>) -> SqliteConnection { 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) SqliteConnection::establish(&db_url)
.unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) .unwrap_or_else(|_| panic!("error connecting to {}", db_url))
// self.rust().db = db;
} }
#[qinvokable] #[qinvokable]

12
src/rust/video_model.rs
View file

@ -141,11 +141,15 @@ mod video_model {
} }
fn get_db(self: Pin<&mut Self>) -> SqliteConnection { 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) SqliteConnection::establish(&db_url)
.unwrap_or_else(|_| panic!("error connecting to {}", DATABASE_URL)) .unwrap_or_else(|_| panic!("error connecting to {}", db_url))
// self.rust().db = db;
} }
#[qinvokable] #[qinvokable]