rustfmt

qarmin · Dec 29, 2021 · ccea006 · ccea006
1 parent 2d67b7b
commit ccea006
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 91 deletions.
diff --git a/czkawka_cli/src/commands.rs b/czkawka_cli/src/commands.rs
@@ -3,8 +3,8 @@ use std::path::PathBuf;
 use img_hash::{FilterType, HashAlg};
 use structopt::StructOpt;
 
-use czkawka_core::duplicate::{DeleteMethod, HashType};
 use czkawka_core::common_dir_traversal::CheckingMethod;
+use czkawka_core::duplicate::{DeleteMethod, HashType};
 use czkawka_core::same_music::MusicSimilarity;
 use czkawka_core::similar_images::SimilarityPreset;
 

diff --git a/czkawka_core/src/common_dir_traversal.rs b/czkawka_core/src/common_dir_traversal.rs
@@ -105,7 +105,7 @@ pub struct DirTraversal<'a, 'b, F> {
     group_by: F,
     root_dirs: Vec<PathBuf>,
     stop_receiver: Option<&'a Receiver<()>>,
-    progress_sender:  Option<&'b futures::channel::mpsc::UnboundedSender<ProgressData>>,
+    progress_sender: Option<&'b futures::channel::mpsc::UnboundedSender<ProgressData>>,
     recursive_search: bool,
     directories: Directories,
     excluded_items: ExcludedItems,
@@ -199,7 +199,8 @@ impl<'a, 'b, F> DirTraversalBuilder<'a, 'b, F> {
     }
 
     pub fn group_by<G, T>(self, group_by: G) -> DirTraversalBuilder<'a, 'b, G>
-        where G: Fn(&FileEntry) -> T
+    where
+        G: Fn(&FileEntry) -> T,
     {
         DirTraversalBuilder {
             group_by: Some(group_by),
@@ -252,8 +253,9 @@ pub enum DirTraversalResult<T: Ord + PartialOrd> {
 }
 
 impl<'a, 'b, F, T> DirTraversal<'a, 'b, F>
-    where F: Fn(&FileEntry) -> T,
-        T: Ord + PartialOrd,
+where
+    F: Fn(&FileEntry) -> T,
+    T: Ord + PartialOrd,
 {
     pub fn run(self) -> DirTraversalResult<T> {
         let mut all_warnings = vec![];
@@ -310,7 +312,17 @@ impl<'a, 'b, F, T> DirTraversal<'a, 'b, F>
 
         //// PROGRESS THREAD END
 
-        let DirTraversal { collect, directories, excluded_items, allowed_extensions, recursive_search, minimal_file_size, maximal_file_size, stop_receiver, .. } = self;
+        let DirTraversal {
+            collect,
+            directories,
+            excluded_items,
+            allowed_extensions,
+            recursive_search,
+            minimal_file_size,
+            maximal_file_size,
+            stop_receiver,
+            ..
+        } = self;
 
         while !folders_to_check.is_empty() {
             if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() {
@@ -386,34 +398,32 @@ impl<'a, 'b, F, T> DirTraversal<'a, 'b, F>
                                     continue 'dir;
                                 }
                                 dir_result.push(next_folder.clone());
-                                folder_entries_list.push(
-                                    (
-                                        next_folder.clone(),
-                                        FolderEntry {
-                                            parent_path: Some(current_folder.clone()),
-                                            is_empty: FolderEmptiness::Maybe,
-                                            modified_date: match metadata.modified() {
-                                                Ok(t) => match t.duration_since(UNIX_EPOCH) {
-                                                    Ok(d) => d.as_secs(),
-                                                    Err(_inspected) => {
-                                                        warnings.push(fl!(
-                                                            "core_folder_modified_before_epoch",
-                                                            generate_translation_hashmap(vec![("name", current_folder.display().to_string())])
-                                                        ));
-                                                        0
-                                                    }
-                                                },
-                                                Err(e) => {
+                                folder_entries_list.push((
+                                    next_folder.clone(),
+                                    FolderEntry {
+                                        parent_path: Some(current_folder.clone()),
+                                        is_empty: FolderEmptiness::Maybe,
+                                        modified_date: match metadata.modified() {
+                                            Ok(t) => match t.duration_since(UNIX_EPOCH) {
+                                                Ok(d) => d.as_secs(),
+                                                Err(_inspected) => {
                                                     warnings.push(fl!(
-                                                        "core_folder_no_modification_date",
-                                                        generate_translation_hashmap(vec![("name", current_folder.display().to_string()), ("reason", e.to_string())])
+                                                        "core_folder_modified_before_epoch",
+                                                        generate_translation_hashmap(vec![("name", current_folder.display().to_string())])
                                                     ));
                                                     0
                                                 }
                                             },
+                                            Err(e) => {
+                                                warnings.push(fl!(
+                                                    "core_folder_no_modification_date",
+                                                    generate_translation_hashmap(vec![("name", current_folder.display().to_string()), ("reason", e.to_string())])
+                                                ));
+                                                0
+                                            }
                                         },
-                                    )
-                                );
+                                    },
+                                ));
                             }
                         } else if metadata.is_file() && collect == Collect::Files {
                             atomic_entry_counter.fetch_add(1, Ordering::Relaxed);
@@ -558,10 +568,7 @@ impl<'a, 'b, F, T> DirTraversal<'a, 'b, F>
                                 },
                                 size: 0,
                                 hash: "".to_string(),
-                                symlink_info: Some(SymlinkInfo {
-                                    destination_path,
-                                    type_of_error,
-                                }),
+                                symlink_info: Some(SymlinkInfo { destination_path, type_of_error }),
                             };
 
                             // Adding files to Vector
@@ -597,20 +604,16 @@ impl<'a, 'b, F, T> DirTraversal<'a, 'b, F>
         progress_thread_handle.join().unwrap();
 
         match collect {
-            Collect::Files | Collect::InvalidSymlinks => {
-                DirTraversalResult::SuccessFiles {
-                    start_time,
-                    grouped_file_entries,
-                    warnings: all_warnings,
-                }
-            }
-            Collect::EmptyFolders => {
-                DirTraversalResult::SuccessFolders {
-                    start_time,
-                    folder_entries,
-                    warnings: all_warnings,
-                }
-            }
+            Collect::Files | Collect::InvalidSymlinks => DirTraversalResult::SuccessFiles {
+                start_time,
+                grouped_file_entries,
+                warnings: all_warnings,
+            },
+            Collect::EmptyFolders => DirTraversalResult::SuccessFolders {
+                start_time,
+                folder_entries,
+                warnings: all_warnings,
+            },
         }
     }
 }
@@ -629,4 +632,4 @@ fn set_as_not_empty_folder(folder_entries: &mut BTreeMap<PathBuf, FolderEntry>,
             break;
         }
     }
-}
+}
diff --git a/czkawka_core/src/duplicate.rs b/czkawka_core/src/duplicate.rs
@@ -21,18 +21,12 @@ use humansize::{file_size_opts as options, FileSize};
 use rayon::prelude::*;
 
 use crate::common::Common;
+use crate::common_dir_traversal::{CheckingMethod, DirTraversalBuilder, DirTraversalResult, FileEntry, ProgressData};
 use crate::common_directory::Directories;
 use crate::common_extensions::Extensions;
 use crate::common_items::ExcludedItems;
 use crate::common_messages::Messages;
 use crate::common_traits::*;
-use crate::common_dir_traversal::{
-    DirTraversalBuilder,
-    DirTraversalResult,
-    FileEntry,
-    CheckingMethod,
-    ProgressData,
-};
 
 #[derive(PartialEq, Eq, Clone, Debug, Copy)]
 pub enum HashType {
@@ -377,9 +371,7 @@ impl DuplicateFinder {
             DirTraversalResult::SuccessFolders { .. } => {
                 unreachable!()
             }
-            DirTraversalResult::Stopped => {
-                false
-            }
+            DirTraversalResult::Stopped => false,
         }
     }
 
@@ -479,9 +471,7 @@ impl DuplicateFinder {
             DirTraversalResult::SuccessFolders { .. } => {
                 unreachable!()
             }
-            DirTraversalResult::Stopped => {
-                false
-            }
+            DirTraversalResult::Stopped => false,
         }
     }
 
