Merge branch 'ofw_dev' into dev

applications/services/gui/modules/file_browser_worker.c

@@ -32,12 +32,12 @@ typedef enum {
     (WorkerEvtStop | WorkerEvtLoad | WorkerEvtFolderEnter | WorkerEvtFolderExit | \
      WorkerEvtFolderRefresh | WorkerEvtConfigChange)
 
-ARRAY_DEF(idx_last_array, int32_t)
+ARRAY_DEF(IdxLastArray, int32_t)
+ARRAY_DEF(ExtFilterArray, FuriString*, FURI_STRING_OPLIST)
 
 struct BrowserWorker {
     FuriThread* thread;
 
-    FuriString* filter_extension;
     FuriString* path_start;
     FuriString* path_current;
     FuriString* path_next;
@@ -46,7 +46,8 @@ struct BrowserWorker {
     uint32_t load_count;
     bool skip_assets;
     bool hide_dot_files;
-    idx_last_array_t idx_last;
+    IdxLastArray_t idx_last;
+    ExtFilterArray_t ext_filter;
 
     void* cb_ctx;
     BrowserWorkerFolderOpenCallback folder_cb;
@@ -78,6 +79,31 @@ static bool browser_path_trim(FuriString* path) {
     }
     return is_root;
 }
+static void browser_parse_ext_filter(ExtFilterArray_t ext_filter, const char* filter_str) {
+    if(!filter_str) {
+        return;
+    }
+
+    size_t len = strlen(filter_str);
+    if(len == 0) {
+        return;
+    }
+
+    size_t str_offset = 0;
+    FuriString* ext_temp = furi_string_alloc();
+    while(1) {
+        size_t ext_len = strcspn(&filter_str[str_offset], "|");
+
+        furi_string_set_strn(ext_temp, &filter_str[str_offset], ext_len);
+        ExtFilterArray_push_back(ext_filter, ext_temp);
+
+        str_offset += ext_len + 1;
+        if(str_offset >= len) {
+            break;
+        }
+    }
+    furi_string_free(ext_temp);
+}
 
 static bool browser_filter_by_name(BrowserWorker* browser, FuriString* name, bool is_folder) {
     // Skip dot files if enabled
@@ -96,12 +122,20 @@ static bool browser_filter_by_name(BrowserWorker* browser, FuriString* name, boo
         }
     } else {
         // Filter files by extension
-        if((furi_string_empty(browser->filter_extension)) ||
-           (furi_string_cmp_str(browser->filter_extension, "*") == 0)) {
+        if(ExtFilterArray_size(browser->ext_filter) == 0) {
             return true;
         }
-        if(furi_string_end_with(name, browser->filter_extension)) {
-            return true;
+
+        ExtFilterArray_it_t it;
+        for(ExtFilterArray_it(it, browser->ext_filter); !ExtFilterArray_end_p(it);
+            ExtFilterArray_next(it)) {
+            FuriString* ext = *ExtFilterArray_cref(it);
+            if((furi_string_empty(ext)) || (furi_string_cmp_str(ext, "*") == 0)) {
+                return true;
+            }
+            if(furi_string_end_with(name, ext)) {
+                return true;
+            }
         }
     }
     return false;
@@ -345,7 +379,7 @@ static int32_t browser_worker(void* context) {
             if(browser_path_is_file(browser->path_next)) {
                 path_extract_filename(browser->path_next, filename, false);
             }
-            idx_last_array_reset(browser->idx_last);
+            IdxLastArray_reset(browser->idx_last);
 
             furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderEnter);
         }
@@ -355,7 +389,7 @@ static int32_t browser_worker(void* context) {
             bool is_root = browser_folder_check_and_switch(path);
 
             // Push previous selected item index to history array
-            idx_last_array_push_back(browser->idx_last, browser->item_sel_idx);
+            IdxLastArray_push_back(browser->idx_last, browser->item_sel_idx);
 
             int32_t file_idx = 0;
             browser_folder_init(browser, path, filename, &items_cnt, &file_idx);
@@ -378,9 +412,9 @@ static int32_t browser_worker(void* context) {
 
             int32_t file_idx = 0;
             browser_folder_init(browser, path, filename, &items_cnt, &file_idx);
-            if(idx_last_array_size(browser->idx_last) > 0) {
+            if(IdxLastArray_size(browser->idx_last) > 0) {
                 // Pop previous selected item index from history array
-                idx_last_array_pop_back(&file_idx, browser->idx_last);
+                IdxLastArray_pop_back(&file_idx, browser->idx_last);
             }
             furi_string_set(browser->path_current, path);
             FURI_LOG_D(
@@ -437,14 +471,15 @@ static int32_t browser_worker(void* context) {
 BrowserWorker* file_browser_worker_alloc(
     FuriString* path,
     const char* base_path,
-    const char* filter_ext,
+    const char* ext_filter,
     bool skip_assets,
     bool hide_dot_files) {
     BrowserWorker* browser = malloc(sizeof(BrowserWorker));
 
-    idx_last_array_init(browser->idx_last);
+    IdxLastArray_init(browser->idx_last);
+    ExtFilterArray_init(browser->ext_filter);
 
-    browser->filter_extension = furi_string_alloc_set(filter_ext);
+    browser_parse_ext_filter(browser->ext_filter, ext_filter);
     browser->skip_assets = skip_assets;
     browser->hide_dot_files = hide_dot_files;
 
@@ -469,12 +504,12 @@ void file_browser_worker_free(BrowserWorker* browser) {
     furi_thread_join(browser->thread);
     furi_thread_free(browser->thread);
 
-    furi_string_free(browser->filter_extension);
     furi_string_free(browser->path_next);
     furi_string_free(browser->path_current);
     furi_string_free(browser->path_start);
 
-    idx_last_array_clear(browser->idx_last);
+    IdxLastArray_clear(browser->idx_last);
+    ExtFilterArray_clear(browser->ext_filter);
 
     free(browser);
 }
@@ -515,12 +550,12 @@ void file_browser_worker_set_long_load_callback(
 void file_browser_worker_set_config(
     BrowserWorker* browser,
     FuriString* path,
-    const char* filter_ext,
+    const char* ext_filter,
     bool skip_assets,
     bool hide_dot_files) {
     furi_assert(browser);
     furi_string_set(browser->path_next, path);
-    furi_string_set(browser->filter_extension, filter_ext);
+    browser_parse_ext_filter(browser->ext_filter, ext_filter);
     browser->skip_assets = skip_assets;
     browser->hide_dot_files = hide_dot_files;
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtConfigChange);