From 3adbfdc5b62c0d87b8c538341996d0f784db1fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Thu, 7 Jan 2021 23:20:51 +0100 Subject: [PATCH] Remove some debug variables (#185) --- czkawka_core/src/big_file.rs | 17 --------- czkawka_core/src/duplicate.rs | 53 +--------------------------- czkawka_core/src/empty_files.rs | 19 ---------- czkawka_core/src/empty_folder.rs | 3 -- czkawka_core/src/invalid_symlinks.rs | 17 --------- czkawka_core/src/same_music.rs | 20 ----------- czkawka_core/src/similar_images.rs | 26 -------------- czkawka_core/src/temporary.rs | 17 --------- czkawka_core/src/zeroed.rs | 18 ---------- 9 files changed, 1 insertion(+), 189 deletions(-) diff --git a/czkawka_core/src/big_file.rs b/czkawka_core/src/big_file.rs index 9bb56b0..41b2d6d 100644 --- a/czkawka_core/src/big_file.rs +++ b/czkawka_core/src/big_file.rs @@ -39,10 +39,6 @@ pub enum DeleteMethod { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub taken_space: u64, pub number_of_real_files: usize, } @@ -129,7 +125,6 @@ impl BigFile { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -191,8 +186,6 @@ impl BigFile { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -213,7 +206,6 @@ impl BigFile { let allowed = self.allowed_extensions.file_extensions.iter().map(|e| e.to_lowercase()).any(|e| file_extension == Some(e)); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; continue 'dir; } } @@ -245,11 +237,6 @@ impl BigFile { self.big_files.entry(metadata.len()).or_insert_with(Vec::new); self.big_files.get_mut(&metadata.len()).unwrap().push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -352,10 +339,6 @@ impl DebugPrint for BigFile { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("### Other"); println!("Big files size {} in {} groups", self.information.number_of_real_files, self.big_files.len()); diff --git a/czkawka_core/src/duplicate.rs b/czkawka_core/src/duplicate.rs index 386d94b..5f15b7f 100644 --- a/czkawka_core/src/duplicate.rs +++ b/czkawka_core/src/duplicate.rs @@ -62,20 +62,13 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_groups_by_size: usize, pub number_of_duplicated_files_by_size: usize, pub number_of_groups_by_hash: usize, pub number_of_duplicated_files_by_hash: usize, - pub number_of_groups_after_pre_hash: usize, - pub number_of_duplicated_files_after_pre_hash: usize, pub number_of_groups_by_name: usize, pub number_of_duplicated_files_by_name: usize, pub lost_space_by_size: u64, - pub lost_space_after_pre_hash: u64, pub lost_space_by_hash: u64, pub bytes_read_when_hashing: u64, pub number_of_removed_files: usize, @@ -231,7 +224,6 @@ impl DuplicateFinder { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -301,8 +293,6 @@ impl DuplicateFinder { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue 'dir; } @@ -331,7 +321,6 @@ impl DuplicateFinder { let allowed = self.allowed_extensions.file_extensions.iter().any(|e| file_name_lowercase.ends_with((".".to_string() + e.to_lowercase().as_str()).as_str())); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; continue 'dir; } } @@ -364,15 +353,7 @@ impl DuplicateFinder { // Adding files to BTreeMap self.files_with_identical_names.entry(entry_data.file_name().to_string_lossy().to_string()).or_insert_with(Vec::new); self.files_with_identical_names.get_mut(&entry_data.file_name().to_string_lossy().to_string()).unwrap().push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_files += 1; } - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -384,8 +365,6 @@ impl DuplicateFinder { // Create new BTreeMap without single size entries(files have not duplicates) let mut new_map: BTreeMap> = Default::default(); - self.information.number_of_duplicated_files_by_name = 0; - for (name, vector) in &self.files_with_identical_names { if vector.len() > 1 { self.information.number_of_duplicated_files_by_name += vector.len() - 1; @@ -409,7 +388,6 @@ impl DuplicateFinder { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -485,8 +463,6 @@ impl DuplicateFinder { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue 'dir; } @@ -515,7 +491,7 @@ impl DuplicateFinder { let allowed = self.allowed_extensions.file_extensions.iter().any(|e| file_name_lowercase.ends_with((".".to_string() + e.to_lowercase().as_str()).as_str())); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; + continue 'dir; } } @@ -548,15 +524,7 @@ impl DuplicateFinder { // Adding files to BTreeMap self.files_with_identical_size.entry(metadata.len()).or_insert_with(Vec::new); self.files_with_identical_size.get_mut(&metadata.len()).unwrap().push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_files += 1; } - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -685,9 +653,6 @@ impl DuplicateFinder { self.text_messages.warnings.append(&mut errors); for (_hash, mut vec_file_entry) in hash_map { if vec_file_entry.len() > 1 { - self.information.number_of_duplicated_files_after_pre_hash += vec_file_entry.len() - 1; - self.information.number_of_groups_after_pre_hash += 1; - self.information.lost_space_after_pre_hash += (vec_file_entry.len() as u64 - 1) * size; pre_checked_map.entry(size).or_insert_with(Vec::new); pre_checked_map.get_mut(&size).unwrap().append(&mut vec_file_entry); } @@ -803,9 +768,6 @@ impl DuplicateFinder { self.text_messages.warnings.append(&mut errors); for (_hash, vec_file_entry) in hash_map { if vec_file_entry.len() > 1 { - self.information.number_of_duplicated_files_after_pre_hash += vec_file_entry.len() - 1; - self.information.number_of_groups_after_pre_hash += 1; - self.information.lost_space_after_pre_hash += (vec_file_entry.len() as u64 - 1) * size; self.files_with_identical_hashes.entry(size).or_insert_with(Vec::new); self.files_with_identical_hashes.get_mut(&size).unwrap().push(vec_file_entry); } @@ -892,18 +854,10 @@ impl DebugPrint for DuplicateFinder { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!( "Number of duplicated files by size(in groups) - {} ({})", self.information.number_of_duplicated_files_by_size, self.information.number_of_groups_by_size ); - println!( - "Number of duplicated files after pre hash(in groups) - {} ({})", - self.information.number_of_duplicated_files_after_pre_hash, self.information.number_of_groups_after_pre_hash - ); println!( "Number of duplicated files by hash(in groups) - {} ({})", self.information.number_of_duplicated_files_by_hash, self.information.number_of_groups_by_hash @@ -913,11 +867,6 @@ impl DebugPrint for DuplicateFinder { self.information.number_of_duplicated_files_by_name, self.information.number_of_groups_by_name ); println!("Lost space by size - {} ({} bytes)", self.information.lost_space_by_size.file_size(options::BINARY).unwrap(), self.information.lost_space_by_size); - println!( - "Lost space after pre hash - {} ({} bytes)", - self.information.lost_space_after_pre_hash.file_size(options::BINARY).unwrap(), - self.information.lost_space_after_pre_hash - ); println!("Lost space by hash - {} ({} bytes)", self.information.lost_space_by_hash.file_size(options::BINARY).unwrap(), self.information.lost_space_by_hash); println!( "Gained space by removing duplicated entries - {} ({} bytes)", diff --git a/czkawka_core/src/empty_files.rs b/czkawka_core/src/empty_files.rs index 0b706af..e48b340 100644 --- a/czkawka_core/src/empty_files.rs +++ b/czkawka_core/src/empty_files.rs @@ -37,10 +37,6 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_empty_files: usize, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, @@ -138,7 +134,6 @@ impl EmptyFiles { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -204,8 +199,6 @@ impl EmptyFiles { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -229,7 +222,6 @@ impl EmptyFiles { let allowed = self.allowed_extensions.file_extensions.iter().any(|e| file_name_lowercase.ends_with((".".to_string() + e.to_lowercase().as_str()).as_str())); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; continue 'dir; } } @@ -260,14 +252,7 @@ impl EmptyFiles { // Adding files to Vector self.empty_files.push(fe); - - self.information.number_of_checked_files += 1; - } else { - self.information.number_of_ignored_files += 1; } - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -321,10 +306,6 @@ impl DebugPrint for EmptyFiles { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("Number of removed files - {}", self.information.number_of_removed_files); println!("Number of failed to remove files - {}", self.information.number_of_failed_to_remove_files); diff --git a/czkawka_core/src/empty_folder.rs b/czkawka_core/src/empty_folder.rs index 0b5372a..976a2cb 100644 --- a/czkawka_core/src/empty_folder.rs +++ b/czkawka_core/src/empty_folder.rs @@ -51,7 +51,6 @@ pub struct EmptyFolder { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - number_of_checked_folders: usize, pub number_of_empty_folders: usize, } impl Info { @@ -192,7 +191,6 @@ impl EmptyFolder { progress_thread_handle.join().unwrap(); return false; } - self.information.number_of_checked_folders += 1; let current_folder = folders_to_check.pop().unwrap(); // Checked folder may be deleted or we may not have permissions to open it so we assume that this folder is not be empty let read_dir = match fs::read_dir(¤t_folder) { @@ -322,7 +320,6 @@ impl DebugPrint for EmptyFolder { } println!("---------------DEBUG PRINT---------------"); - println!("Number of all checked folders - {}", self.information.number_of_checked_folders); println!("Number of empty folders - {}", self.information.number_of_empty_folders); println!("Included directories - {:?}", self.directories.included_directories); println!("-----------------------------------------"); diff --git a/czkawka_core/src/invalid_symlinks.rs b/czkawka_core/src/invalid_symlinks.rs index c35de40..72193bf 100644 --- a/czkawka_core/src/invalid_symlinks.rs +++ b/czkawka_core/src/invalid_symlinks.rs @@ -47,10 +47,6 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_invalid_symlinks: usize, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, @@ -147,7 +143,6 @@ impl InvalidSymlinks { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -213,8 +208,6 @@ impl InvalidSymlinks { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -240,7 +233,6 @@ impl InvalidSymlinks { let allowed = self.allowed_extensions.file_extensions.iter().any(|e| file_name_lowercase.ends_with((".".to_string() + e.to_lowercase().as_str()).as_str())); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; continue 'dir; } } @@ -308,11 +300,6 @@ impl InvalidSymlinks { // Adding files to Vector self.invalid_symlinks.push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Not sure what exactly this is - self.information.number_of_ignored_things += 1; } } } @@ -366,10 +353,6 @@ impl DebugPrint for InvalidSymlinks { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("Number of removed files - {}", self.information.number_of_removed_files); println!("Number of failed to remove files - {}", self.information.number_of_failed_to_remove_files); diff --git a/czkawka_core/src/same_music.rs b/czkawka_core/src/same_music.rs index 0e89321..3ed76e5 100644 --- a/czkawka_core/src/same_music.rs +++ b/czkawka_core/src/same_music.rs @@ -66,10 +66,6 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_music_entries: usize, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, @@ -185,7 +181,6 @@ impl SameMusic { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -251,8 +246,6 @@ impl SameMusic { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue 'dir; } @@ -269,14 +262,12 @@ impl SameMusic { if metadata.len() >= self.minimal_file_size { let current_file_name = current_folder.join(entry_data.file_name()); if self.excluded_items.is_excluded(¤t_file_name) { - self.information.number_of_ignored_files += 1; continue 'dir; } let allowed_extensions = [".mp3", ".flac", ".m4a"]; if !allowed_extensions.iter().any(|r| current_file_name.to_string_lossy().ends_with(r)) { - self.information.number_of_ignored_files += 1; continue 'dir; } @@ -307,14 +298,7 @@ impl SameMusic { // Adding files to Vector self.music_to_check.push(file_entry); - - self.information.number_of_checked_files += 1; - } else { - self.information.number_of_ignored_files += 1; } - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -655,10 +639,6 @@ impl DebugPrint for SameMusic { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("Number of removed files - {}", self.information.number_of_removed_files); println!("Number of failed to remove files - {}", self.information.number_of_failed_to_remove_files); println!("Number of duplicated music files - {}", self.information.number_of_duplicates_music_files); diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index 6d99e12..d523d91 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -84,12 +84,6 @@ pub struct SimilarImages { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, - pub size_of_checked_images: u64, - pub lost_space: u64, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, pub gained_space: u64, @@ -181,7 +175,6 @@ impl SimilarImages { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -248,8 +241,6 @@ impl SimilarImages { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -276,7 +267,6 @@ impl SimilarImages { // Checking allowed image extensions let allowed_image_extensions = ["jpg", "png", "bmp", "ico", "webp", "tiff", "dds"]; if !allowed_image_extensions.iter().any(|e| file_name_lowercase.ends_with(e)) { - self.information.number_of_ignored_files += 1; continue 'dir; } @@ -310,16 +300,7 @@ impl SimilarImages { }; self.images_to_check.insert(current_file_name.to_string_lossy().to_string(), fe); - - self.information.size_of_checked_images += metadata.len(); - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_files += 1; } - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -578,14 +559,7 @@ impl DebugPrint for SimilarImages { } println!("---------------DEBUG PRINT---------------"); - println!("Number of all checked folders - {}", self.information.number_of_checked_folders); println!("Included directories - {:?}", self.directories.included_directories); - println!("Checked images {} / Different photos {}", self.information.number_of_checked_files, self.image_hashes.len()); - println!( - "Size of checked images {} ({} Bytes)", - self.information.size_of_checked_images.file_size(options::BINARY).unwrap(), - self.information.size_of_checked_images - ); println!("-----------------------------------------"); } } diff --git a/czkawka_core/src/temporary.rs b/czkawka_core/src/temporary.rs index 3da9958..62421f0 100644 --- a/czkawka_core/src/temporary.rs +++ b/czkawka_core/src/temporary.rs @@ -36,10 +36,6 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_temporary_files: usize, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, @@ -129,7 +125,6 @@ impl Temporary { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -195,8 +190,6 @@ impl Temporary { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -219,7 +212,6 @@ impl Temporary { let temporary_with_dot = ["#", "thumbs.db", ".bak", "~", ".tmp", ".temp", ".ds_store", ".crdownload", ".part", ".cache", ".dmp", ".download", ".partial"]; if !file_name_lowercase.contains('.') || !temporary_with_dot.iter().any(|f| file_name_lowercase.ends_with(f)) { - self.information.number_of_ignored_files += 1; continue 'dir; } // Checking files @@ -248,11 +240,6 @@ impl Temporary { // Adding files to Vector self.temporary_files.push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -305,10 +292,6 @@ impl DebugPrint for Temporary { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("Number of removed files - {}", self.information.number_of_removed_files); println!("Number of failed to remove files - {}", self.information.number_of_failed_to_remove_files); diff --git a/czkawka_core/src/zeroed.rs b/czkawka_core/src/zeroed.rs index a0b3333..f5ba09c 100644 --- a/czkawka_core/src/zeroed.rs +++ b/czkawka_core/src/zeroed.rs @@ -40,10 +40,6 @@ pub struct FileEntry { /// Info struck with helpful information's about results #[derive(Default)] pub struct Info { - pub number_of_checked_files: usize, - pub number_of_checked_folders: usize, - pub number_of_ignored_files: usize, - pub number_of_ignored_things: usize, pub number_of_zeroed_files: usize, pub number_of_removed_files: usize, pub number_of_failed_to_remove_files: usize, @@ -155,7 +151,6 @@ impl ZeroedFiles { for id in &self.directories.included_directories { folders_to_check.push(id.clone()); } - self.information.number_of_checked_folders += folders_to_check.len(); //// PROGRESS THREAD START const LOOP_DURATION: u32 = 200; //in ms @@ -221,8 +216,6 @@ impl ZeroedFiles { } //Permissions denied }; if metadata.is_dir() { - self.information.number_of_checked_folders += 1; - if !self.recursive_search { continue; } @@ -236,7 +229,6 @@ impl ZeroedFiles { } else if metadata.is_file() { atomic_file_counter.fetch_add(1, Ordering::Relaxed); if metadata.len() == 0 || metadata.len() < self.minimal_file_size { - self.information.number_of_ignored_files += 1; continue 'dir; } @@ -251,7 +243,6 @@ impl ZeroedFiles { let allowed = self.allowed_extensions.file_extensions.iter().any(|e| file_name_lowercase.ends_with((".".to_string() + e.to_lowercase().as_str()).as_str())); if !allowed { // Not an allowed extension, ignore it. - self.information.number_of_ignored_files += 1; continue 'dir; } } @@ -282,11 +273,6 @@ impl ZeroedFiles { // Adding files to Vector self.files_to_check.push(fe); - - self.information.number_of_checked_files += 1; - } else { - // Probably this is symbolic links so we are free to ignore this - self.information.number_of_ignored_things += 1; } } } @@ -442,10 +428,6 @@ impl DebugPrint for ZeroedFiles { println!("Errors size - {}", self.text_messages.errors.len()); println!("Warnings size - {}", self.text_messages.warnings.len()); println!("Messages size - {}", self.text_messages.messages.len()); - println!("Number of checked files - {}", self.information.number_of_checked_files); - println!("Number of checked folders - {}", self.information.number_of_checked_folders); - println!("Number of ignored files - {}", self.information.number_of_ignored_files); - println!("Number of ignored things(like symbolic links) - {}", self.information.number_of_ignored_things); println!("Number of removed files - {}", self.information.number_of_removed_files); println!("Number of failed to remove files - {}", self.information.number_of_failed_to_remove_files);