@@ -1452,7 +1442,7 @@ impl MyHasher for xxhash_rust::xxh3::Xxh3 {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{read_dir, Metadata, File};
+    use std::fs::{read_dir, File, Metadata};
     use std::io;
     #[cfg(target_family = "windows")]
     use std::os::fs::MetadataExt;

diff --git a/czkawka_core/src/empty_files.rs b/czkawka_core/src/empty_files.rs
@@ -1,24 +1,19 @@
+use std::fs;
 use std::fs::File;
 use std::io::prelude::*;
 use std::io::BufWriter;
 use std::path::PathBuf;
 use std::time::SystemTime;
-use std::fs;
 
 use crossbeam_channel::Receiver;
 
 use crate::common::Common;
+use crate::common_dir_traversal::{DirTraversalBuilder, DirTraversalResult, FileEntry, ProgressData};
 use crate::common_directory::Directories;
 use crate::common_extensions::Extensions;
 use crate::common_items::ExcludedItems;
 use crate::common_messages::Messages;
 use crate::common_traits::*;
-use crate::common_dir_traversal::{
-    DirTraversalBuilder,
-    DirTraversalResult,
-    FileEntry,
-    ProgressData,
-};
 
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum DeleteMethod {
@@ -148,9 +143,7 @@ impl EmptyFiles {
             DirTraversalResult::SuccessFolders { .. } => {
                 unreachable!()
             }
-            DirTraversalResult::Stopped => {
-                false
-            }
+            DirTraversalResult::Stopped => false,
         }
     }
 

diff --git a/czkawka_core/src/invalid_symlinks.rs b/czkawka_core/src/invalid_symlinks.rs
@@ -1,26 +1,19 @@
+use std::fs;
 use std::fs::File;
 use std::io::prelude::*;
 use std::io::BufWriter;
 use std::path::PathBuf;
 use std::time::SystemTime;
-use std::fs;
 
 use crossbeam_channel::Receiver;
 
 use crate::common::Common;
+use crate::common_dir_traversal::{Collect, DirTraversalBuilder, DirTraversalResult, ErrorType, FileEntry, ProgressData};
 use crate::common_directory::Directories;
 use crate::common_extensions::Extensions;
 use crate::common_items::ExcludedItems;
 use crate::common_messages::Messages;
 use crate::common_traits::*;
-use crate::common_dir_traversal::{
-    DirTraversalBuilder,
-    DirTraversalResult,
-    FileEntry,
-    ProgressData,
-    Collect,
-    ErrorType,
-};
 
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum DeleteMethod {
@@ -146,9 +139,7 @@ impl InvalidSymlinks {
                 true
             }
             DirTraversalResult::SuccessFolders { .. } => unreachable!(),
-            DirTraversalResult::Stopped => {
-                false
-            }
+            DirTraversalResult::Stopped => false,
         }
     }
 

