Delete

Author: qarmin

czkawka_core/src/tools/similar_videos/core.rs

@@ -124,7 +124,7 @@ impl SimilarVideos {
             CurrentStage::SimilarVideosCalculatingHashes,
             non_cached_files_to_check.len(),
             self.get_test_type(),
-            non_cached_files_to_check.values().map(|e| e.size).sum(),
+            0, // non_cached_files_to_check.values().map(|e| e.size).sum(), // Looks, that at least for now, there is no big difference between checking big and small files, so at least for now, only tracking number of files is enough
         );
 
         let mut vec_file_entry: Vec<VideosEntry> = non_cached_files_to_check

krokiet/i18n/en/krokiet.ftl

@@ -22,9 +22,9 @@ rust_checked_tags = Checked tags of { $items_stats }
 rust_checked_content = Checked content of { $items_stats } ({ $size_stats })
 rust_compared_tags = Compared tags of { $items_stats }
 rust_compared_content = Compared content of { $items_stats }
-rust_hashed_images = Hashed of { $items_stats } image ({ $size_stats })
-rust_compared_image_hashes = Compared { $items_stats } image hash
-rust_hashed_videos = Hashed of { $items_stats } video
+rust_hashed_images = Hashed { $items_stats } images ({ $size_stats })
+rust_compared_image_hashes = Compared { $items_stats } image hashes
+rust_hashed_videos = Hashed { $items_stats } videos
 rust_checked_files = Checked { $items_stats } file ({ $size_stats })
 rust_checked_files_bad_extensions = Checked { $items_stats } file
 rust_analyzed_partial_hash = Analyzed partial hash of { $items_stats } files ({ $size_stats })
@@ -43,7 +43,7 @@ rust_found_temporary_files = Found { $items_found } temporary files
 rust_no_file_type_selected = Cannot find broken files without any file type selected.
 rust_found_broken_files = Found { $items_found } broken files
 rust_found_bad_extensions = Found { $items_found } files with bad extensions
-rust_found_duplicate_files = Found { $items_found } similar duplicate files
+rust_found_duplicate_files = Found { $items_found } duplicate files
 rust_found_big_files = Found { $items_found } big files
 rust_cannot_load_preset = Cannot change and load preset { $preset_idx } - reason { $reason }, using default settings instead
 rust_saved_preset = Saved preset { $preset_idx }
@@ -63,8 +63,10 @@ rust_no_files_deleted = Not selected any files/folders to delete
 rust_no_files_renamed = Not selected any files/folders to rename
 rust_no_files_moved = Not selected any files/folders to move
 
-rust_delete_confirmation = Are you sure you want to { $items } the selected items?
-
+rust_delete_confirmation = Are you sure you want the selected items?
+rust_delete_confirmation_number_simple = { $items } items is selected.
+rust_delete_confirmation_number_groups = { $items } items in { $groups } groups are selected.
+rust_delete_confirmation_selected_all_in_group = In { $groups } groups, there are all items selected.
 
 # Slint translations, but in arrays
 

krokiet/src/connect_delete.rs

@@ -7,9 +7,10 @@ use crossbeam_channel::Sender;
 use czkawka_core::common::progress_data::ProgressData;
 use slint::{ComponentHandle, Weak};
 
+use crate::model_operations::get_checked_info_from_app;
 use crate::model_operations::model_processor::{MessageType, ModelProcessor};
 use crate::simpler_model::{SimplerMainListModel, ToSimplerVec};
-use crate::{ActiveTab, Callabler, GuiState, MainWindow, Settings};
+use crate::{ActiveTab, Callabler, GuiState, MainWindow, Settings, Translations, flk};
 
 pub(crate) fn connect_delete_button(app: &MainWindow, progress_sender: Sender<ProgressData>, stop_flag: Arc<AtomicBool>) {
     let a = app.as_weak();
@@ -26,13 +27,41 @@ pub(crate) fn connect_delete_button(app: &MainWindow, progress_sender: Sender<Pr
         processor.delete_selected_items(settings.get_move_to_trash(), progress_sender, weak_app, stop_flag);
     });
 
