Add support for delete button

qarmin · qarmin · commit 58c6d031cbd1 · 2020-12-29T19:14:26.000+01:00
diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs
@@ -748,6 +748,17 @@ fn load_hashes_from_file(text_messages: &mut Messages) -> Option<HashMap<String,
                     hash[i] = uuu[4 + i].parse::<u8>().unwrap();
                 }
 
+                #[cfg(debug_assertions)]
+                {
+                    let mut have_at_least: u8 = 0;
+                    for i in hash.iter() {
+                        if *i == 0 {
+                            have_at_least += 1;
+                        }
+                    }
+                    assert!(have_at_least != hash.len() as u8);
+                }
+
                 hashmap_loaded_entries.insert(
                     uuu[0].to_string(),
                     FileEntry {
diff --git a/czkawka_gui/src/connect_button_delete.rs b/czkawka_gui/src/connect_button_delete.rs
@@ -54,44 +54,44 @@ pub fn connect_button_delete(gui_data: &GuiData) {
 
         match notebook_main_children_names.get(notebook_main.get_current_page().unwrap() as usize).unwrap().as_str() {
             "notebook_main_duplicate_finder_label" => {
-                tree_remove(scrolled_window_duplicate_finder.clone(), ColumnsDuplicates::Name as i32, ColumnsDuplicates::Path as i32, ColumnsDuplicates::Color as i32, &gui_data);
+                tree_remove(&scrolled_window_duplicate_finder.clone(), ColumnsDuplicates::Name as i32, ColumnsDuplicates::Path as i32, ColumnsDuplicates::Color as i32, &gui_data);
             }
             "scrolled_window_main_empty_folder_finder" => {
-                empty_folder_remover(scrolled_window_main_empty_folder_finder.clone(), ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, &gui_data);
+                empty_folder_remover(&scrolled_window_main_empty_folder_finder.clone(), ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, &gui_data);
             }
             "scrolled_window_main_empty_files_finder" => {
-                basic_remove(scrolled_window_main_empty_files_finder.clone(), ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, &gui_data);
+                basic_remove(&scrolled_window_main_empty_files_finder.clone(), ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, &gui_data);
             }
             "scrolled_window_main_temporary_files_finder" => {
-                basic_remove(scrolled_window_main_temporary_files_finder.clone(), ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, &gui_data);
+                basic_remove(&scrolled_window_main_temporary_files_finder.clone(), ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, &gui_data);
             }
             "notebook_big_main_file_finder" => {
-                basic_remove(scrolled_window_big_files_finder.clone(), ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, &gui_data);
+                basic_remove(&scrolled_window_big_files_finder.clone(), ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, &gui_data);
             }
             "notebook_main_similar_images_finder_label" => {
                 tree_remove(
-                    scrolled_window_similar_images_finder.clone(),
+                    &scrolled_window_similar_images_finder.clone(),
                     ColumnsSimilarImages::Name as i32,
                     ColumnsSimilarImages::Path as i32,
                     ColumnsSimilarImages::Color as i32,
                     &gui_data,
                 );
             }
             "notebook_main_zeroed_files_finder" => {
-                basic_remove(scrolled_window_zeroed_files_finder.clone(), ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, &gui_data);
+                basic_remove(&scrolled_window_zeroed_files_finder.clone(), ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, &gui_data);
             }
             "notebook_main_same_music_finder" => {
-                tree_remove(scrolled_window_same_music_finder.clone(), ColumnsSameMusic::Name as i32, ColumnsSameMusic::Path as i32, ColumnsSameMusic::Color as i32, &gui_data);
+                tree_remove(&scrolled_window_same_music_finder.clone(), ColumnsSameMusic::Name as i32, ColumnsSameMusic::Path as i32, ColumnsSameMusic::Color as i32, &gui_data);
             }
             "scrolled_window_invalid_symlinks" => {
-                basic_remove(scrolled_window_invalid_symlinks.clone(), ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, &gui_data);
+                basic_remove(&scrolled_window_invalid_symlinks.clone(), ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, &gui_data);
             }
             e => panic!("Not existent {}", e),
         }
     });
 }
 
