Sl

8 months ago · b23a0eddb3
parent 8cf3b00e53
commit b23a0eddb3
7 changed files with 44 additions and 33 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1417,7 +1417,7 @@ dependencies = [
 "serde",
 "serde_derive",
 "thiserror",
- "toml 0.8.1",
+ "toml 0.8.2",
 "unic-langid",
 ]

@ -2966,14 +2966,14 @@ dependencies = [

 [[package]]
 name = "system-deps"
-version = "6.1.1"
+version = "6.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
+checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6"
 dependencies = [
 "cfg-expr",
 "heck",
 "pkg-config",
- "toml 0.7.8",
+ "toml 0.8.2",
 "version-compare",
 ]

@ -3078,9 +3078,9 @@ dependencies = [

 [[package]]
 name = "tinystr"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e"
+checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
 dependencies = [
 "displaydoc",
 ]
@ -3111,26 +3111,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.20.1",
+ "toml_edit 0.20.2",
 ]

 [[package]]
@ -3149,17 +3137,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
 "indexmap 2.0.2",
- "serde",
- "serde_spanned",
 "toml_datetime",
 "winnow",
 ]

 [[package]]
 name = "toml_edit"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
 "indexmap 2.0.2",
 "serde",
--- a/czkawka_core/Cargo.toml
+++ b/czkawka_core/Cargo.toml
@ -57,9 +57,9 @@ bincode = "1.3"
 serde_json = "1.0"

 # Language
-i18n-embed = { version = "0.14.0", features = ["fluent-system", "desktop-requester"] }
+i18n-embed = { version = "0.14", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.7"
-rust-embed = "8.0.0"
+rust-embed = "8.0"
 once_cell = "1.18"

 # Raw image files
--- a/czkawka_core/src/bad_extensions.rs
+++ b/czkawka_core/src/bad_extensions.rs
@ -181,6 +181,7 @@ pub struct BadExtensions {
    bad_extensions_files: Vec<BadFileEntry>,
    include_files_without_extension: bool,
 }
+
 impl BadExtensions {
    pub fn new() -> Self {
        Self {
--- a/czkawka_gui/Cargo.toml
+++ b/czkawka_gui/Cargo.toml
@ -10,8 +10,8 @@ homepage = "https://github.com/qarmin/czkawka"
 repository = "https://github.com/qarmin/czkawka"

 [dependencies]
-gdk4 = "0.7.2"
-glib = "0.18.2"
+gdk4 = "0.7"
+glib = "0.18"

 humansize = "2.1"
 chrono = "0.4.31"
@ -44,16 +44,16 @@ trash = "3.0"
 fs_extra = "1.3"

 # Language
-i18n-embed = { version = "0.14.0", features = ["fluent-system", "desktop-requester"] }
+i18n-embed = { version = "0.14", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.7"
-rust-embed = "8.0.0"
+rust-embed = "8.0"
 once_cell = "1.18"

 log = "0.4.20"
 handsome_logger = "0.8"

 czkawka_core = { path = "../czkawka_core", version = "6.0.0", features = [] }
-gtk4 = { version = "0.7.2", default-features = false, features = ["v4_6"] }
+gtk4 = { version = "0.7", default-features = false, features = ["v4_6"] }

 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] }
--- a/czkawka_gui/src/connect_things/connect_button_search.rs
+++ b/czkawka_gui/src/connect_things/connect_button_search.rs
@ -1,9 +1,9 @@
-use crossbeam_channel::Receiver;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::thread;

+use crossbeam_channel::Receiver;
 use futures::channel::mpsc::UnboundedSender;
 use glib::Sender;
 use gtk4::prelude::*;
@ -209,6 +209,7 @@ struct LoadedCommonItems {
    maximal_file_size: u64,
    ignore_other_filesystems: bool,
 }
+
 impl LoadedCommonItems {
    fn load_items(gui_data: &GuiData) -> Self {
        let check_button_settings_one_filesystem = gui_data.settings.check_button_settings_one_filesystem.clone();
@ -278,6 +279,7 @@ impl LoadedCommonItems {
        }
    }
 }
+
 fn duplicate_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -389,6 +391,7 @@ fn empty_directories_search(
        glib_stop_sender.send(Message::EmptyFolders(ef)).unwrap();
    });
 }
+
 fn big_files_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -424,6 +427,7 @@ fn big_files_search(
        glib_stop_sender.send(Message::BigFiles(bf)).unwrap();
    });
 }
+
 fn temporary_files_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -449,6 +453,7 @@ fn temporary_files_search(
        glib_stop_sender.send(Message::Temporary(tf)).unwrap();
    });
 }
+
 fn same_music_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -550,6 +555,7 @@ fn same_music_search(
        button_app_info.set_sensitive(true);
    }
 }
+
 fn broken_files_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -624,6 +630,7 @@ fn broken_files_search(
        button_app_info.set_sensitive(true);
    }
 }
+
 fn similar_image_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -685,6 +692,7 @@ fn similar_image_search(
        glib_stop_sender.send(Message::SimilarImages(sf)).unwrap();
    });
 }
+
 fn similar_video_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -728,6 +736,7 @@ fn similar_video_search(
        glib_stop_sender.send(Message::SimilarVideos(sf)).unwrap();
    });
 }
+
 fn bad_symlinks_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
