Fix database location when running with --testing

ActivityWatch · Apr 4, 2020 · 642a531 · 642a531
1 parent 335417e
commit 642a531
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/aw-server/src/android/mod.rs b/aw-server/src/android/mod.rs
@@ -43,7 +43,7 @@ pub mod android {
         match DATASTORE {
             Some(ref ds) => ds.clone(),
             None => {
-                let db_dir = dirs::db_path().to_str().unwrap().to_string();
+                let db_dir = dirs::db_path(false).to_str().unwrap().to_string();
                 DATASTORE = Some(Datastore::new(db_dir, false));
                 openDatastore()
             }

diff --git a/aw-server/src/dirs.rs b/aw-server/src/dirs.rs
@@ -74,12 +74,13 @@ pub fn get_log_dir() -> Result<PathBuf, ()> {
     }
 }
 
-pub fn db_path() -> PathBuf {
+pub fn db_path(testing: bool) -> PathBuf {
     let mut db_path = get_data_dir().unwrap();
-    #[cfg(debug_assertions)]
-    db_path.push("sqlite-testing.db");
-    #[cfg(not(debug_assertions))]
-    db_path.push("sqlite.db");
+    if testing {
+        db_path.push("sqlite-testing.db");
+    } else {
+        db_path.push("sqlite.db");
+    }
     db_path
 }
 

diff --git a/aw-server/src/main.rs b/aw-server/src/main.rs
@@ -46,7 +46,7 @@ fn main() {
 
     let config = config::create_config(testing);
 
-    let db_path = dirs::db_path().to_str().unwrap().to_string();
+    let db_path = dirs::db_path(testing).to_str().unwrap().to_string();
     info!("Using DB at path {:?}", db_path);
 
     let asset_path = get_asset_path();