-fn empty_folder_remover(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
+pub fn empty_folder_remover(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
     let text_view_errors = gui_data.text_view_errors.clone();
 
     let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
@@ -177,7 +177,7 @@ fn empty_folder_remover(scrolled_window: gtk::ScrolledWindow, column_file_name:
     selection.unselect_all();
 }
 
-fn basic_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
+pub fn basic_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {
     let text_view_errors = gui_data.text_view_errors.clone();
 
     let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
@@ -212,7 +212,7 @@ fn basic_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, col
 
 // Remove all occurrences - remove every element which have same path and name as even non selected ones
 //
-fn tree_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, column_color: i32, gui_data: &GuiData) {
+pub fn tree_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, column_color: i32, gui_data: &GuiData) {
     let text_view_errors = gui_data.text_view_errors.clone();
 
     let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
diff --git a/czkawka_gui/src/connect_selection_of_directories.rs b/czkawka_gui/src/connect_selection_of_directories.rs
@@ -1,5 +1,6 @@
 extern crate gtk;
 use crate::gui_data::GuiData;
+use crate::help_functions::{get_list_store, get_tree_view};
 use gtk::prelude::*;
 
 pub fn connect_selection_of_directories(gui_data: &GuiData) {
@@ -69,35 +70,31 @@ pub fn connect_selection_of_directories(gui_data: &GuiData) {
         let buttons_remove_excluded_directory = gui_data.buttons_remove_excluded_directory.clone();
         let scrolled_window_excluded_directories = gui_data.scrolled_window_excluded_directories.clone();
         buttons_remove_excluded_directory.connect_clicked(move |_| {
-            let tree_view = scrolled_window_excluded_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
-            let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
+            let tree_view = get_tree_view(&scrolled_window_excluded_directories);
+            let list_store = get_list_store(&scrolled_window_excluded_directories);
             let selection = tree_view.get_selection();
 
-            let (_, tree_iter) = match selection.get_selected() {
-                Some(t) => t,
-                None => {
-                    return;
-                }
-            };
-            list_store.remove(&tree_iter);
+            let (vec_tree_path, _tree_model) = selection.get_selected_rows();
+
+            for tree_path in vec_tree_path.iter().rev() {
+                list_store.remove(&list_store.get_iter(tree_path).unwrap());
+            }
         });
     }
     // Remove Included Folder
     {
         let buttons_remove_included_directory = gui_data.buttons_remove_included_directory.clone();
         let scrolled_window_included_directories = gui_data.scrolled_window_included_directories.clone();
         buttons_remove_included_directory.connect_clicked(move |_| {
-            let tree_view = scrolled_window_included_directories.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();
-            let list_store = tree_view.get_model().unwrap().downcast::<gtk::ListStore>().unwrap();
+            let tree_view = get_tree_view(&scrolled_window_included_directories);
+            let list_store = get_list_store(&scrolled_window_included_directories);
             let selection = tree_view.get_selection();
 
-            let (_, tree_iter) = match selection.get_selected() {
-                Some(t) => t,
-                None => {
-                    return;
-                }
-            };
-            list_store.remove(&tree_iter);
+            let (vec_tree_path, _tree_model) = selection.get_selected_rows();
+
+            for tree_path in vec_tree_path.iter().rev() {
+                list_store.remove(&list_store.get_iter(tree_path).unwrap());
+            }
         });
     }
 }
diff --git a/czkawka_gui/src/initialize_gui.rs b/czkawka_gui/src/initialize_gui.rs

Original file line number	Diff line number	Diff line change
`@@ -54,44 +54,44 @@ pub fn connect_button_delete(gui_data: &GuiData) {`
`54`	`54`
`55`	`55`	`match notebook_main_children_names.get(notebook_main.get_current_page().unwrap() as usize).unwrap().as_str() {`
`56`	`56`	`"notebook_main_duplicate_finder_label" => {`
`57`		`- tree_remove(scrolled_window_duplicate_finder.clone(), ColumnsDuplicates::Name as i32, ColumnsDuplicates::Path as i32, ColumnsDuplicates::Color as i32, &gui_data);`
	`57`	`+ tree_remove(&scrolled_window_duplicate_finder.clone(), ColumnsDuplicates::Name as i32, ColumnsDuplicates::Path as i32, ColumnsDuplicates::Color as i32, &gui_data);`
`58`	`58`	`}`
`59`	`59`	`"scrolled_window_main_empty_folder_finder" => {`
`60`		`- empty_folder_remover(scrolled_window_main_empty_folder_finder.clone(), ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, &gui_data);`
	`60`	`+ empty_folder_remover(&scrolled_window_main_empty_folder_finder.clone(), ColumnsEmptyFolders::Name as i32, ColumnsEmptyFolders::Path as i32, &gui_data);`
`61`	`61`	`}`
`62`	`62`	`"scrolled_window_main_empty_files_finder" => {`
`63`		`- basic_remove(scrolled_window_main_empty_files_finder.clone(), ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, &gui_data);`
	`63`	`+ basic_remove(&scrolled_window_main_empty_files_finder.clone(), ColumnsEmptyFiles::Name as i32, ColumnsEmptyFiles::Path as i32, &gui_data);`
`64`	`64`	`}`
`65`	`65`	`"scrolled_window_main_temporary_files_finder" => {`
`66`		`- basic_remove(scrolled_window_main_temporary_files_finder.clone(), ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, &gui_data);`
	`66`	`+ basic_remove(&scrolled_window_main_temporary_files_finder.clone(), ColumnsTemporaryFiles::Name as i32, ColumnsTemporaryFiles::Path as i32, &gui_data);`
`67`	`67`	`}`
`68`	`68`	`"notebook_big_main_file_finder" => {`
`69`		`- basic_remove(scrolled_window_big_files_finder.clone(), ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, &gui_data);`
	`69`	`+ basic_remove(&scrolled_window_big_files_finder.clone(), ColumnsBigFiles::Name as i32, ColumnsBigFiles::Path as i32, &gui_data);`
`70`	`70`	`}`
`71`	`71`	`"notebook_main_similar_images_finder_label" => {`
`72`	`72`	`tree_remove(`
`73`		`- scrolled_window_similar_images_finder.clone(),`
	`73`	`+ &scrolled_window_similar_images_finder.clone(),`
`74`	`74`	`ColumnsSimilarImages::Name as i32,`
`75`	`75`	`ColumnsSimilarImages::Path as i32,`
`76`	`76`	`ColumnsSimilarImages::Color as i32,`
`77`	`77`	`&gui_data,`
`78`	`78`	`);`
`79`	`79`	`}`
`80`	`80`	`"notebook_main_zeroed_files_finder" => {`
`81`		`- basic_remove(scrolled_window_zeroed_files_finder.clone(), ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, &gui_data);`
	`81`	`+ basic_remove(&scrolled_window_zeroed_files_finder.clone(), ColumnsZeroedFiles::Name as i32, ColumnsZeroedFiles::Path as i32, &gui_data);`
`82`	`82`	`}`
`83`	`83`	`"notebook_main_same_music_finder" => {`
`84`		`- tree_remove(scrolled_window_same_music_finder.clone(), ColumnsSameMusic::Name as i32, ColumnsSameMusic::Path as i32, ColumnsSameMusic::Color as i32, &gui_data);`
	`84`	`+ tree_remove(&scrolled_window_same_music_finder.clone(), ColumnsSameMusic::Name as i32, ColumnsSameMusic::Path as i32, ColumnsSameMusic::Color as i32, &gui_data);`
`85`	`85`	`}`
`86`	`86`	`"scrolled_window_invalid_symlinks" => {`
`87`		`- basic_remove(scrolled_window_invalid_symlinks.clone(), ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, &gui_data);`
	`87`	`+ basic_remove(&scrolled_window_invalid_symlinks.clone(), ColumnsInvalidSymlinks::Name as i32, ColumnsInvalidSymlinks::Path as i32, &gui_data);`
`88`	`88`	`}`
`89`	`89`	`e => panic!("Not existent {}", e),`
`90`	`90`	`}`
`91`	`91`	`});`
`92`	`92`	`}`
`93`	`93`
`94`		`-fn empty_folder_remover(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {`
	`94`	`+pub fn empty_folder_remover(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {`
`95`	`95`	`let text_view_errors = gui_data.text_view_errors.clone();`
`96`	`96`
`97`	`97`	`let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();`
`@@ -177,7 +177,7 @@ fn empty_folder_remover(scrolled_window: gtk::ScrolledWindow, column_file_name:`
`177`	`177`	`selection.unselect_all();`
`178`	`178`	`}`
`179`	`179`
`180`		`-fn basic_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {`
	`180`	`+pub fn basic_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, gui_data: &GuiData) {`
`181`	`181`	`let text_view_errors = gui_data.text_view_errors.clone();`
`182`	`182`
`183`	`183`	`let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();`
`@@ -212,7 +212,7 @@ fn basic_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, col`
`212`	`212`
`213`	`213`	`// Remove all occurrences - remove every element which have same path and name as even non selected ones`
`214`	`214`	`//`
`215`		`-fn tree_remove(scrolled_window: gtk::ScrolledWindow, column_file_name: i32, column_path: i32, column_color: i32, gui_data: &GuiData) {`
	`215`	`+pub fn tree_remove(scrolled_window: &gtk::ScrolledWindow, column_file_name: i32, column_path: i32, column_color: i32, gui_data: &GuiData) {`
`216`	`216`	`let text_view_errors = gui_data.text_view_errors.clone();`
`217`	`217`
`218`	`218`	`let tree_view = scrolled_window.get_children().get(0).unwrap().clone().downcast::<gtk::TreeView>().unwrap();`