@ -754,6 +763,7 @@ fn bad_symlinks_search(
        glib_stop_sender.send(Message::InvalidSymlinks(isf)).unwrap();
    });
 }
+
 fn bad_extensions_search(
    gui_data: &GuiData,
    loaded_common_items: LoadedCommonItems,
--- a/czkawka_gui/src/connect_things/connect_progress_window.rs
+++ b/czkawka_gui/src/connect_things/connect_progress_window.rs
@ -44,6 +44,7 @@ pub fn connect_progress_window(gui_data: &GuiData, mut progress_receiver: Unboun
    };
    main_context.spawn_local(future);
 }
+
 fn process_bar_empty_files(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let taskbar_state = gui_data.taskbar_state.clone();
@ -51,6 +52,7 @@ fn process_bar_empty_files(gui_data: &GuiData, item: &ProgressData) {
    label_stage.set_text(&flg!("progress_scanning_general_file", file_number_tm(item)));
    taskbar_state.borrow().set_progress_state(TBPF_INDETERMINATE);
 }
+
 fn process_bar_empty_folder(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let taskbar_state = gui_data.taskbar_state.clone();
@ -61,6 +63,7 @@ fn process_bar_empty_folder(gui_data: &GuiData, item: &ProgressData) {
    ));
    taskbar_state.borrow().set_progress_state(TBPF_INDETERMINATE);
 }
+
 fn process_bar_big_files(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let taskbar_state = gui_data.taskbar_state.clone();
@ -68,6 +71,7 @@ fn process_bar_big_files(gui_data: &GuiData, item: &ProgressData) {
    label_stage.set_text(&flg!("progress_scanning_general_file", file_number_tm(item)));
    taskbar_state.borrow().set_progress_state(TBPF_INDETERMINATE);
 }
+
 fn process_bar_same_music(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -110,6 +114,7 @@ fn process_bar_same_music(gui_data: &GuiData, item: &ProgressData) {
        _ => panic!(),
    }
 }
+
 fn process_bar_similar_images(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -135,6 +140,7 @@ fn process_bar_similar_images(gui_data: &GuiData, item: &ProgressData) {
        _ => panic!(),
    }
 }
+
 fn process_bar_similar_videos(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -155,6 +161,7 @@ fn process_bar_similar_videos(gui_data: &GuiData, item: &ProgressData) {
        _ => panic!(),
    }
 }
+
 fn process_bar_temporary(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let taskbar_state = gui_data.taskbar_state.clone();
@ -162,6 +169,7 @@ fn process_bar_temporary(gui_data: &GuiData, item: &ProgressData) {
    label_stage.set_text(&flg!("progress_scanning_general_file", file_number_tm(item)));
    taskbar_state.borrow().set_progress_state(TBPF_INDETERMINATE);
 }
+
 fn process_bar_invalid_symlinks(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let taskbar_state = gui_data.taskbar_state.clone();
@ -169,6 +177,7 @@ fn process_bar_invalid_symlinks(gui_data: &GuiData, item: &ProgressData) {
    label_stage.set_text(&flg!("progress_scanning_general_file", file_number_tm(item)));
    taskbar_state.borrow().set_progress_state(TBPF_INDETERMINATE);
 }
+
 fn process_bar_broken_files(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -189,6 +198,7 @@ fn process_bar_broken_files(gui_data: &GuiData, item: &ProgressData) {
        _ => panic!(),
    }
 }
+
 fn process_bar_bad_extensions(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -209,6 +219,7 @@ fn process_bar_bad_extensions(gui_data: &GuiData, item: &ProgressData) {
        _ => panic!(),
    }
 }
+
 fn process_bar_duplicates(gui_data: &GuiData, item: &ProgressData) {
    let label_stage = gui_data.progress_window.label_stage.clone();
    let progress_bar_current_stage = gui_data.progress_window.progress_bar_current_stage.clone();
@ -289,6 +300,7 @@ fn common_set_data(item: &ProgressData, progress_bar_all_stages: &ProgressBar, p
 fn file_number_tm(item: &ProgressData) -> HashMap<&'static str, String> {
    generate_translation_hashmap(vec![("file_number", item.entries_checked.to_string())])
 }
+
 fn progress_ratio_tm(item: &ProgressData) -> HashMap<&'static str, String> {
    generate_translation_hashmap(vec![("file_checked", item.entries_checked.to_string()), ("all_files", item.entries_to_check.to_string())])
 }
--- a/czkawka_gui/src/help_functions.rs
+++ b/czkawka_gui/src/help_functions.rs
@ -377,6 +377,7 @@ pub fn get_notebook_enum_from_tree_view(tree_view: &TreeView) -> NotebookMainEnu
        }
    }
 }
+
 pub fn get_tree_view_name_from_notebook_enum(notebook_enum: NotebookMainEnum) -> &'static str {
    match notebook_enum {
        NotebookMainEnum::Duplicate => "tree_view_duplicate_finder",
@ -400,6 +401,7 @@ pub fn get_notebook_upper_enum_from_tree_view(tree_view: &TreeView) -> NotebookU
        e => panic!("{}", e),
    }
 }
+
 pub fn get_tree_view_name_from_notebook_upper_enum(notebook_upper_enum: NotebookUpperEnum) -> &'static str {
    match notebook_upper_enum {
        NotebookUpperEnum::IncludedDirectories => "tree_view_upper_included_directories",