Browse Source

cargo fmt

Mathias Gottschlag 5 years ago
parent
commit
755251ba71
3 changed files with 52 additions and 22 deletions
  1. 44
    15
      src/bin/client.rs
  2. 1
    1
      src/client_side_sync.rs
  3. 7
    6
      src/network/client.rs

+ 44
- 15
src/bin/client.rs View File

1
+use std::ffi::{OsStr, OsString};
1
 use std::fs::{self, create_dir_all, remove_file};
2
 use std::fs::{self, create_dir_all, remove_file};
2
 use std::sync::Arc;
3
 use std::sync::Arc;
3
-use std::ffi::{OsStr, OsString};
4
 
4
 
5
+use fslock::LockFile;
5
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
6
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
6
 use tokio::net::{UnixListener, UnixStream};
7
 use tokio::net::{UnixListener, UnixStream};
7
 use tokio::stream::StreamExt;
8
 use tokio::stream::StreamExt;
8
 use tokio::sync::{mpsc, Mutex};
9
 use tokio::sync::{mpsc, Mutex};
9
-use tokio::signal;
10
-use fslock::LockFile;
11
 
10
 
12
-use twfss::{Database, FileTree, ClientSideSync, FileSystemWatcher, Error, SynchronizationError, paths};
11
+use twfss::{
12
+    paths, ClientSideSync, Database, Error, FileSystemWatcher, FileTree, SynchronizationError,
13
+};
13
 
14
 
14
 mod cli;
15
 mod cli;
15
 
16
 
21
 }
22
 }
22
 
23
 
23
 impl SynchronizedDirectory {
24
 impl SynchronizedDirectory {
24
-    async fn open(database: Arc<Mutex<Database>>, directory: &OsStr, errors: mpsc::Sender<SynchronizationError>) -> Result<SynchronizedDirectory, Error> {
25
+    async fn open(
26
+        database: Arc<Mutex<Database>>,
27
+        directory: &OsStr,
28
+        errors: mpsc::Sender<SynchronizationError>,
29
+    ) -> Result<SynchronizedDirectory, Error> {
25
         let file_tree = Arc::new(Mutex::new(FileTree::open(database, directory)?));
30
         let file_tree = Arc::new(Mutex::new(FileTree::open(database, directory)?));
26
         let client_side_sync = ClientSideSync::new(file_tree.clone(), errors.clone()).await;
31
         let client_side_sync = ClientSideSync::new(file_tree.clone(), errors.clone()).await;
27
         let file_system_watcher = FileSystemWatcher::new(file_tree, errors).await;
32
         let file_system_watcher = FileSystemWatcher::new(file_tree, errors).await;
28
-        Ok(SynchronizedDirectory{
33
+        Ok(SynchronizedDirectory {
29
             path: directory.to_owned(),
34
             path: directory.to_owned(),
30
             client_side_sync,
35
             client_side_sync,
31
             file_system_watcher,
36
             file_system_watcher,
69
 
74
 
70
     // Initialize the existing synchronized directories.
75
     // Initialize the existing synchronized directories.
71
     let mut directories = Vec::new();
76
     let mut directories = Vec::new();
72
-    let db = Arc::new(Mutex::new(Database::create_or_open(&paths::client_db()).unwrap()));
77
+    let db = Arc::new(Mutex::new(
78
+        Database::create_or_open(&paths::client_db()).unwrap(),
79
+    ));
73
     for directory in db.lock().await.synchronized_directories() {
80
     for directory in db.lock().await.synchronized_directories() {
74
         // The function cannot fail - we just fetched the directory from the database.
81
         // The function cannot fail - we just fetched the directory from the database.
75
-        let mut sync_dir = SynchronizedDirectory::open(db.clone(), &directory, errors_send.clone()).await.unwrap();
82
+        let mut sync_dir = SynchronizedDirectory::open(db.clone(), &directory, errors_send.clone())
83
+            .await
84
+            .unwrap();
76
         sync_dir.unpause().await;
85
         sync_dir.unpause().await;
77
         directories.push(sync_dir);
86
         directories.push(sync_dir);
78
     }
87
     }
137
     }
146
     }
138
 }
147
 }
139
 
148
 
140
-async fn handle_cli_client(stream: &mut UnixStream, directories: &mut Vec<SynchronizedDirectory>, _db: Arc<Mutex<Database>>) -> Result<(), Error> {
149
+async fn handle_cli_client(
150
+    stream: &mut UnixStream,
151
+    directories: &mut Vec<SynchronizedDirectory>,
152
+    _db: Arc<Mutex<Database>>,
153
+) -> Result<(), Error> {
141
     let mut request = String::new();
154
     let mut request = String::new();
142
     stream.read_to_string(&mut request).await?;
155
     stream.read_to_string(&mut request).await?;
143
 
156
 
154
             // TODO
167
             // TODO
155
         }
168
         }
156
         cli::Command::Pause => {
169
         cli::Command::Pause => {
157
-            for  directory in directories.iter_mut() {
170
+            for directory in directories.iter_mut() {
158
                 directory.pause().await;
171
                 directory.pause().await;
159
                 if verbose {
172
                 if verbose {
160
-                    stream.write_all(format!("Paused {}.\n", directory.path.to_string_lossy()).as_bytes()).await.ok();
173
+                    stream
174
+                        .write_all(
175
+                            format!("Paused {}.\n", directory.path.to_string_lossy()).as_bytes(),
176
+                        )
177
+                        .await
178
+                        .ok();
161
                 }
179
                 }
162
             }
180
             }
163
-            stream.write_all("Synchronization paused.\n".as_bytes()).await.ok();
181
+            stream
182
+                .write_all("Synchronization paused.\n".as_bytes())
183
+                .await
184
+                .ok();
164
         }
185
         }
165
         cli::Command::Resume => {
186
         cli::Command::Resume => {
166
-            for  directory in directories.iter_mut() {
187
+            for directory in directories.iter_mut() {
167
                 directory.unpause().await;
188
                 directory.unpause().await;
168
                 if verbose {
189
                 if verbose {
169
-                    stream.write_all(format!("Resumed {}.\n", directory.path.to_string_lossy()).as_bytes()).await.ok();
190
+                    stream
191
+                        .write_all(
192
+                            format!("Resumed {}.\n", directory.path.to_string_lossy()).as_bytes(),
193
+                        )
194
+                        .await
195
+                        .ok();
170
                 }
196
                 }
171
             }
197
             }
172
-            stream.write_all("Synchronization resumed.\n".as_bytes()).await.ok();
198
+            stream
199
+                .write_all("Synchronization resumed.\n".as_bytes())
200
+                .await
201
+                .ok();
173
         }
202
         }
174
     }
203
     }
175
 
204
 

+ 1
- 1
src/client_side_sync.rs View File

30
             sync_task.task_paused(pause_receive).await;
30
             sync_task.task_paused(pause_receive).await;
31
         });
