Tests, small image similarity improvements, cli dry runs (#1685)

Author: qarmin

Cargo.lock

@@ -9,13 +9,16 @@
 - Delayed removing destination file while symlinking, to avoid data loss in case of failure - [#1672](https://github.com/qarmin/czkawka/pull/1672)
 - Fix invalid canonicalization of paths on windows - [#1604](https://github.com/qarmin/czkawka/pull/1604/files)
 - Comparison results are now deterministic - [#1654](https://github.com/qarmin/czkawka/pull/1654)
-- Reading built-in jpeg inside raw images, if available - [#1655](https://github.com/qarmin/czkawka/pull/1655)
+- Reading built-in jpeg inside raw images, if available(currently disabled due - https://github.com/dnglab/dnglab/issues/638) - [#1655](https://github.com/qarmin/czkawka/pull/1655)
 - Fixed silent panics, when logger cannot log to terminal - [1658](https://github.com/qarmin/czkawka/pull/1658)
 - Commit hash is added to logs - [#1672](https://github.com/qarmin/czkawka/pull/1672)
+- Improved and fixed logic which groups similar images by its similarity - [#1685](https://github.com/qarmin/czkawka/pull/1685)
+- Added counting scan time  - [#1674](https://github.com/qarmin/czkawka/pull/1674), [#1685](https://github.com/qarmin/czkawka/pull/1685)
 
 ### CLI
 - Using colors by default in terminal output(can be disabled by feature flag) - [#1672](https://github.com/qarmin/czkawka/pull/1672)
 - Fixed regression, where results were not printed by default to terminal - [#1672](https://github.com/qarmin/czkawka/pull/1672)
+- Added dry_run and move_to_trash options to all tools - [#1685](https://github.com/qarmin/czkawka/pull/1685)
 
 ### GTK GUI
 - Sort button is restored and crashes when sorting are fixed(probably) - [#1623](https://github.com/qarmin/czkawka/pull/1623)

Changelog.md

@@ -170,16 +170,14 @@ pub struct DuplicatesArgs {
     pub case_sensitive_name_comparison: CaseSensitiveNameComparison,
     #[clap(flatten)]
     pub allow_hard_links: AllowHardLinks,
-    #[clap(flatten)]
-    pub dry_run: DryRun,
 }
 
 #[derive(Debug, clap::Args)]
 pub struct EmptyFoldersArgs {
     #[clap(flatten)]
     pub common_cli_items: CommonCliItems,
-    #[clap(short = 'D', long, help = "Delete found folders")]
-    pub delete_folders: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
 }
 
 #[derive(Debug, clap::Args)]
@@ -188,8 +186,8 @@ pub struct BiggestFilesArgs {
     pub common_cli_items: CommonCliItems,
     #[clap(short, long, default_value = "50", help = "Number of files to be shown")]
     pub number_of_files: usize,
-    #[clap(short = 'D', long, help = "Delete found files")]
-    pub delete_files: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
     #[clap(short = 'J', long, help = "Finds the smallest files instead the biggest")]
     pub smallest_mode: bool,
 }
@@ -198,16 +196,16 @@ pub struct BiggestFilesArgs {
 pub struct EmptyFilesArgs {
     #[clap(flatten)]
     pub common_cli_items: CommonCliItems,
-    #[clap(short = 'D', long, help = "Delete found files")]
-    pub delete_files: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
 }
 
 #[derive(Debug, clap::Args)]
 pub struct TemporaryArgs {
     #[clap(flatten)]
     pub common_cli_items: CommonCliItems,
-    #[clap(short = 'D', long, help = "Delete found files")]
-    pub delete_files: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
 }
 
 #[derive(Debug, clap::Args)]
@@ -248,8 +246,6 @@ pub struct SimilarImagesArgs {
     #[clap(flatten)]
     pub allow_hard_links: AllowHardLinks,
     #[clap(flatten)]
-    pub dry_run: DryRun,
-    #[clap(flatten)]
     pub ignore_same_size: IgnoreSameSize,
     #[clap(
         short = 'g',
@@ -285,8 +281,6 @@ pub struct SameMusicArgs {
     pub reference_directories: ReferenceDirectories,
     #[clap(flatten)]
     pub delete_method: DMethod,
-    #[clap(flatten)]
-    pub dry_run: DryRun,
     #[clap(short, long, help = "Approximate comparison of music tags.")]
     pub approximate_comparison: bool,
     #[clap(short, long, help = "Compare fingerprints only with similar titles.")]
@@ -380,16 +374,16 @@ fn parse_minimum_segment_duration(src: &str) -> Result<f32, String> {
 pub struct InvalidSymlinksArgs {
     #[clap(flatten)]
     pub common_cli_items: CommonCliItems,
-    #[clap(short = 'D', long, help = "Delete found files")]
-    pub delete_files: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
 }
 
 #[derive(Debug, clap::Args)]
 pub struct BrokenFilesArgs {
     #[clap(flatten)]
     pub common_cli_items: CommonCliItems,
-    #[clap(short = 'D', long, help = "Delete found files")]
-    pub delete_files: bool,
+    #[clap(flatten)]
+    pub delete_method: SDMethod,
     #[clap(
         short,
         long,
@@ -412,8 +406,6 @@ pub struct SimilarVideosArgs {
     #[clap(flatten)]
     pub allow_hard_links: AllowHardLinks,
     #[clap(flatten)]
-    pub dry_run: DryRun,
-    #[clap(flatten)]
     pub ignore_same_size: IgnoreSameSize,
     #[clap(
         short,
@@ -531,15 +523,15 @@ pub struct CommonCliItems {
     pub disable_cache: bool,
 }
 
-#[derive(Debug, clap::Args)]
+#[derive(Debug, clap::Args, Clone, Copy)]
 pub struct DoNotPrint {
     #[clap(short = 'N', long, help = "Do not print the results to the console")]
     pub do_not_print_results: bool,
     #[clap(short = 'M', long, help = "Do not print info/warnings/errors from the program to console")]
     pub do_not_print_messages: bool,
 }
 
-#[derive(Debug, clap::Args)]
+#[derive(Debug, clap::Args, Clone, Copy)]
 pub struct DMethod {
     #[clap(
         short = 'D',
@@ -550,6 +542,21 @@ pub struct DMethod {
         long_help = "Methods to delete the files.\nAEN - All files except the newest,\nAEO - All files except the oldest,\nON - Only 1 file, the newest,\nOO - Only 1 file, the oldest\nAEB - All files except the biggest,\nAES - All files except the smallest,\nOB - Only 1 file, the biggest,\nOS - Only 1 file, the smallest\nHARD - create hard link\nNONE - not delete files"
     )]
     pub delete_method: DeleteMethod,
+    #[clap(short = 'Q', long, help = "Do nothing and print the operation that would happen.")]
+    pub dry_run: bool,
+    #[clap(short = 'y', long, help = "Remove items to trash")]
+    pub move_to_trash: bool,
+}
+
+// Simple delete method - delete files or not
+#[derive(Debug, clap::Args, Clone, Copy)]
+pub struct SDMethod {
+    #[clap(short = 'D', long, help = "Delete found items")]
+    pub delete_files: bool,
+    #[clap(short = 'Q', long, help = "Do nothing and print the operation that would happen.")]
+    pub dry_run: bool,
+    #[clap(short = 'y', long, help = "Remove items to trash")]
+    pub move_to_trash: bool,
 }
 
 #[derive(Debug, clap::Args)]
@@ -593,12 +600,6 @@ pub struct CaseSensitiveNameComparison {
     pub case_sensitive_name_comparison: bool,
 }
 
-#[derive(Debug, clap::Args)]
-pub struct DryRun {
-    #[clap(long, help = "Do nothing and print the operation that would happen.")]
-    pub dry_run: bool,
-}
-
 #[derive(Debug, clap::Args)]
 pub struct IgnoreSameSize {
     #[clap(short = 'J', long, help = "Ignore files with the same size, leaving only one file of each size")]

czkawka_cli/src/commands.rs

@@ -28,8 +28,8 @@ use czkawka_core::tools::temporary::Temporary;
 use log::{debug, error, info};
 
 use crate::commands::{
-    Args, BadExtensionsArgs, BiggestFilesArgs, BrokenFilesArgs, CommonCliItems, DuplicatesArgs, EmptyFilesArgs, EmptyFoldersArgs, InvalidSymlinksArgs, SameMusicArgs,
-    SimilarImagesArgs, SimilarVideosArgs, TemporaryArgs,
+    Args, BadExtensionsArgs, BiggestFilesArgs, BrokenFilesArgs, CommonCliItems, DMethod, DuplicatesArgs, EmptyFilesArgs, EmptyFoldersArgs, InvalidSymlinksArgs, SDMethod,
+    SameMusicArgs, SimilarImagesArgs, SimilarVideosArgs, TemporaryArgs,
 };
 use crate::progress::connect_progress;
 
@@ -116,7 +116,6 @@ fn duplicates(duplicates: DuplicatesArgs, stop_flag: &Arc<AtomicBool>, progress_
         delete_method,
         hash_type,
         allow_hard_links,
-        dry_run,
         case_sensitive_name_comparison,
         minimal_prehash_cache_file_size,
         use_prehash_cache,
@@ -136,23 +135,20 @@ fn duplicates(duplicates: DuplicatesArgs, stop_flag: &Arc<AtomicBool>, progress_
     set_common_settings(&mut tool, &common_cli_items, Some(reference_directories.reference_directories.as_ref()));
     tool.set_minimal_file_size(minimal_file_size);
     tool.set_maximal_file_size(maximal_file_size);
-    tool.set_delete_method(delete_method.delete_method);
-    tool.set_dry_run(dry_run.dry_run);
+    set_advanced_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
     save_and_write_results_to_writer(&tool, &common_cli_items)
 }
 
 fn empty_folders(empty_folders: EmptyFoldersArgs, stop_flag: &Arc<AtomicBool>, progress_sender: &Sender<ProgressData>) -> CliOutput {
-    let EmptyFoldersArgs { common_cli_items, delete_folders } = empty_folders;
+    let EmptyFoldersArgs { common_cli_items, delete_method } = empty_folders;
 
     let mut tool = EmptyFolder::new();
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_folders {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -163,7 +159,7 @@ fn biggest_files(biggest_files: BiggestFilesArgs, stop_flag: &Arc<AtomicBool>, p
     let BiggestFilesArgs {
         common_cli_items,
         number_of_files,
-        delete_files,
+        delete_method,
         smallest_mode,
     } = biggest_files;
 
@@ -172,39 +168,33 @@ fn biggest_files(biggest_files: BiggestFilesArgs, stop_flag: &Arc<AtomicBool>, p
     let mut tool = BigFile::new(params);
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_files {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
     save_and_write_results_to_writer(&tool, &common_cli_items)
 }
 
 fn empty_files(empty_files: EmptyFilesArgs, stop_flag: &Arc<AtomicBool>, progress_sender: &Sender<ProgressData>) -> CliOutput {
-    let EmptyFilesArgs { common_cli_items, delete_files } = empty_files;
+    let EmptyFilesArgs { common_cli_items, delete_method } = empty_files;
 
     let mut tool = EmptyFiles::new();
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_files {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
     save_and_write_results_to_writer(&tool, &common_cli_items)
 }
 
 fn temporary(temporary: TemporaryArgs, stop_flag: &Arc<AtomicBool>, progress_sender: &Sender<ProgressData>) -> CliOutput {
-    let TemporaryArgs { common_cli_items, delete_files } = temporary;
+    let TemporaryArgs { common_cli_items, delete_method } = temporary;
 
     let mut tool = Temporary::new();
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_files {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -222,7 +212,6 @@ fn similar_images(similar_images: SimilarImagesArgs, stop_flag: &Arc<AtomicBool>
         image_filter,
         hash_size,
         delete_method,
-        dry_run,
         allow_hard_links,
         ignore_same_size,
     } = similar_images;
@@ -241,8 +230,7 @@ fn similar_images(similar_images: SimilarImagesArgs, stop_flag: &Arc<AtomicBool>
     set_common_settings(&mut tool, &common_cli_items, Some(reference_directories.reference_directories.as_ref()));
     tool.set_minimal_file_size(minimal_file_size);
     tool.set_maximal_file_size(maximal_file_size);
-    tool.set_delete_method(delete_method.delete_method);
-    tool.set_dry_run(dry_run.dry_run);
+    set_advanced_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -257,7 +245,6 @@ fn same_music(same_music: SameMusicArgs, stop_flag: &Arc<AtomicBool>, progress_s
         minimal_file_size,
         maximal_file_size,
         music_similarity,
-        dry_run,
         minimum_segment_duration,
         maximum_difference,
         search_method,
@@ -278,23 +265,20 @@ fn same_music(same_music: SameMusicArgs, stop_flag: &Arc<AtomicBool>, progress_s
     set_common_settings(&mut tool, &common_cli_items, Some(reference_directories.reference_directories.as_ref()));
     tool.set_minimal_file_size(minimal_file_size);
     tool.set_maximal_file_size(maximal_file_size);
-    tool.set_delete_method(delete_method.delete_method);
-    tool.set_dry_run(dry_run.dry_run);
+    set_advanced_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
     save_and_write_results_to_writer(&tool, &common_cli_items)
 }
 
 fn invalid_symlinks(invalid_symlinks: InvalidSymlinksArgs, stop_flag: &Arc<AtomicBool>, progress_sender: &Sender<ProgressData>) -> CliOutput {
-    let InvalidSymlinksArgs { common_cli_items, delete_files } = invalid_symlinks;
+    let InvalidSymlinksArgs { common_cli_items, delete_method } = invalid_symlinks;
 
     let mut tool = InvalidSymlinks::new();
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_files {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -304,7 +288,7 @@ fn invalid_symlinks(invalid_symlinks: InvalidSymlinksArgs, stop_flag: &Arc<Atomi
 fn broken_files(broken_files: BrokenFilesArgs, stop_flag: &Arc<AtomicBool>, progress_sender: &Sender<ProgressData>) -> CliOutput {
     let BrokenFilesArgs {
         common_cli_items,
-        delete_files,
+        delete_method,
         checked_types,
     } = broken_files;
 
@@ -316,9 +300,7 @@ fn broken_files(broken_files: BrokenFilesArgs, stop_flag: &Arc<AtomicBool>, prog
     let mut tool = BrokenFiles::new(params);
 
     set_common_settings(&mut tool, &common_cli_items, None);
-    if delete_files {
-        tool.set_delete_method(DeleteMethod::Delete);
-    }
+    set_simple_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -333,7 +315,6 @@ fn similar_videos(similar_videos: SimilarVideosArgs, stop_flag: &Arc<AtomicBool>
         minimal_file_size,
         maximal_file_size,
         delete_method,
-        dry_run,
         allow_hard_links,
         ignore_same_size,
         skip_forward_amount,
@@ -354,8 +335,7 @@ fn similar_videos(similar_videos: SimilarVideosArgs, stop_flag: &Arc<AtomicBool>
     set_common_settings(&mut tool, &common_cli_items, Some(reference_directories.reference_directories.as_ref()));
     tool.set_minimal_file_size(minimal_file_size);
     tool.set_maximal_file_size(maximal_file_size);
-    tool.set_delete_method(delete_method.delete_method);
-    tool.set_dry_run(dry_run.dry_run);
+    set_advanced_delete(&mut tool, delete_method);
 
     tool.search(stop_flag, Some(progress_sender));
 
@@ -420,6 +400,26 @@ fn save_and_write_results_to_writer<T: CommonData + PrintResults>(component: &T,
     cli_output
 }
 
+fn set_simple_delete<T>(component: &mut T, s_delete: SDMethod)
+where
+    T: AllTraits,
+{
+    if s_delete.delete_files {
+        component.set_delete_method(DeleteMethod::Delete);
+    }
+    component.set_dry_run(s_delete.dry_run);
+    component.set_move_to_trash(s_delete.move_to_trash);
+}
+
+fn set_advanced_delete<T>(component: &mut T, a_delete: DMethod)
+where
+    T: AllTraits,
+{
+    component.set_delete_method(a_delete.delete_method);
+    component.set_dry_run(a_delete.dry_run);
+    component.set_move_to_trash(a_delete.move_to_trash);
+}
+
 fn set_common_settings<T>(component: &mut T, common_cli_items: &CommonCliItems, reference_directories: Option<&Vec<PathBuf>>)
 where
     T: AllTraits,

czkawka_cli/src/main.rs

@@ -33,7 +33,6 @@ lofty = "0.22"
 
 # Needed by broken files
 zip = { version = "6.0", features = ["aes-crypto", "bzip2", "deflate", "time"], default-features = false }
-audio_checker = "0.1"
 lopdf = "0.38.0"
 
 # Needed by audio similarity feature