Up

Author: qarmin

czkawka_core/src/common/dir_traversal.rs

@@ -251,6 +251,7 @@ where
                         &mut file_results,
                         &extensions,
                         &excluded_items,
+                        &directories,
                         minimal_file_size,
                         maximal_file_size,
                     );
@@ -389,6 +390,10 @@ fn process_file_in_file_mode(
         return;
     }
 
+    if directories.is_excluded_file(&current_file_name) {
+        return;
+    }
+
     #[cfg(target_family = "unix")]
     if directories.exclude_other_filesystems() {
         match directories.is_on_other_filesystems(&current_file_name) {
@@ -425,6 +430,7 @@ fn process_file_in_file_mode_path_check(
     fe_result: &mut Vec<FileEntry>,
     extensions: &Extensions,
     excluded_items: &ExcludedItems,
+    directories: &Directories,
     minimal_file_size: u64,
     maximal_file_size: u64,
 ) {
@@ -435,6 +441,13 @@ fn process_file_in_file_mode_path_check(
         return;
     }
 
+    if directories.is_excluded_file(path) {
+        return;
+    }
+    if directories.is_excluded_item_in_dir(path) {
+        return;
+    }
+
     if excluded_items.is_excluded(path) {
         return;
     }
@@ -464,7 +477,7 @@ fn process_dir_in_file_symlink_mode(
     }
 
     let dir_path = entry_data.path();
-    if directories.is_excluded(&dir_path) {
+    if directories.is_excluded_dir(&dir_path) {
         return;
     }
 
@@ -752,7 +765,7 @@ mod tests {
         Ok(())
     }
 
-    fn create_temp_structure(dir: &TempDir) -> io::Result<(PathBuf, PathBuf)> {
+    fn create_temp_structure(dir: &TempDir) -> io::Result<(PathBuf, PathBuf, PathBuf)> {
         let global = dir.path().join("global.txt");
         let other_dir = dir.path().join("other");
         fs::create_dir_all(&other_dir)?;
@@ -766,13 +779,13 @@ mod tests {
         f2.write_all(b"other")?;
         f2.set_modified(*NOW)?;
 
-        Ok((global, other))
+        Ok((global, other, other_dir))
     }
 
     #[test]
     fn test_traversal_with_and_without_excluded_dir() -> io::Result<()> {
         let dir = tempfile::Builder::new().tempdir()?;
-        let (global, other) = create_temp_structure(&dir)?;
+        let (global, other, other_dir) = create_temp_structure(&dir)?;
         let secs = NOW.duration_since(SystemTime::UNIX_EPOCH).expect("Cannot fail calculating duration since epoch").as_secs();
 
         let mut common_data = CommonToolData::new(ToolType::SimilarImages);
@@ -797,7 +810,7 @@ mod tests {
 
         let mut common_data2 = CommonToolData::new(ToolType::SimilarImages);
         common_data2.directories.set_included_paths([dir.path().to_owned()].to_vec());
-        common_data2.directories.set_excluded_paths([other.clone()].to_vec());
+        common_data2.directories.set_excluded_paths([other_dir.clone()].to_vec());
         common_data2.set_minimal_file_size(0);
 
         match DirTraversalBuilder::new()
@@ -817,7 +830,7 @@ mod tests {
 
         let mut common_data2 = CommonToolData::new(ToolType::SimilarImages);
         common_data2.directories.set_included_paths([dir.path().to_owned()].to_vec());
-        common_data2.directories.set_excluded_paths([other.clone().join("other.txt")].to_vec());
+        common_data2.directories.set_excluded_paths([other.clone()].to_vec());
         common_data2.set_minimal_file_size(0);
 
         match DirTraversalBuilder::new()

czkawka_core/src/common/directories.rs

@@ -9,15 +9,15 @@ use crate::helpers::messages::Messages;
 
 #[derive(Debug, Clone, Default)]
 pub struct Directories {
-    pub(crate) excluded_directories: Vec<PathBuf>,
     pub(crate) included_directories: Vec<PathBuf>,
+    pub(crate) excluded_directories: Vec<PathBuf>,
     pub(crate) reference_directories: Vec<PathBuf>,
-    pub(crate) excluded_files: Vec<PathBuf>,
     pub(crate) included_files: Vec<PathBuf>,
+    pub(crate) excluded_files: Vec<PathBuf>,
     pub(crate) reference_files: Vec<PathBuf>,
 
-    pub(crate) original_excluded_paths: Vec<PathBuf>,
     pub(crate) original_included_paths: Vec<PathBuf>,
+    pub(crate) original_excluded_paths: Vec<PathBuf>,
     pub(crate) original_reference_paths: Vec<PathBuf>,
 
     pub(crate) exclude_other_filesystems: Option<bool>,
@@ -259,13 +259,29 @@ impl Directories {
         self.reference_directories.iter().any(|e| path.starts_with(e)) || self.reference_files.iter().any(|e| e.as_path() == path)
     }
 
-    pub(crate) fn is_excluded(&self, path: &Path) -> bool {
+    pub(crate) fn is_excluded_dir(&self, path: &Path) -> bool {
         #[cfg(target_family = "windows")]
         let path = normalize_windows_path(path);
         // We're assuming that `excluded_directories` are already normalized
         self.excluded_directories.iter().any(|p| p.as_path() == path)
     }
 
+    pub(crate) fn is_excluded_file(&self, path: &Path) -> bool {
+        #[cfg(target_family = "windows")]
+        let path = normalize_windows_path(path);
+        // We're assuming that `excluded_files` are already normalized
+        self.excluded_files.iter().any(|p| p.as_path() == path)
+    }
+
+    // Usually it is not required, because if main directory is excluded, then we don't run check on
+    // every single children, different situation is with excluded single file
+    pub(crate) fn is_excluded_item_in_dir(&self, path: &Path) -> bool {
+        #[cfg(target_family = "windows")]
+        let path = normalize_windows_path(path);
+        // We're assuming that `excluded_directories` are already normalized
+        self.excluded_directories.iter().any(|p| p.starts_with(path))
+    }
+
     #[cfg(target_family = "unix")]
     pub(crate) fn exclude_other_filesystems(&self) -> bool {
         self.exclude_other_filesystems.unwrap_or(false)

czkawka_core/src/tools/empty_folder/core.rs

@@ -209,7 +209,7 @@ impl EmptyFolder {
         folder_entries_list: &mut Vec<FolderEntry>,
     ) {
         let next_folder = entry_data.path();
-        if excluded_items.is_excluded(&next_folder) || directories.is_excluded(&next_folder) {
+        if excluded_items.is_excluded(&next_folder) || directories.is_excluded_dir(&next_folder) {
             if non_empty_folder.is_none() {
                 *non_empty_folder = Some(current_folder_as_str.to_string());
             }

czkawka_core/src/tools/temporary/core.rs

@@ -136,7 +136,7 @@ pub(crate) fn check_folder_children(
     }
 
     let next_item = entry_data.path();
-    if directories.is_excluded(&next_item) {
+    if directories.is_excluded_dir(&next_item) {
         return;
     }