MNTM for 956

applications/main/archive/helpers/archive_browser.c

@@ -86,12 +86,28 @@ static void
                                 break;
                             }
                         }
+                        furi_string_free(selected);
                     }
 
                     if(model->item_idx < 0) {
                         model->item_idx = 0;
                     }
                 }
+
+                // Files lose their selected stateafter re entering, so we need to restore them
+                if(model->select_mode && model->selected_count > 0) {
+                    for(size_t i = 0; i < files_array_size(model->files); i++) {
+                        ArchiveFile_t* file = files_array_get(model->files, i);
+                        file->selected = false;
+                        for(size_t j = 0; j < model->selected_count; j++) {
+                            if(furi_string_cmp(model->selected_files[j], file->path) == 0) {
+                                file->selected = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
                 if(archive_is_file_list_load_required(model)) {
                     model->list_loading = true;
                     load_again = true;
@@ -141,6 +157,28 @@ void archive_file_browser_set_path(
     browser->override_home_path = override_home_path;
 }
 
+bool archive_is_parent_or_identical(const char* path_a, const char* path_b) {
+    size_t len_a = strlen(path_a);
+    return (
+        strncmp(path_b, path_a, len_a) == 0 && (path_b[len_a] == '/' || path_b[len_a] == '\0'));
+}
+
+bool archive_is_nested_path(const char* dst_path, char** clipboard_paths, size_t clipboard_count) {
+    if(!dst_path || !clipboard_paths) {
+        return false;
+    }
+
+    for(size_t i = 0; i < clipboard_count; i++) {
+        if(!clipboard_paths[i]) continue;
+        const char* src_path = clipboard_paths[i];
+        if(archive_is_parent_or_identical(src_path, dst_path) && strcmp(src_path, dst_path) != 0) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool archive_is_item_in_array(ArchiveBrowserViewModel* model, uint32_t idx) {
     size_t array_size = files_array_size(model->files);
 
@@ -695,3 +733,33 @@ void archive_refresh_dir(ArchiveBrowserView* browser) {
     file_browser_worker_folder_refresh_sel(browser->worker, furi_string_get_cstr(str));
     furi_string_free(str);
 }
+
+void archive_clear_selection(ArchiveBrowserViewModel* model) {
+    model->select_mode = false;
+    for(size_t i = 0; i < model->selected_count; i++) {
+        furi_string_free(model->selected_files[i]);
+    }
+    free(model->selected_files);
+    model->selected_files = NULL;
+    model->selected_count = 0;
+
+    for(size_t i = 0; i < files_array_size(model->files); i++) {
+        ArchiveFile_t* file = files_array_get(model->files, i);
+        file->selected = false;
+    }
+}
+
+void archive_deselect_children(ArchiveBrowserViewModel* model, const char* parent) {
+    size_t write_idx = 0;
+    for(size_t i = 0; i < model->selected_count; i++) {
+        if(!furi_string_start_with(model->selected_files[i], parent)) {
+            if(write_idx != i) {
+                model->selected_files[write_idx] = model->selected_files[i];
+            }
+            write_idx++;
+        } else {
+            furi_string_free(model->selected_files[i]);
+        }
+    }
+    model->selected_count = write_idx;
+}

applications/main/archive/helpers/archive_browser.h

@@ -91,6 +91,8 @@ void archive_file_browser_set_path(
     bool skip_assets,
     bool hide_dot_files,
     const char* override_home_path);
+bool archive_is_parent_or_identical(const char* path_a, const char* path_b);
+bool archive_is_nested_path(const char* dst_path, char** clipboard_paths, size_t clipboard_count);
 bool archive_is_item_in_array(ArchiveBrowserViewModel* model, uint32_t idx);
 bool archive_is_file_list_load_required(ArchiveBrowserViewModel* model);
 void archive_update_offset(ArchiveBrowserView* browser);
@@ -120,3 +122,6 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key);
 void archive_enter_dir(ArchiveBrowserView* browser, FuriString* name);
 void archive_leave_dir(ArchiveBrowserView* browser);
 void archive_refresh_dir(ArchiveBrowserView* browser);
+
+void archive_clear_selection(ArchiveBrowserViewModel* model);
+void archive_deselect_children(ArchiveBrowserViewModel* model, const char* parent);

applications/main/archive/helpers/archive_files.h

@@ -44,6 +44,7 @@ typedef struct {
     FuriString* custom_name;
     bool fav;
     bool is_app;
+    bool selected;
 } ArchiveFile_t;
 
 static void ArchiveFile_t_init(ArchiveFile_t* obj) {
@@ -53,6 +54,7 @@ static void ArchiveFile_t_init(ArchiveFile_t* obj) {
     obj->custom_name = furi_string_alloc();
     obj->fav = false;
     obj->is_app = false;
+    obj->selected = false;
 }
 
 static void ArchiveFile_t_init_set(ArchiveFile_t* obj, const ArchiveFile_t* src) {
@@ -67,6 +69,7 @@ static void ArchiveFile_t_init_set(ArchiveFile_t* obj, const ArchiveFile_t* src)
     obj->custom_name = furi_string_alloc_set(src->custom_name);
     obj->fav = src->fav;
     obj->is_app = src->is_app;
+    obj->selected = false;
 }
 
 static void ArchiveFile_t_set(ArchiveFile_t* obj, const ArchiveFile_t* src) {
@@ -81,6 +84,7 @@ static void ArchiveFile_t_set(ArchiveFile_t* obj, const ArchiveFile_t* src) {
     furi_string_set(obj->custom_name, src->custom_name);
     obj->fav = src->fav;
     obj->is_app = src->is_app;
+    obj->selected = false;
 }
 
 static void ArchiveFile_t_clear(ArchiveFile_t* obj) {