-    // let a = app.as_weak();
-    // app.on_delete_popup_dialog_show_requested(move|| {
-    //    let app = a.upgrade().expect("Failed to upgrade app :(");
-    //     let settings = app.global::<Settings>();
-    //     let active_tab = app.global::<GuiState>().get_active_tab();
-    //     let model = active_tab.get_tool_model(&app);
-    // });
+    let a = app.as_weak();
+    app.on_delete_popup_dialog_show_requested(move || {
+        let app = a.upgrade().expect("Failed to upgrade app :(");
+        let translation = app.global::<Translations>();
+        let res = get_checked_info_from_app(&app);
+        // TODO - items formatting should be done in GUI, not here
+        let mut base = flk!("rust_delete_confirmation");
+        if let Some(group_res) = res.groups_with_checked_items {
+            base.push_str(
+                format!(
+                    "\n{}",
+                    flk!(
+                        "rust_delete_confirmation_number_groups",
+                        items = res.checked_items_number,
+                        groups = group_res.groups_with_checked_items
+                    )
+                )
+                .as_str(),
+            );
+            if group_res.number_of_groups_with_all_items_checked > 0 {
+                base.push_str(
+                    format!(
+                        "\n{}",
+                        flk!("rust_delete_confirmation_selected_all_in_group", groups = group_res.number_of_groups_with_all_items_checked)
+                    )
+                    .as_str(),
+                );
+            }
+        } else {
+            base.push_str(format!("\n{}", flk!("rust_delete_confirmation_number_simple", items = res.checked_items_number)).as_str());
+        }
+        translation.set_delete_confirmation_text(base.into());
+
+        app.invoke_delete_popup_dialog_configured();
+    });
 }
 
 impl ModelProcessor {

krokiet/src/connect_translation.rs

@@ -304,7 +304,7 @@ fn translate_items(app: &MainWindow) {
     translation.set_popup_move_copy_checkbox_text(flk!("popup_move_copy_checkbox").into());
     translation.set_popup_move_preserve_folder_checkbox_text(flk!("popup_move_preserve_folder_checkbox").into());
     translation.set_delete_text(flk!("delete").into());
-    translation.set_delete_confirmation_text(flk!("rust_delete_confirmation", items = 0).into());
+    translation.set_delete_confirmation_text(flk!("rust_delete_confirmation").into());
     translation.set_stopping_scan_text(flk!("stopping_scan").into());
     translation.set_searching_text(flk!("searching").into());
     translation.set_subsettings_videos_crop_detect_text(flk!("subsettings_videos_crop_detect").into());

krokiet/src/model_operations/mod.rs

@@ -131,6 +131,8 @@ fn get_checked_group_info_from_model(model: &ModelRc<MainListModel>) -> CheckedI
             if group_with_selected_item {
                 groups_with_checked_items += 1;
             }
+            current_group_all_checked = true;
+            group_with_selected_item = false;
         } else {
             if item.checked {
                 checked_items_number += 1;
@@ -292,5 +294,22 @@ mod tests {
         assert_eq!(result.checked_items_number, 3);
         assert_eq!(groups_info.groups_with_checked_items, 1);
         assert_eq!(groups_info.number_of_groups_with_all_items_checked, 1);
+
+        let mut items = get_model_vec(8);
+        items[0].header_row = true;
+        items[1].checked = true;
+        items[2].checked = true;
+        items[3].checked = false;
+        items[4].header_row = true;
+        items[5].checked = true;
+        items[6].header_row = true;
+        items[7].checked = false;
+
+        let model = ModelRc::new(VecModel::from(items));
+        let result = get_checked_group_info_from_model(&model);
+        let groups_info = result.groups_with_checked_items.unwrap();
+        assert_eq!(result.checked_items_number, 3);
+        assert_eq!(groups_info.groups_with_checked_items, 2);
+        assert_eq!(groups_info.number_of_groups_with_all_items_checked, 1);
     }
 }