From 110b0db74f30789ccf598558da1f9d1071736c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sun, 14 Jan 2024 20:00:56 +0100 Subject: [PATCH] Import split --- ci_tester/src/main.rs | 3 +- czkawka_core/src/broken_files.rs | 1 - czkawka_core/src/common.rs | 10 +++--- czkawka_core/src/common_cache.rs | 16 +++++---- czkawka_core/src/common_directory.rs | 2 +- czkawka_core/src/common_extensions.rs | 3 +- czkawka_core/src/common_items.rs | 4 +-- czkawka_core/src/common_traits.rs | 5 +-- czkawka_core/src/duplicate.rs | 2 +- czkawka_core/src/empty_files.rs | 1 - czkawka_core/src/empty_folder.rs | 2 +- czkawka_core/src/invalid_symlinks.rs | 1 - czkawka_core/src/same_music.rs | 2 -- czkawka_core/src/similar_images.rs | 3 +- czkawka_core/src/temporary.rs | 1 - czkawka_gui/icons/czk_hide_down.svg | 20 +++++------ czkawka_gui/icons/czk_hide_up.svg | 20 +++++------ czkawka_gui/icons/czk_sort.svg | 4 +-- .../connect_things/connect_popovers_select.rs | 5 +-- .../connect_things/connect_progress_window.rs | 3 +- .../connect_selection_of_directories.rs | 2 +- .../src/connect_things/connect_settings.rs | 8 ++--- czkawka_gui/src/main.rs | 2 +- krokiet/src/common.rs | 6 ++-- krokiet/src/connect_delete.rs | 5 +-- krokiet/src/connect_open.rs | 3 +- krokiet/src/connect_progress_receiver.rs | 8 +++-- krokiet/src/connect_scan.rs | 17 +++++---- krokiet/src/connect_show_preview.rs | 11 +++--- krokiet/src/connect_stop.rs | 3 +- krokiet/src/connect_translation.rs | 6 ++-- krokiet/src/main.rs | 35 ++++++++++--------- krokiet/src/set_initial_gui_info.rs | 3 +- 33 files changed, 117 insertions(+), 100 deletions(-) diff --git a/ci_tester/src/main.rs b/ci_tester/src/main.rs index a41a410..fd55c17 100644 --- a/ci_tester/src/main.rs +++ b/ci_tester/src/main.rs @@ -1,9 +1,10 @@ -use log::info; use std::collections::BTreeSet; use std::fs; use std::process::Command; use std::process::Stdio; +use log::info; + #[derive(Default, Clone, Debug)] struct CollectedFiles { files: BTreeSet, diff --git a/czkawka_core/src/broken_files.rs b/czkawka_core/src/broken_files.rs index b25f03b..83e9938 100644 --- a/czkawka_core/src/broken_files.rs +++ b/czkawka_core/src/broken_files.rs @@ -1,7 +1,6 @@ use std::collections::{BTreeMap, HashSet}; use std::fs::File; use std::io::prelude::*; - use std::path::{Path, PathBuf}; use std::sync::atomic::Ordering; use std::{fs, mem, panic}; diff --git a/czkawka_core/src/common.rs b/czkawka_core/src/common.rs index 4d33b10..7d225f8 100644 --- a/czkawka_core/src/common.rs +++ b/czkawka_core/src/common.rs @@ -1,4 +1,6 @@ #![allow(unused_imports)] + +use std::{fs, thread}; // I don't wanna fight with unused imports in this file, so simply ignore it to avoid too much complexity use std::cmp::Ordering; use std::ffi::OsString; @@ -8,7 +10,6 @@ use std::sync::atomic::{AtomicBool, AtomicUsize}; use std::sync::{atomic, Arc}; use std::thread::{sleep, JoinHandle}; use std::time::{Duration, Instant, SystemTime}; -use std::{fs, thread}; #[cfg(feature = "heif")] use anyhow::Result; @@ -16,14 +17,12 @@ use crossbeam_channel::Sender; use directories_next::ProjectDirs; use fun_time::fun_time; use handsome_logger::{ColorChoice, ConfigBuilder, TerminalMode}; -use image::{DynamicImage, ImageBuffer, Rgb}; -use imagepipe::{ImageSource, Pipeline}; +use image::{DynamicImage, ImageBuffer}; #[cfg(feature = "heif")] use libheif_rs::{ColorSpace, HeifContext, RgbChroma}; #[cfg(feature = "libraw")] use libraw::Processor; use log::{debug, error, info, warn, LevelFilter, Record}; -use rawloader::RawLoader; use symphonia::core::conv::IntoSample; // #[cfg(feature = "heif")] @@ -612,10 +611,11 @@ mod test { use std::fs; use std::io::Write; use std::path::{Path, PathBuf}; + use tempfile::tempdir; use crate::common::{normalize_windows_path, regex_check, remove_folder_if_contains_only_empty_folders}; - use crate::common_items::{new_excluded_item, ExcludedItems}; + use crate::common_items::new_excluded_item; #[test] fn test_remove_folder_if_contains_only_empty_folders() { diff --git a/czkawka_core/src/common_cache.rs b/czkawka_core/src/common_cache.rs index c69ba7a..91375e7 100644 --- a/czkawka_core/src/common_cache.rs +++ b/czkawka_core/src/common_cache.rs @@ -1,16 +1,18 @@ -use crate::common; -use crate::common_messages::Messages; -use crate::common_traits::ResultEntry; -use crate::duplicate::HashType; -use crate::similar_images::{convert_algorithm_to_string, convert_filters_to_string}; +use std::collections::BTreeMap; +use std::io::{BufReader, BufWriter}; + use fun_time::fun_time; use image::imageops::FilterType; use image_hasher::HashAlg; use log::debug; use rayon::iter::{IntoParallelIterator, ParallelIterator}; use serde::{Deserialize, Serialize}; -use std::collections::BTreeMap; -use std::io::{BufReader, BufWriter}; + +use crate::common; +use crate::common_messages::Messages; +use crate::common_traits::ResultEntry; +use crate::duplicate::HashType; +use crate::similar_images::{convert_algorithm_to_string, convert_filters_to_string}; const CACHE_VERSION: &str = "70"; diff --git a/czkawka_core/src/common_directory.rs b/czkawka_core/src/common_directory.rs index 0b68fd9..cf2524c 100644 --- a/czkawka_core/src/common_directory.rs +++ b/czkawka_core/src/common_directory.rs @@ -1,8 +1,8 @@ -use crate::common::normalize_windows_path; use std::path::{Path, PathBuf}; #[cfg(target_family = "unix")] use std::{fs, os::unix::fs::MetadataExt}; +use crate::common::normalize_windows_path; use crate::common_messages::Messages; use crate::flc; diff --git a/czkawka_core/src/common_extensions.rs b/czkawka_core/src/common_extensions.rs index d210fd3..f4d3d1d 100644 --- a/czkawka_core/src/common_extensions.rs +++ b/czkawka_core/src/common_extensions.rs @@ -1,7 +1,8 @@ -use crate::common_messages::Messages; use std::collections::HashSet; use std::fs::DirEntry; +use crate::common_messages::Messages; + #[derive(Debug, Clone, Default)] pub struct Extensions { file_extensions_hashset: HashSet, diff --git a/czkawka_core/src/common_items.rs b/czkawka_core/src/common_items.rs index 6d3b6eb..2ff81c7 100644 --- a/czkawka_core/src/common_items.rs +++ b/czkawka_core/src/common_items.rs @@ -1,8 +1,8 @@ +use std::path::Path; + #[cfg(not(target_family = "unix"))] use crate::common::normalize_windows_path; use crate::common::regex_check; -use std::path::Path; - use crate::common_messages::Messages; #[cfg(target_family = "unix")] diff --git a/czkawka_core/src/common_traits.rs b/czkawka_core/src/common_traits.rs index 27aaebd..744d33e 100644 --- a/czkawka_core/src/common_traits.rs +++ b/czkawka_core/src/common_traits.rs @@ -1,9 +1,10 @@ -use fun_time::fun_time; -use serde::Serialize; use std::fs::File; use std::io::{BufWriter, Write}; use std::path::Path; +use fun_time::fun_time; +use serde::Serialize; + pub trait DebugPrint { fn debug_print(&self); } diff --git a/czkawka_core/src/duplicate.rs b/czkawka_core/src/duplicate.rs index 3cf832b..8f4d4f1 100644 --- a/czkawka_core/src/duplicate.rs +++ b/czkawka_core/src/duplicate.rs @@ -134,7 +134,7 @@ impl DuplicateFinder { ignore_hard_links: true, hash_type: HashType::Blake3, use_prehash_cache: true, - minimal_cache_file_size: 1024 * 3256, // By default cache only >= 256 KB files + minimal_cache_file_size: 1024 * 256, // By default cache only >= 256 KB files minimal_prehash_cache_file_size: 0, case_sensitive_name_comparison: false, } diff --git a/czkawka_core/src/empty_files.rs b/czkawka_core/src/empty_files.rs index a396c26..d62cf45 100644 --- a/czkawka_core/src/empty_files.rs +++ b/czkawka_core/src/empty_files.rs @@ -1,5 +1,4 @@ use std::fs; - use std::io::prelude::*; use crossbeam_channel::{Receiver, Sender}; diff --git a/czkawka_core/src/empty_folder.rs b/czkawka_core/src/empty_folder.rs index 1e1346a..dd9dd28 100644 --- a/czkawka_core/src/empty_folder.rs +++ b/czkawka_core/src/empty_folder.rs @@ -5,12 +5,12 @@ use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::atomic::Ordering; -use crate::common::{check_if_stop_received, prepare_thread_handler_common, send_info_and_wait_for_ending_all_threads}; use crossbeam_channel::{Receiver, Sender}; use fun_time::fun_time; use log::debug; use rayon::prelude::*; +use crate::common::{check_if_stop_received, prepare_thread_handler_common, send_info_and_wait_for_ending_all_threads}; use crate::common_dir_traversal::{common_get_entry_data, common_get_metadata_dir, common_read_dir, get_modified_time, CheckingMethod, ProgressData, ToolType}; use crate::common_directory::Directories; use crate::common_items::ExcludedItems; diff --git a/czkawka_core/src/invalid_symlinks.rs b/czkawka_core/src/invalid_symlinks.rs index ba00b58..f493057 100644 --- a/czkawka_core/src/invalid_symlinks.rs +++ b/czkawka_core/src/invalid_symlinks.rs @@ -1,5 +1,4 @@ use std::fs; - use std::io::prelude::*; use std::path::{Path, PathBuf}; diff --git a/czkawka_core/src/same_music.rs b/czkawka_core/src/same_music.rs index 0664b48..9769a9c 100644 --- a/czkawka_core/src/same_music.rs +++ b/czkawka_core/src/same_music.rs @@ -2,14 +2,12 @@ use std::cmp::max; use std::collections::{BTreeMap, HashSet}; use std::fs::File; use std::io::prelude::*; - use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::{mem, panic}; use anyhow::Context; - use crossbeam_channel::{Receiver, Sender}; use fun_time::fun_time; use humansize::{format_size, BINARY}; diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index 750172c..1801ec9 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -6,7 +6,6 @@ use std::time::SystemTime; use std::{mem, panic}; use bk_tree::BKTree; - use crossbeam_channel::{Receiver, Sender}; use fun_time::fun_time; use humansize::{format_size, BINARY}; @@ -1097,9 +1096,9 @@ mod tests { use std::collections::HashMap; use std::path::PathBuf; - use crate::common_dir_traversal::ToolType; use bk_tree::BKTree; + use crate::common_dir_traversal::ToolType; use crate::common_directory::Directories; use crate::common_tool::CommonToolData; use crate::similar_images::{Hamming, ImHash, ImageType, ImagesEntry, SimilarImages}; diff --git a/czkawka_core/src/temporary.rs b/czkawka_core/src/temporary.rs index 4042aa8..064cf3d 100644 --- a/czkawka_core/src/temporary.rs +++ b/czkawka_core/src/temporary.rs @@ -1,7 +1,6 @@ use std::fs; use std::fs::DirEntry; use std::io::prelude::*; - use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; diff --git a/czkawka_gui/icons/czk_hide_down.svg b/czkawka_gui/icons/czk_hide_down.svg index 7b2ced9..75df6a0 100644 --- a/czkawka_gui/icons/czk_hide_down.svg +++ b/czkawka_gui/icons/czk_hide_down.svg @@ -1,15 +1,15 @@ + enable-background="new 0 0 512 512" + viewBox="0 0 512 512" + version="1.1" + id="svg16" + sodipodi:docname="czk_hide_down.svg" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> + enable-background="new 0 0 512 512" + viewBox="0 0 512 512" + version="1.1" + id="svg16" + sodipodi:docname="czk_hide_up.svg" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" +> - +