Move server path definitions.

src/bin/server.rs

@@ -9,35 +9,19 @@ use log::*;
 use tokio::net::{TcpListener, TcpStream};
 use tokio::stream::StreamExt;
 
-use twfss::Database;
-
-fn config_dir() -> String {
-    format!(
-        "{}/.config/twfss",
-        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
-    )
-}
-
-fn data_dir() -> String {
-    format!(
-        "{}/.local/share/twfss-server",
-        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
-    )
-}
-
-fn db_path() -> String {
-    format!("{}/server.db", data_dir())
-}
+use twfss::{paths, Database};
 
 #[tokio::main]
 async fn main() {
     env_logger::init();
 
     // Create the configuration directory if necessary.
-    create_dir_all(config_dir()).unwrap();
+    create_dir_all(paths::config_dir()).unwrap();
 
     // Read configuration.
-    let _db = Arc::new(Mutex::new(Database::create_or_open(&db_path()).unwrap()));
+    let _db = Arc::new(Mutex::new(
+        Database::create_or_open(&paths::server_db()).unwrap(),
+    ));
     // TODO
 
     // Start a thread that periodically checks whether the maximum database size

src/paths.rs

@@ -12,10 +12,21 @@ pub fn client_data() -> String {
     )
 }
 
+pub fn server_data() -> String {
+    format!(
+        "{}/.local/share/twfss-server",
+        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
+    )
+}
+
 pub fn client_db() -> String {
     format!("{}/client.db", client_data())
 }
 
+pub fn server_db() -> String {
+    format!("{}/client.db", client_data())
+}
+
 pub fn client_socket() -> String {
     format!("{}/client.sock", client_data())
 }