Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-14 16:51:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(db): initialise doesn't recreate default install dir

Browse Source
This commit is contained in:
DecDuck
2024-11-24 09:01:11 +11:00
parent e22e6d8a55
commit 7a3841bf0c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/src/auth.rs
View File

@ -190,7 +190,6 @@ pub async fn auth_initiate<'a>() -> Result<(), String> {
pub fn setup() -> Result<(AppStatus, Option<User>), ()> { pub fn setup() -> Result<(AppStatus, Option<User>), ()> {
let data = DB.borrow_data().unwrap(); let data = DB.borrow_data().unwrap();
// If we have certs, exit for now
if data.auth.is_some() { if data.auth.is_some() {
let user_result = fetch_user(); let user_result = fetch_user();
if user_result.is_err() { if user_result.is_err() {

10
src-tauri/src/db.rs
View File

@ -61,9 +61,6 @@ impl DatabaseImpls for DatabaseInterface {
let db_path = data_root_dir.join("drop.db"); let db_path = data_root_dir.join("drop.db");
let games_base_dir = data_root_dir.join("games"); let games_base_dir = data_root_dir.join("games");
create_dir_all(data_root_dir.clone()).unwrap();
create_dir_all(games_base_dir.clone()).unwrap();
let default = Database { let default = Database {
auth: None, auth: None,
base_url: "".to_string(), base_url: "".to_string(),
@ -75,7 +72,12 @@ impl DatabaseImpls for DatabaseInterface {
#[allow(clippy::let_and_return)] #[allow(clippy::let_and_return)]
let db = match fs::exists(db_path.clone()).unwrap() { let db = match fs::exists(db_path.clone()).unwrap() {
true => PathDatabase::load_from_path(db_path).expect("Database loading failed"), true => PathDatabase::load_from_path(db_path).expect("Database loading failed"),
false => PathDatabase::create_at_path(db_path, default).unwrap(), false => {
create_dir_all(data_root_dir.clone()).unwrap();
create_dir_all(games_base_dir.clone()).unwrap();
PathDatabase::create_at_path(db_path, default).unwrap()
}
}; };
db db