Merge branch 'master' of github.com:Freaky/Compactor

Author: Freaky

src/backend.rs

@@ -133,7 +133,7 @@ impl<T> Backend<T> {
 
     // Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn.
     fn compress_loop(&mut self) {
-        let (send_file, send_file_rx) = bounded::<Option<(PathBuf, u64)>>(1);
+        let (send_file, send_file_rx) = bounded::<(PathBuf, u64)>(1);
         let (recv_result_tx, recv_result) = bounded::<(PathBuf, io::Result<bool>)>(1);
 
         let compression = Some(config().read().unwrap().current().compression);
@@ -203,7 +203,7 @@ impl<T> Backend<T> {
 
             if let Some(mut fi) = folder.pop(FileKind::Compressible) {
                 send_file
-                    .send(Some((folder.path.join(&fi.path), fi.logical_size)))
+                    .send((folder.path.join(&fi.path), fi.logical_size))
                     .expect("send_file");
 
                 if !displayed && last_update.elapsed() > Duration::from_millis(50) {
@@ -291,7 +291,7 @@ impl<T> Backend<T> {
             }
         }
 
-        send_file.send(None).expect("send_file");
+        drop(send_file);
         task.wait();
 
         let _ = incompressible.save();
@@ -316,7 +316,7 @@ impl<T> Backend<T> {
 
     // Oh no, not again.
     fn uncompress_loop(&mut self) {
-        let (send_file, send_file_rx) = bounded::<Option<(PathBuf, u64)>>(1);
+        let (send_file, send_file_rx) = bounded::<(PathBuf, u64)>(1);
         let (recv_result_tx, recv_result) = bounded::<(PathBuf, io::Result<bool>)>(1);
 
         let compactor = BackgroundCompactor::new(None, send_file_rx, recv_result_tx);
@@ -380,7 +380,7 @@ impl<T> Backend<T> {
 
             if let Some(mut fi) = folder.pop(FileKind::Compressed) {
                 send_file
-                    .send(Some((folder.path.join(&fi.path), fi.logical_size)))
+                    .send((folder.path.join(&fi.path), fi.logical_size))
                     .expect("send_file");
 
                 let mut waiting = false;
@@ -445,7 +445,7 @@ impl<T> Backend<T> {
             }
         }
 
-        send_file.send(None).expect("send_file");
+        drop(send_file);
         task.wait();
 
         let new_size = folder.physical_size;

src/compression.rs

@@ -14,14 +14,14 @@ use crate::compact::{self, Compression};
 #[derive(Debug)]
 pub struct BackgroundCompactor {
     compression: Option<Compression>,
-    files_in: Receiver<Option<(PathBuf, u64)>>,
+    files_in: Receiver<(PathBuf, u64)>,
     files_out: Sender<(PathBuf, io::Result<bool>)>,
 }
 
 impl BackgroundCompactor {
     pub fn new(
         compression: Option<Compression>,
-        files_in: Receiver<Option<(PathBuf, u64)>>,
+        files_in: Receiver<(PathBuf, u64)>,
         files_out: Sender<(PathBuf, io::Result<bool>)>,
     ) -> Self {
         Self {
@@ -67,16 +67,10 @@ impl Background for BackgroundCompactor {
                 break;
             }
 
-            match file {
-                Some((file, _len)) => {
-                    let ret = handle_file(&file, self.compression);
-                    if self.files_out.send((file, ret)).is_err() {
-                        break;
-                    }
-                }
-                None => {
-                    break;
-                }
+            let file = file.0;
+            let ret = handle_file(&file, self.compression);
+            if self.files_out.send((file, ret)).is_err() {
+                break;
             }
         }
     }