client: Fix duplicated path definitions.

src/bin/client.rs

@@ -13,24 +13,6 @@ use twfss::{Database, FileTree, ClientSideSync, FileSystemWatcher, Error, Synchr
 
 mod cli;
 
-fn config_dir() -> String {
-    format!(
-        "{}/.config/twfss",
-        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
-    )
-}
-
-fn data_dir() -> String {
-    format!(
-        "{}/.local/share/twfss-client",
-        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
-    )
-}
-
-fn db_path() -> String {
-    format!("{}/client.db", data_dir())
-}
-
 struct SynchronizedDirectory {
     path: OsString,
     client_side_sync: ClientSideSync,
@@ -65,8 +47,8 @@ impl SynchronizedDirectory {
 #[tokio::main]
 async fn main() {
     // Create the data directories if necessary.
-    create_dir_all(config_dir()).unwrap();
-    create_dir_all(data_dir()).unwrap();
+    create_dir_all(paths::config_dir()).unwrap();
+    create_dir_all(paths::client_data()).unwrap();
 
     // Check whether the client is already running, and exit if it is.
     fs::write(&paths::client_lock(), b"").ok();
@@ -87,7 +69,7 @@ async fn main() {
 
     // Initialize the existing synchronized directories.
     let mut directories = Vec::new();
-    let db = Arc::new(Mutex::new(Database::create_or_open(&db_path()).unwrap()));
+    let db = Arc::new(Mutex::new(Database::create_or_open(&paths::client_db()).unwrap()));
     for directory in db.lock().await.synchronized_directories() {
         // The function cannot fail - we just fetched the directory from the database.
         let mut sync_dir = SynchronizedDirectory::open(db.clone(), &directory, errors_send.clone()).await.unwrap();