Fix client socket path.

src/bin/cli.rs

@@ -7,12 +7,7 @@ use byteorder::{BigEndian, ReadBytesExt};
 use serde::{Deserialize, Serialize};
 use structopt::StructOpt;
 
-pub fn socket_path() -> String {
-    format!(
-        "{}/.twfss/sock",
-        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
-    )
-}
+use twfss::paths;
 
 #[derive(StructOpt, Serialize, Deserialize)]
 #[structopt(about = "CLI for the two-way file system sync client")]
@@ -68,7 +63,7 @@ struct SyncClient {
 
 impl SyncClient {
     fn connect() -> Result<SyncClient, Error> {
-        let stream = UnixStream::connect(socket_path()).unwrap();
+        let stream = UnixStream::connect(paths::client_socket()).unwrap();
         Ok(SyncClient { stream })
     }
 

src/bin/client.rs

@@ -8,7 +8,7 @@ use tokio::stream::StreamExt;
 use tokio::sync::{mpsc, Mutex};
 use tokio::signal;
 
-use twfss::{Database, FileTree, ClientSideSync, FileSystemWatcher, Error, SynchronizationError};
+use twfss::{Database, FileTree, ClientSideSync, FileSystemWatcher, Error, SynchronizationError, paths};
 
 mod cli;
 
@@ -75,7 +75,7 @@ async fn main() {
 
     // We create the socket before starting synchronization, so that the unwrap() below does not
     // cause corruption.
-    let mut listener = UnixListener::bind(cli::socket_path()).unwrap();
+    let mut listener = UnixListener::bind(paths::client_socket()).unwrap();
     let mut incoming = listener.incoming();
 
     // Initialize the existing synchronized directories.
@@ -92,6 +92,7 @@ async fn main() {
         tokio::select! {
             result = &mut ctrl_c => {
                 result.expect("could not listen for Ctrl+C");
+                println!("Ctrl+C pressed, terminating...");
                 // Ctrl+C was pressed, so we terminate the program.
                 break;
             }

src/lib.rs

@@ -9,6 +9,7 @@ mod database;
 mod file_system_watcher;
 mod file_tree;
 pub mod network;
+pub mod paths;
 pub mod protocol;
 
 pub use client_side_sync::ClientSideSync;

src/paths.rs

@@ -0,0 +1,21 @@
+pub fn config_dir() -> String {
+    format!(
+        "{}/.config/twfss",
+        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
+    )
+}
+
+pub fn client_data() -> String {
+    format!(
+        "{}/.local/share/twfss-client",
+        dirs::home_dir().unwrap().to_str().unwrap().to_owned()
+    )
+}
+
+pub fn client_db() -> String {
+    format!("{}/client.db", client_data())
+}
+
+pub fn client_socket() -> String {
+    format!("{}/client.sock", client_data())
+}