31
         });
32
 
32
 
33
-        ClientSideSync{
33
+        ClientSideSync {
34
             state_send,
34
             state_send,
35
             new_version_source,
35
             new_version_source,
36
         }
36
         }

+ 7
- 6
src/network/client.rs View File

317
     where
317
     where
318
         T: Serialize,
318
         T: Serialize,
319
     {
319
     {
320
-        let packet = Packet {
321
-            id,
322
-            payload,
323
-        };
320
+        let packet = Packet { id, payload };
324
         let mut serialized = Vec::new();
321
         let mut serialized = Vec::new();
325
         packet
322
         packet
326
             .serialize(
323
             .serialize(
410
                     assert_eq!(events.next().await, None);
407
                     assert_eq!(events.next().await, None);
411
                 }),
408
                 }),
412
                 tokio::spawn(async move {
409
                 tokio::spawn(async move {
413
-                    pipe2.send(serialize_packet(SERVER_EVENT_ID, 42)).await.unwrap();
410
+                    pipe2
411
+                        .send(serialize_packet(SERVER_EVENT_ID, 42))
412
+                        .await
413
+                        .unwrap();
414
                     drop(pipe2);
414
                     drop(pipe2);
415
                 }),
415
                 }),
416
             );
416
             );
417
 
417
 
418
             tasks.0.await.unwrap();
418
             tasks.0.await.unwrap();
419
             tasks.1.await.unwrap();
419
             tasks.1.await.unwrap();
420
-        }).await;
420
+        })
421
+        .await;
421
     }
422
     }
422
 
423
 
423
     // TODO:
424
     // TODO:

Loading…
Cancel
Save