diff --git a/czkawka_core/src/lib.rs b/czkawka_core/src/lib.rs
@@ -13,12 +13,12 @@ pub mod similar_videos;
 pub mod temporary;
 
 pub mod common;
+pub mod common_dir_traversal;
 pub mod common_directory;
 pub mod common_extensions;
 pub mod common_items;
 pub mod common_messages;
 pub mod common_traits;
-pub mod common_dir_traversal;
 pub mod localizer;
 
 pub const CZKAWKA_VERSION: &str = env!("CARGO_PKG_VERSION");
diff --git a/czkawka_gui/src/compute_results.rs b/czkawka_gui/src/compute_results.rs
@@ -1368,7 +1368,10 @@ pub fn connect_compute_results(gui_data: &GuiData, glib_stop_receiver: Receiver<
                                 (ColumnsInvalidSymlinks::Name as u32, &file),
                                 (ColumnsInvalidSymlinks::Path as u32, &directory),
                                 (ColumnsInvalidSymlinks::DestinationPath as u32, &symlink_info.destination_path.to_string_lossy().to_string()),
-                                (ColumnsInvalidSymlinks::TypeOfError as u32, &get_text_from_invalid_symlink_cause(&symlink_info.type_of_error)),
+                                (
+                                    ColumnsInvalidSymlinks::TypeOfError as u32,
+                                    &get_text_from_invalid_symlink_cause(&symlink_info.type_of_error),
+                                ),
                                 (
                                     ColumnsInvalidSymlinks::Modification as u32,
                                     &(NaiveDateTime::from_timestamp(file_entry.modified_date as i64, 0).to_string()),

diff --git a/czkawka_gui/src/connect_button_search.rs b/czkawka_gui/src/connect_button_search.rs
@@ -7,6 +7,7 @@ use gtk::prelude::*;
 
 use czkawka_core::big_file::BigFile;
 use czkawka_core::broken_files::BrokenFiles;
+use czkawka_core::common_dir_traversal;
 use czkawka_core::duplicate::DuplicateFinder;
 use czkawka_core::empty_files::EmptyFiles;
 use czkawka_core::empty_folder::EmptyFolder;
@@ -15,7 +16,6 @@ use czkawka_core::same_music::{MusicSimilarity, SameMusic};
 use czkawka_core::similar_images::SimilarImages;
 use czkawka_core::similar_videos::SimilarVideos;
 use czkawka_core::temporary::Temporary;
-use czkawka_core::common_dir_traversal;
 use czkawka_core::*;
 
 use crate::fl;

diff --git a/czkawka_gui/src/connect_progress_window.rs b/czkawka_gui/src/connect_progress_window.rs
@@ -1,7 +1,7 @@
 use futures::StreamExt;
 use gtk::prelude::*;
 
-use czkawka_core::{big_file, broken_files, empty_folder, same_music, similar_images, similar_videos, temporary, common_dir_traversal};
+use czkawka_core::{big_file, broken_files, common_dir_traversal, empty_folder, same_music, similar_images, similar_videos, temporary};
 
 use crate::fl;
 use crate::gui_data::GuiData;
@@ -56,9 +56,10 @@ pub fn connect_progress_window(
                                 if item.entries_to_check != 0 {
                                     progress_bar_all_stages.set_fraction((1f64 + (item.entries_to_check) as f64 / item.entries_to_check as f64) / (item.max_stage + 1) as f64);
                                     progress_bar_current_stage.set_fraction((item.entries_to_check) as f64 / item.entries_to_check as f64);
-                                    taskbar_state
-                                        .borrow()
-                                        .set_progress_value((item.entries_to_check + item.entries_to_check) as u64, item.entries_to_check as u64 * (item.max_stage + 1) as u64);
+                                    taskbar_state.borrow().set_progress_value(
+                                        (item.entries_to_check + item.entries_to_check) as u64,
+                                        item.entries_to_check as u64 * (item.max_stage + 1) as u64,
+                                    );
                                 } else {
                                     progress_bar_all_stages.set_fraction((1f64) / (item.max_stage + 1) as f64);
                                     progress_bar_current_stage.set_fraction(0f64);

diff --git a/czkawka_gui/src/help_functions.rs b/czkawka_gui/src/help_functions.rs
@@ -15,7 +15,7 @@ use czkawka_core::same_music::SameMusic;
 use czkawka_core::similar_images::SimilarImages;
 use czkawka_core::similar_videos::SimilarVideos;
 use czkawka_core::temporary::Temporary;
-use czkawka_core::{fl, common_dir_traversal};
+use czkawka_core::{common_dir_traversal, fl};
 
 use crate::notebook_enums::{NotebookMainEnum, NotebookUpperEnum, NUMBER_OF_NOTEBOOK_MAIN_TABS};