Merge pull request #30 from Dr-Emann/misc

Cargo Fmt, more Crossbeam channel, and Less Mutex

Author: Freaky

src/background.rs

@@ -1,6 +1,6 @@
-use std::panic::{catch_unwind, RefUnwindSafe};
+use crossbeam_channel::{Receiver, RecvTimeoutError, TryRecvError};
+use std::panic::{catch_unwind, UnwindSafe};
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{self, Receiver, RecvTimeoutError, TryRecvError};
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::thread;
@@ -98,16 +98,16 @@ pub struct BackgroundHandle<T, S> {
 impl<T, S> BackgroundHandle<T, S> {
     pub fn spawn<K>(task: K) -> BackgroundHandle<T, S>
     where
-        K: Background<Output = T, Status = S> + RefUnwindSafe + Send + Sync + 'static,
+        K: Background<Output = T, Status = S> + UnwindSafe + Send + Sync + 'static,
         T: Send + Sync + 'static,
         S: Send + Sync + Clone + 'static,
     {
-        let (tx, rx) = mpsc::channel();
+        let (tx, rx) = crossbeam_channel::unbounded();
         let control = ControlToken::new();
         let inner_control = control.clone();
 
         let handle = thread::spawn(move || {
-            let response = catch_unwind(|| task.run(&inner_control));
+            let response = catch_unwind(move || task.run(&inner_control));
             let _ = tx.send(response);
         });
 
@@ -180,7 +180,7 @@ pub trait Background: Send + Sync {
     type Output: Send + Sync;
     type Status: Send + Sync;
 
-    fn run(&self, control: &ControlToken<Self::Status>) -> Self::Output;
+    fn run(self, control: &ControlToken<Self::Status>) -> Self::Output;
 }
 
 #[cfg(test)]
@@ -195,7 +195,7 @@ mod tests {
         type Output = Result<u32, u32>;
         type Status = u32;
 
-        fn run(&self, control: &ControlToken<Self::Status>) -> Self::Output {
+        fn run(self, control: &ControlToken<Self::Status>) -> Self::Output {
             let mut ticks = 0;
 
             while ticks < 100 && !control.is_cancelled_with_pause() {

src/compact.rs

@@ -274,7 +274,10 @@ pub fn compress_file<P: AsRef<Path>>(path: P, compression: Compression) -> std::
     compress_file_handle(&file, compression)
 }
 
-pub fn compress_file_handle(file: &std::fs::File, compression: Compression) -> std::io::Result<bool> {
+pub fn compress_file_handle(
+    file: &std::fs::File,
+    compression: Compression,
+) -> std::io::Result<bool> {
     const LEN: usize = std::mem::size_of::<_WOF_EXTERNAL_INFO>()
         + std::mem::size_of::<_FILE_PROVIDER_EXTERNAL_INFO_V1>();
 

src/compression.rs

@@ -1,11 +1,11 @@
 use std::io;
-use std::path::PathBuf;
 use std::os::windows::fs::OpenOptionsExt;
+use std::path::PathBuf;
 
 use compresstimator::Compresstimator;
 use crossbeam_channel::{Receiver, Sender};
 use filetime::FileTime;
-use winapi::um::winnt::{FILE_WRITE_ATTRIBUTES, FILE_READ_DATA};
+use winapi::um::winnt::{FILE_READ_DATA, FILE_WRITE_ATTRIBUTES};
 
 use crate::background::Background;
 use crate::background::ControlToken;
@@ -51,7 +51,7 @@ fn handle_file(file: &PathBuf, compression: Option<Compression>) -> io::Result<b
     let _ = filetime::set_file_handle_times(
         &handle,
         Some(FileTime::from_last_access_time(&meta)),
-        Some(FileTime::from_last_modification_time(&meta))
+        Some(FileTime::from_last_modification_time(&meta)),
     );
 
     ret
@@ -61,7 +61,7 @@ impl Background for BackgroundCompactor {
     type Output = ();
     type Status = ();
 
-    fn run(&self, control: &ControlToken<Self::Status>) -> Self::Output {
+    fn run(self, control: &ControlToken<Self::Status>) -> Self::Output {
         for file in &self.files_in {
             if control.is_cancelled_with_pause() {
                 break;

src/folder.rs

@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 use std::os::windows::fs::MetadataExt;
 use std::path::{Path, PathBuf};
-use std::sync::Mutex;
 use std::time::{Duration, Instant};
 
 use filesize::file_real_size;
@@ -154,14 +153,14 @@ impl GroupInfo {
 #[derive(Debug)]
 pub struct FolderScan {
     path: PathBuf,
-    excludes: Mutex<GlobSet>,
+    excludes: GlobSet,
 }
 
 impl FolderScan {
     pub fn new<P: AsRef<Path>>(path: P, excludes: GlobSet) -> Self {
         Self {
             path: path.as_ref().to_path_buf(),
-            excludes: Mutex::new(excludes),
+            excludes,
         }
     }
 }
@@ -170,9 +169,9 @@ impl Background for FolderScan {
     type Output = Result<FolderInfo, FolderInfo>;
     type Status = (PathBuf, FolderSummary);
 
-    fn run(&self, control: &ControlToken<Self::Status>) -> Self::Output {
-        let mut ds = FolderInfo::new(&self.path);
-        let excludes = self.excludes.lock().expect("exclude lock");
+    fn run(self, control: &ControlToken<Self::Status>) -> Self::Output {
+        let FolderScan { path, excludes } = self;
+        let mut ds = FolderInfo::new(&path);
         let incompressible = pathdb();
         let mut incompressible = incompressible.write().unwrap();
         let _ = incompressible.load();
@@ -186,7 +185,7 @@ impl Background for FolderScan {
         // 4. Grab metadata - should be infallible on Windows, it comes with the
         //    DirEntry.
         // 5. GetCompressedFileSizeW() or skip.
-        let walker = WalkDir::new(&self.path)
+        let walker = WalkDir::new(&path)
             .into_iter()
             .filter_entry(|e| e.file_type().is_file() || !excludes.is_match(e.path()))
             .filter_map(|e| e.map_err(|e| eprintln!("Error: {:?}", e)).ok())
@@ -198,7 +197,7 @@ impl Background for FolderScan {
         for (count, (entry, metadata, physical)) in walker {
             let shortname = entry
                 .path()
-                .strip_prefix(&self.path)
+                .strip_prefix(&path)
                 .unwrap_or_else(|_e| entry.path())
                 .to_path_buf();