From 9a559d201ff3c3d82c3a83638ceda0b2c4387c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sat, 6 May 2023 21:09:43 +0200 Subject: [PATCH] Check was stopped --- czkawka_core/src/bad_extensions.rs | 5 ++--- czkawka_core/src/big_file.rs | 2 +- czkawka_core/src/broken_files.rs | 4 ++-- czkawka_core/src/common.rs | 5 +++-- czkawka_core/src/common_dir_traversal.rs | 3 ++- czkawka_core/src/duplicate.rs | 10 +++------- czkawka_core/src/same_music.rs | 18 +++++++++--------- czkawka_core/src/similar_images.rs | 11 ++++------- czkawka_core/src/similar_videos.rs | 11 +++-------- czkawka_core/src/temporary.rs | 2 +- 10 files changed, 30 insertions(+), 41 deletions(-) diff --git a/czkawka_core/src/bad_extensions.rs b/czkawka_core/src/bad_extensions.rs index c19367f..13f4c4e 100644 --- a/czkawka_core/src/bad_extensions.rs +++ b/czkawka_core/src/bad_extensions.rs @@ -313,9 +313,8 @@ impl BadExtensions { } fn look_for_bad_extensions_files(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 1, 1, self.files_to_check.len(), CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = + prepare_thread_handler_common(progress_sender, 1, 1, self.files_to_check.len(), CheckingMethod::None); let files_to_check = mem::take(&mut self.files_to_check); diff --git a/czkawka_core/src/big_file.rs b/czkawka_core/src/big_file.rs index d4547da..efba79b 100644 --- a/czkawka_core/src/big_file.rs +++ b/czkawka_core/src/big_file.rs @@ -148,7 +148,7 @@ impl BigFile { folders_to_check.push(id.clone()); } - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 0, 0, 0, CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 0, 0, 0, CheckingMethod::None); while !folders_to_check.is_empty() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() { diff --git a/czkawka_core/src/broken_files.rs b/czkawka_core/src/broken_files.rs index 36e97d1..9be3e23 100644 --- a/czkawka_core/src/broken_files.rs +++ b/czkawka_core/src/broken_files.rs @@ -200,7 +200,7 @@ impl BrokenFiles { folders_to_check.push(id.clone()); } - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 0, 1, 0, CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 0, 1, 0, CheckingMethod::None); while !folders_to_check.is_empty() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() { @@ -435,7 +435,7 @@ impl BrokenFiles { non_cached_files_to_check = files_to_check; } - let (progress_thread_handle, progress_thread_run, atomic_counter) = + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 1, 1, non_cached_files_to_check.len(), CheckingMethod::None); let mut vec_file_entry: Vec = non_cached_files_to_check diff --git a/czkawka_core/src/common.rs b/czkawka_core/src/common.rs index 14a7654..2768e02 100644 --- a/czkawka_core/src/common.rs +++ b/czkawka_core/src/common.rs @@ -392,9 +392,10 @@ pub fn prepare_thread_handler_common( max_stage: u8, max_value: usize, checking_method: CheckingMethod, -) -> (JoinHandle<()>, Arc, Arc) { +) -> (JoinHandle<()>, Arc, Arc, AtomicBool) { let progress_thread_run = Arc::new(AtomicBool::new(true)); let atomic_counter = Arc::new(AtomicUsize::new(0)); + let check_was_stopped = AtomicBool::new(false); let progress_thread_sender = if let Some(progress_sender) = progress_sender { let progress_send = progress_sender.clone(); let progress_thread_run = progress_thread_run.clone(); @@ -417,7 +418,7 @@ pub fn prepare_thread_handler_common( } else { thread::spawn(|| {}) }; - (progress_thread_sender, progress_thread_run, atomic_counter) + (progress_thread_sender, progress_thread_run, atomic_counter, check_was_stopped) } pub fn send_info_and_wait_for_ending_all_threads(progress_thread_run: &Arc, progress_thread_handle: JoinHandle<()>) { diff --git a/czkawka_core/src/common_dir_traversal.rs b/czkawka_core/src/common_dir_traversal.rs index b291a5e..e084284 100644 --- a/czkawka_core/src/common_dir_traversal.rs +++ b/czkawka_core/src/common_dir_traversal.rs @@ -338,7 +338,8 @@ where // Add root folders for finding folders_to_check.extend(self.root_dirs); - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(self.progress_sender, 0, self.max_stage, 0, self.checking_method); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = + prepare_thread_handler_common(self.progress_sender, 0, self.max_stage, 0, self.checking_method); let DirTraversal { collect, diff --git a/czkawka_core/src/duplicate.rs b/czkawka_core/src/duplicate.rs index a059968..fa6e88a 100644 --- a/czkawka_core/src/duplicate.rs +++ b/czkawka_core/src/duplicate.rs @@ -9,7 +9,7 @@ use std::io::{BufReader, BufWriter}; #[cfg(target_family = "unix")] use std::os::unix::fs::MetadataExt; use std::path::{Path, PathBuf}; -use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::atomic::Ordering; use std::{fs, mem}; @@ -675,9 +675,7 @@ impl DuplicateFinder { pre_checked_map: &mut BTreeMap>, ) -> Option<()> { let check_type = self.hash_type; - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - - let (progress_thread_handle, progress_thread_run, atomic_counter) = + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = prepare_thread_handler_common(progress_sender, 1, 2, self.files_with_identical_size.values().map(Vec::len).sum(), self.check_method); let (loaded_hash_map, records_already_cached, non_cached_files_to_check) = self.prehash_load_cache_at_start(); @@ -830,11 +828,9 @@ impl DuplicateFinder { progress_sender: Option<&UnboundedSender>, pre_checked_map: BTreeMap>, ) -> Option<()> { - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - let check_type = self.hash_type; - let (progress_thread_handle, progress_thread_run, atomic_counter) = + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = prepare_thread_handler_common(progress_sender, 2, 2, pre_checked_map.values().map(Vec::len).sum(), self.check_method); ///////////////////////////////////////////////////////////////////////////// HASHING START diff --git a/czkawka_core/src/same_music.rs b/czkawka_core/src/same_music.rs index b71dd4b..d32eef4 100644 --- a/czkawka_core/src/same_music.rs +++ b/czkawka_core/src/same_music.rs @@ -3,7 +3,7 @@ use std::fs::File; use std::io::prelude::*; use std::io::{BufReader, BufWriter}; use std::path::{Path, PathBuf}; -use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; +use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::{mem, panic}; @@ -392,9 +392,8 @@ impl SameMusic { fn calculate_fingerprint(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { let (loaded_hash_map, records_already_cached, non_cached_files_to_check) = self.load_cache(false); - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 1, 2, non_cached_files_to_check.len(), self.check_type); + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = + prepare_thread_handler_common(progress_sender, 1, 2, non_cached_files_to_check.len(), self.check_type); let configuration = &self.hash_preset_config; // Clean for duplicate files @@ -439,9 +438,8 @@ impl SameMusic { fn read_tags(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { let (loaded_hash_map, records_already_cached, non_cached_files_to_check) = self.load_cache(true); - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 1, 2, non_cached_files_to_check.len(), self.check_type); + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = + prepare_thread_handler_common(progress_sender, 1, 2, non_cached_files_to_check.len(), self.check_type); // Clean for duplicate files let mut vec_file_entry = non_cached_files_to_check @@ -571,7 +569,8 @@ impl SameMusic { fn check_for_duplicate_tags(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { assert_ne!(MusicSimilarity::NONE, self.music_similarity, "This can't be none"); - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 2, 2, self.music_to_check.len(), self.check_type); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = + prepare_thread_handler_common(progress_sender, 2, 2, self.music_to_check.len(), self.check_type); let mut old_duplicates: Vec> = vec![self.music_entries.clone()]; let mut new_duplicates: Vec> = Vec::new(); @@ -746,7 +745,8 @@ impl SameMusic { assert_ne!(MusicSimilarity::NONE, self.music_similarity, "This can't be none"); let (base_files, files_to_compare) = self.split_fingerprints_to_check(); - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 2, 2, base_files.len(), self.check_type); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = + prepare_thread_handler_common(progress_sender, 2, 2, base_files.len(), self.check_type); let Some(duplicated_music_entries) = self.compare_fingerprints(stop_receiver, &atomic_counter, base_files, &files_to_compare) else { send_info_and_wait_for_ending_all_threads(&progress_thread_run, progress_thread_handle); diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index fd4bd40..f9b8aa8 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -300,7 +300,7 @@ impl SimilarImages { folders_to_check.push(id.clone()); } - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 0, 2, 0, CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 0, 2, 0, CheckingMethod::None); while !folders_to_check.is_empty() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() { @@ -434,8 +434,7 @@ impl SimilarImages { fn hash_images(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { let (loaded_hash_map, records_already_cached, non_cached_files_to_check) = self.hash_images_load_cache(); - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - let (progress_thread_handle, progress_thread_run, atomic_counter) = + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = prepare_thread_handler_common(progress_sender, 1, 2, non_cached_files_to_check.len(), CheckingMethod::None); let mut vec_file_entry: Vec<(FileEntry, ImHash)> = non_cached_files_to_check @@ -816,10 +815,8 @@ impl SimilarImages { } } } else { - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - let _progress_thread_run = Arc::new(AtomicBool::new(true)); - let _atomic_counter = Arc::new(AtomicUsize::new(0)); - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 2, 2, all_hashes.len(), CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = + prepare_thread_handler_common(progress_sender, 2, 2, all_hashes.len(), CheckingMethod::None); // Don't use hashes with multiple images in bktree, because they will always be master of group and cannot be find by other hashes diff --git a/czkawka_core/src/similar_videos.rs b/czkawka_core/src/similar_videos.rs index 598d582..366a180 100644 --- a/czkawka_core/src/similar_videos.rs +++ b/czkawka_core/src/similar_videos.rs @@ -4,8 +4,7 @@ use std::io::Write; use std::io::*; use std::mem; use std::path::{Path, PathBuf}; -use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; -use std::sync::Arc; +use std::sync::atomic::Ordering; use crossbeam_channel::Receiver; use ffmpeg_cmdline_utils::FfmpegErrorKind::FfmpegNotFound; @@ -262,7 +261,7 @@ impl SimilarVideos { folders_to_check.push(id.clone()); } - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 0, 1, 0, CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 0, 1, 0, CheckingMethod::None); while !folders_to_check.is_empty() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() { @@ -390,11 +389,7 @@ impl SimilarVideos { fn sort_videos(&mut self, stop_receiver: Option<&Receiver<()>>, progress_sender: Option<&UnboundedSender>) -> bool { let (loaded_hash_map, records_already_cached, non_cached_files_to_check) = self.load_cache_at_start(); - let check_was_stopped = AtomicBool::new(false); // Used for breaking from GUI and ending check thread - let _progress_thread_run = Arc::new(AtomicBool::new(true)); - - let _atomic_counter = Arc::new(AtomicUsize::new(0)); - let (progress_thread_handle, progress_thread_run, atomic_counter) = + let (progress_thread_handle, progress_thread_run, atomic_counter, check_was_stopped) = prepare_thread_handler_common(progress_sender, 1, 1, non_cached_files_to_check.len(), CheckingMethod::None); let mut vec_file_entry: Vec = non_cached_files_to_check diff --git a/czkawka_core/src/temporary.rs b/czkawka_core/src/temporary.rs index d09c550..a0c9674 100644 --- a/czkawka_core/src/temporary.rs +++ b/czkawka_core/src/temporary.rs @@ -149,7 +149,7 @@ impl Temporary { folders_to_check.push(id.clone()); } - let (progress_thread_handle, progress_thread_run, atomic_counter) = prepare_thread_handler_common(progress_sender, 0, 0, 0, CheckingMethod::None); + let (progress_thread_handle, progress_thread_run, atomic_counter, _check_was_stopped) = prepare_thread_handler_common(progress_sender, 0, 0, 0, CheckingMethod::None); while !folders_to_check.is_empty() { if stop_receiver.is_some() && stop_receiver.unwrap().try_recv().is_ok() {