Str

Author: qarmin

.github/ISSUE_TEMPLATE/bug_report.md

@@ -40,7 +40,7 @@ Very helpful in this situation will be logs from czkawka run with RUST_LOG envir
 <!-- Please do not report feature request unique for Gtk Czkawka gui, because it is in maintenance mode. -->
 
 - Czkawka/Krokiet version: <!--  e.g. 9.0.0 cli/gui -->
-- OS version: <!--  e.g Ubuntu 22.04, Windows 11, Mac 15.1 ARM -->
+- OS version: <!--  e.g. Ubuntu 22.04, Windows 11, Mac 15.1 ARM -->
 - Installation method: <!-- e.g. github binaries, flatpak, msys2 -->
 
 <!-- If you use flatpak, please include the result of `flatpak info com.github.qarmin.czkawka`. -->

Changelog.md

@@ -3,9 +3,11 @@
 ### Breaking changes[Users]
 - Some languages now have unified names in Crowdin (e.g. `es` → `es-ES`). The GUI may not find them and will fall back to the default language.
 - Cache files now use memory limits and are incompatible with previous versions.
+- Cli image filter argument changed from `faussian` to `gaussian`
 
 ### Breaking changes[Devs]
 - `stop_flag` is now required argument in most of the core functions
+- Visibility of some core functions has been reduced to `pub(crate)`
 
 ### Core
 - Replaced `println`/`eprintln` with logging functions - [#1478](https://github.com/qarmin/czkawka/pull/1478)
@@ -80,7 +82,7 @@
 - Added support for configuring config/cache paths using the `CZKAWKA_CONFIG_PATH` and `CZKAWKA_CACHE_PATH` environment variables - [#1464](https://github.com/qarmin/czkawka/pull/1464)
 - Fixed a crash in debug mode when checking broken files named `.mp3` - [#1464](https://github.com/qarmin/czkawka/pull/1464)
 - Catching panics from symphonia crashes in broken files mode - [#1466](https://github.com/qarmin/czkawka/pull/1466)
-- Printing a warning, when using `panic=abort`(that may speedup app and cause occasional crashes) - [#1466](https://github.com/qarmin/czkawka/pull/1466)
+- Printing a warning, when using `panic=abort`(that may speed up app and cause occasional crashes) - [#1466](https://github.com/qarmin/czkawka/pull/1466)
 
 ### Krokiet
 - Changed the default tab to "Duplicate Files" - [#1368](https://github.com/qarmin/czkawka/pull/1368)

czkawka_cli/src/commands.rs

@@ -225,7 +225,7 @@ pub struct SimilarImagesArgs {
         long,
         default_value = "High",
         value_parser = parse_similar_images_similarity,
-        help = "Similairty level (Minimal, VerySmall, Small, Medium, High, VeryHigh, Original)",
+        help = "Similarity level (Minimal, VerySmall, Small, Medium, High, VeryHigh, Original)",
         long_help = "Methods to choose similarity level of images which will be considered as duplicated."
     )]
     pub similarity_preset: SimilarityPreset,
@@ -697,7 +697,7 @@ fn parse_checking_method_same_music(src: &str) -> Result<CheckingMethod, &'stati
     match src.to_ascii_lowercase().as_str() {
         "tags" => Ok(CheckingMethod::AudioTags),
         "content" => Ok(CheckingMethod::AudioContent),
-        _ => Err("Couldn't parse the searc method (allowed: TAGS, CONTENT)"),
+        _ => Err("Couldn't parse the search method (allowed: TAGS, CONTENT)"),
     }
 }
 
@@ -754,9 +754,9 @@ fn parse_similar_image_filter(src: &str) -> Result<FilterType, String> {
         "lanczos3" => FilterType::Lanczos3,
         "nearest" => FilterType::Nearest,
         "triangle" => FilterType::Triangle,
-        "faussian" => FilterType::Gaussian,
+        "gaussian" => FilterType::Gaussian,
         "catmullrom" => FilterType::CatmullRom,
-        _ => return Err("Couldn't parse the image resize filter (allowed: Lanczos3, Nearest, Triangle, Faussian, Catmullrom)".to_string()),
+        _ => return Err("Couldn't parse the image resize filter (allowed: Lanczos3, Nearest, Triangle, Gaussian, Catmullrom)".to_string()),
     };
     Ok(filter_type)
 }

czkawka_core/src/common.rs

@@ -71,8 +71,8 @@ pub fn set_config_cache_path(cache_name: &'static str, config_name: &'static str
     let mut infos = vec![];
     let mut warnings = vec![];
 
-    let config_folder_env = std::env::var("CZKAWKA_CONFIG_PATH").unwrap_or_default().trim().to_string();
-    let cache_folder_env = std::env::var("CZKAWKA_CACHE_PATH").unwrap_or_default().trim().to_string();
+    let config_folder_env = env::var("CZKAWKA_CONFIG_PATH").unwrap_or_default().trim().to_string();
+    let cache_folder_env = env::var("CZKAWKA_CACHE_PATH").unwrap_or_default().trim().to_string();
 
     let default_cache_folder = ProjectDirs::from("pl", "Qarmin", cache_name).map(|proj_dirs| proj_dirs.cache_dir().to_path_buf());
     let default_config_folder = ProjectDirs::from("pl", "Qarmin", config_name).map(|proj_dirs| proj_dirs.config_dir().to_path_buf());
@@ -298,7 +298,7 @@ pub fn print_version_mode(app: &str) {
         "{app} version: {CZKAWKA_VERSION}, {debug_release} mode, rust {rust_version}, os {} {} ({} {}), {processors} cpu/threads, features({}): [{}], app cpu version: {}, os cpu version: {}",
         info.os_type(),
         info.version(),
-        std::env::consts::ARCH,
+        env::consts::ARCH,
         info.bitness(),
         features.len(),
         features.join(", "),

czkawka_core/src/common_dir_traversal.rs

@@ -303,7 +303,7 @@ where
 
             let segments: Vec<_> = folders_to_check
                 .into_par_iter()
-                .with_max_len(2) // Avoiding checking too much folders in batch
+                .with_max_len(2) // Avoiding checking too many folders in batch
                 .map(|current_folder| {
                     let mut dir_result = vec![];
                     let mut warnings = vec![];

czkawka_core/src/tools/similar_videos.rs

@@ -85,10 +85,7 @@ pub fn crop_detect_from_str_opt(s: &str) -> Option<Cropdetect> {
 }
 
 pub fn crop_detect_from_str(s: &str) -> Cropdetect {
-    match crop_detect_from_str_opt(s) {
-        Some(crop_detect) => crop_detect,
-        None => DEFAULT_CROP_DETECT,
-    }
+    crop_detect_from_str_opt(s).unwrap_or(DEFAULT_CROP_DETECT)
 }
 pub fn crop_detect_to_str(crop_detect: Cropdetect) -> String {
     match crop_detect {

czkawka_core/src/tools/temporary.rs

@@ -42,12 +42,12 @@ impl ResultEntry for TemporaryFileEntry {
     fn get_path(&self) -> &Path {
         &self.path
     }
-    fn get_size(&self) -> u64 {
-        self.size
-    }
     fn get_modified_date(&self) -> u64 {
         self.modified_date
     }
+    fn get_size(&self) -> u64 {
+        self.size
+    }
 }
 
 #[derive(Default)]

czkawka_gui/src/saving_loading.rs

@@ -42,7 +42,7 @@ const DEFAULT_IMAGE_REMOVE_AUTO_OUTDATED_CACHE: bool = true;
 const DEFAULT_DUPLICATE_REMOVE_AUTO_OUTDATED_CACHE: bool = true;
 const DEFAULT_DUPLICATE_CASE_SENSITIVE_NAME_CHECKING: bool = false;
 const DEFAULT_GENERAL_IGNORE_OTHER_FILESYSTEMS: bool = false;
-const DEFUALT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW: bool = true;
+const DEFAULT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW: bool = true;
 
 const DEFAULT_MUSIC_APPROXIMATE_COMPARISON: bool = false;
 const DEFAULT_MUSIC_GROUP_CONTENT_BY_TITLE: bool = false;
@@ -633,7 +633,7 @@ pub(crate) fn load_configuration(
     let ignore_other_fs: bool = loaded_entries.get_bool(hashmap_ls[&LoadText::GeneralIgnoreOtherFilesystems].clone(), DEFAULT_GENERAL_IGNORE_OTHER_FILESYSTEMS);
     let use_rust_libraries_to_preview: bool = loaded_entries.get_bool(
         hashmap_ls[&LoadText::GeneralUseRustLibrariesToPreview].clone(),
-        DEFUALT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW,
+        DEFAULT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW,
     );
 
     let delete_outdated_cache_duplicates: bool = loaded_entries.get_bool(
@@ -947,7 +947,7 @@ pub(crate) fn reset_configuration(manual_clearing: bool, upper_notebook: &GuiUpp
         settings.entry_settings_prehash_cache_file_minimal_size.set_text(DEFAULT_PREHASH_MINIMAL_CACHE_SIZE);
         settings.combo_box_settings_language.set_active(Some(0));
         settings.check_button_settings_one_filesystem.set_active(DEFAULT_GENERAL_IGNORE_OTHER_FILESYSTEMS);
-        settings.check_button_settings_use_rust_preview.set_active(DEFUALT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW);
+        settings.check_button_settings_use_rust_preview.set_active(DEFAULT_USING_RUST_LIBRARIES_TO_SHOW_PREVIEW);
 
         main_notebook.combo_box_duplicate_hash_type.set_active(Some(0));
         main_notebook.combo_box_duplicate_check_method.set_active(Some(0));

czkawka_gui/ui/about_dialog.ui

@@ -7,7 +7,7 @@
     <property name="comments" translatable="yes">2020 - 2025
 Rafał Mikrut (qarmin) and contributors
 This program is free to use and will always be.
-App is now in maintenance mode, so check Krokiet, the sucessor of Czkawka.
+App is now in maintenance mode, so check Krokiet, the successor of Czkawka.
 </property>
     <property name="license-type">mit-x11</property>
     <property name="logo-icon-name">help-about-symbolic</property>

czkawka_gui/ui/czkawka.cmb

@@ -344,7 +344,7 @@
 	(10,7,"GtkButton","buttons_popover_sort_selection",2,None,None,None,4,None,None)
   </object>
   <object_property>
-	(3,1,"GtkAboutDialog","comments","2020 - 2025\nRafał Mikrut (qarmin) and contributors\nThis program is free to use and will always be.\nApp is now in maintenance mode, so check Krokiet, the sucessor of Czkawka",1,None,None,None,None,None,None,None,None),
+	(3,1,"GtkAboutDialog","comments","2020 - 2025\nRafał Mikrut (qarmin) and contributors\nThis program is free to use and will always be.\nApp is now in maintenance mode, so check Krokiet, the successor of Czkawka",1,None,None,None,None,None,None,None,None),
 	(3,1,"GtkAboutDialog","license-type","mit-x11",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkAboutDialog","logo-icon-name","help-about-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,1,"GtkAboutDialog","program-name","Czkawka",None,None,None,None,None,None,None,None,None),