1
0
Fork 0
mirror of synced 2024-05-17 10:54:04 +12:00

Respect Clippy and minimal size value

This commit is contained in:
Rafał Mikrut 2020-09-22 20:35:37 +02:00
parent aba4e65fb8
commit ab71ee55ed
3 changed files with 40 additions and 19 deletions

View file

@ -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) - Selection of records(don't know how to do this)
- Popups - Popups
- Choosing directories(include, excluded) - Choosing directories(include, excluded)
- Popup with type type of deleted records
- Orbtk GUI
- Basic selecting included and excluded folders
-
## Usage and requirements ## Usage and requirements
Rustc 1.46 works fine(not sure about a minimal version) Rustc 1.46 works fine(not sure about a minimal version)

View file

@ -270,8 +270,8 @@ Author: Rafał Mikrut
<object class="GtkEntry" id="duplicate_minimal_size"> <object class="GtkEntry" id="duplicate_minimal_size">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="max_length">3</property> <property name="max_length">15</property>
<property name="text" translatable="yes">1</property> <property name="text" translatable="yes">1024</property>
<property name="caps_lock_warning">False</property> <property name="caps_lock_warning">False</property>
<property name="input_purpose">number</property> <property name="input_purpose">number</property>
</object> </object>

View file

@ -41,6 +41,7 @@ fn main() {
let shared_buttons: Rc<RefCell<_>> = Rc::new(RefCell::new(HashMap::<String, HashMap<String, bool>>::new())); let shared_buttons: Rc<RefCell<_>> = Rc::new(RefCell::new(HashMap::<String, HashMap<String, bool>>::new()));
shared_buttons.borrow_mut().clear(); shared_buttons.borrow_mut().clear();
// Show by default only search button
for i in ["duplicate", "empty_folder"].iter() { for i in ["duplicate", "empty_folder"].iter() {
let mut temp_hashmap: HashMap<String, bool> = Default::default(); let mut temp_hashmap: HashMap<String, bool> = Default::default();
for j in ["search", "stop", "resume", "pause", "select", "delete", "save"].iter() { 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); shared_buttons.borrow_mut().insert(i.to_string(), temp_hashmap);
} }
// Duplicate Finder state
// State of search results
let shared_duplication_state: Rc<RefCell<_>> = Rc::new(RefCell::new(DuplicateFinder::new())); let shared_duplication_state: Rc<RefCell<_>> = Rc::new(RefCell::new(DuplicateFinder::new()));
let shared_empty_folders_state: Rc<RefCell<_>> = Rc::new(RefCell::new(EmptyFolder::new())); let shared_empty_folders_state: Rc<RefCell<_>> = Rc::new(RefCell::new(EmptyFolder::new()));
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
// GUI Notepad Buttons // 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_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(); 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"); info_entry.set_text("Duplicated Files");
@ -104,17 +107,26 @@ fn main() {
buttons_save.hide(); buttons_save.hide();
buttons_delete.hide(); buttons_delete.hide();
} }
// Connecting events
{ {
// Connect Notebook Tabs // Connect Notebook Tabs
{ {
let shared_buttons = shared_buttons.clone(); let shared_buttons = shared_buttons.clone();
#[allow(clippy::redundant_clone)]
let buttons_search = buttons_search.clone(); let buttons_search = buttons_search.clone();
#[allow(clippy::redundant_clone)]
let buttons_stop = buttons_stop.clone(); let buttons_stop = buttons_stop.clone();
#[allow(clippy::redundant_clone)]
let buttons_resume = buttons_resume.clone(); let buttons_resume = buttons_resume.clone();
#[allow(clippy::redundant_clone)]
let buttons_pause = buttons_pause.clone(); let buttons_pause = buttons_pause.clone();
#[allow(clippy::redundant_clone)]
let buttons_select = buttons_select.clone(); let buttons_select = buttons_select.clone();
#[allow(clippy::redundant_clone)]
let buttons_delete = buttons_delete.clone(); let buttons_delete = buttons_delete.clone();
#[allow(clippy::redundant_clone)]
let buttons_save = buttons_save.clone(); let buttons_save = buttons_save.clone();
let notebook_chooser_tool_children_names = notebook_chooser_tool_children_names.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(); buttons_search.show();
} else { } else {
buttons_search.hide(); 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(); buttons_stop.show();
} else { } else {
buttons_stop.hide(); 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(); buttons_resume.show();
} else { } else {
buttons_resume.hide(); 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(); buttons_pause.show();
} else { } else {
buttons_pause.hide(); 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(); buttons_select.show();
} else { } else {
buttons_select.hide(); 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(); buttons_delete.show();
} else { } else {
buttons_delete.hide(); 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(); buttons_save.show();
} else { } else {
buttons_save.hide(); buttons_save.hide();
@ -182,14 +194,19 @@ fn main() {
// TODO Change to proper value // TODO Change to proper value
let mut df = DuplicateFinder::new(); let mut df = DuplicateFinder::new();
let check_method = duplicate::CheckingMethod::HASH; 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_include_directory("/home/rafal/Pulpit/AAA".to_owned());
df.set_excluded_items("".to_owned()); df.set_exclude_directory("/rafa/".to_owned());
df.set_allowed_extensions("".to_owned()); df.set_excluded_items("".to_owned());
df.set_min_file_size(1000); df.set_allowed_extensions("".to_owned());
df.set_check_method(check_method.clone()); df.set_min_file_size(match minimal_size_entry.get_text().as_str().parse::<u64>() {
df.set_delete_method(duplicate::DeleteMethod::None); Ok(t) => t,
df.find_duplicates(); 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 information = df.get_information();
let duplicates_number: usize; let duplicates_number: usize;