From ab71ee55edcc690279bf857132c9d61c88cd4d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Tue, 22 Sep 2020 20:35:37 +0200 Subject: [PATCH] Respect Clippy and minimal size value --- README.md | 4 +++ czkawka_gui/czkawka.glade | 4 +-- czkawka_gui/src/main.rs | 51 ++++++++++++++++++++++++++------------- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 32df704..e091620 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,10 @@ This is my first ever project in Rust so probably a lot of things are written in - Selection of records(don't know how to do this) - Popups - Choosing directories(include, excluded) + - Popup with type type of deleted records +- Orbtk GUI + - Basic selecting included and excluded folders + - ## Usage and requirements Rustc 1.46 works fine(not sure about a minimal version) diff --git a/czkawka_gui/czkawka.glade b/czkawka_gui/czkawka.glade index 0025a1a..1da1859 100644 --- a/czkawka_gui/czkawka.glade +++ b/czkawka_gui/czkawka.glade @@ -270,8 +270,8 @@ Author: Rafał Mikrut True True - 3 - 1 + 15 + 1024 False number diff --git a/czkawka_gui/src/main.rs b/czkawka_gui/src/main.rs index 05f380c..6c1c065 100644 --- a/czkawka_gui/src/main.rs +++ b/czkawka_gui/src/main.rs @@ -41,6 +41,7 @@ fn main() { let shared_buttons: Rc> = Rc::new(RefCell::new(HashMap::>::new())); shared_buttons.borrow_mut().clear(); + // Show by default only search button for i in ["duplicate", "empty_folder"].iter() { let mut temp_hashmap: HashMap = Default::default(); for j in ["search", "stop", "resume", "pause", "select", "delete", "save"].iter() { @@ -52,11 +53,13 @@ fn main() { } shared_buttons.borrow_mut().insert(i.to_string(), temp_hashmap); } - // Duplicate Finder state + + // State of search results let shared_duplication_state: Rc> = Rc::new(RefCell::new(DuplicateFinder::new())); let shared_empty_folders_state: Rc> = Rc::new(RefCell::new(EmptyFolder::new())); + //////////////////////////////////////////////////////////////////////////////////////////////// // GUI Notepad Buttons @@ -94,8 +97,8 @@ fn main() { let scrolled_window_duplicate_finder: gtk::ScrolledWindow = builder.get_object("scrolled_window_duplicate_finder").unwrap(); let scrolled_window_empty_folder_finder: gtk::ScrolledWindow = builder.get_object("scrolled_window_empty_folder_finder").unwrap(); + // Set starting information in bottom panel { - // Set starting information in bottom panel info_entry.set_text("Duplicated Files"); @@ -104,17 +107,26 @@ fn main() { buttons_save.hide(); buttons_delete.hide(); } + + // Connecting events { // Connect Notebook Tabs { let shared_buttons = shared_buttons.clone(); + #[allow(clippy::redundant_clone)] let buttons_search = buttons_search.clone(); + #[allow(clippy::redundant_clone)] let buttons_stop = buttons_stop.clone(); + #[allow(clippy::redundant_clone)] let buttons_resume = buttons_resume.clone(); + #[allow(clippy::redundant_clone)] let buttons_pause = buttons_pause.clone(); + #[allow(clippy::redundant_clone)] let buttons_select = buttons_select.clone(); + #[allow(clippy::redundant_clone)] let buttons_delete = buttons_delete.clone(); + #[allow(clippy::redundant_clone)] let buttons_save = buttons_save.clone(); let notebook_chooser_tool_children_names = notebook_chooser_tool_children_names.clone(); @@ -133,37 +145,37 @@ fn main() { } }; - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("search").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("search").unwrap() { buttons_search.show(); } else { buttons_search.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("stop").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("stop").unwrap() { buttons_stop.show(); } else { buttons_stop.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("resume").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("resume").unwrap() { buttons_resume.show(); } else { buttons_resume.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("pause").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("pause").unwrap() { buttons_pause.show(); } else { buttons_pause.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("select").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("select").unwrap() { buttons_select.show(); } else { buttons_select.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("delete").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("delete").unwrap() { buttons_delete.show(); } else { buttons_delete.hide(); } - if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("save").unwrap() == true { + if *shared_buttons.borrow_mut().get_mut(page).unwrap().get_mut("save").unwrap() { buttons_save.show(); } else { buttons_save.hide(); @@ -182,14 +194,19 @@ fn main() { // TODO Change to proper value let mut df = DuplicateFinder::new(); let check_method = duplicate::CheckingMethod::HASH; - df.set_include_directory("/home/rafal/Pulpit/AAA".to_owned()); - df.set_exclude_directory("/rafa/".to_owned()); - df.set_excluded_items("".to_owned()); - df.set_allowed_extensions("".to_owned()); - df.set_min_file_size(1000); - df.set_check_method(check_method.clone()); - df.set_delete_method(duplicate::DeleteMethod::None); - df.find_duplicates(); + { + df.set_include_directory("/home/rafal/Pulpit/AAA".to_owned()); + df.set_exclude_directory("/rafa/".to_owned()); + df.set_excluded_items("".to_owned()); + df.set_allowed_extensions("".to_owned()); + df.set_min_file_size(match minimal_size_entry.get_text().as_str().parse::() { + Ok(t) => t, + Err(_) => 1024 // By default + }); + df.set_check_method(check_method.clone()); + df.set_delete_method(duplicate::DeleteMethod::None); + df.find_duplicates(); + } let information = df.get_information(); let duplicates_number: usize;