From 1fab6080b78a4133634005484fec535695bed37b Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 3 Jul 2023 23:05:33 +0200
Subject: [PATCH] Dir walk add recurse filter support

---
 firmware/targets/f7/api_symbols.csv |  1 +
 lib/toolbox/dir_walk.c              | 38 ++++++++++++++++++++++++-----
 lib/toolbox/dir_walk.h              | 10 +++++++-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index dc24b0d91..88d52d6df 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -799,6 +799,7 @@ Function,+,dir_walk_get_error,FS_Error,DirWalk*
 Function,+,dir_walk_open,_Bool,"DirWalk*, const char*"
 Function,+,dir_walk_read,DirWalkResult,"DirWalk*, FuriString*, FileInfo*"
 Function,+,dir_walk_set_filter_cb,void,"DirWalk*, DirWalkFilterCb, void*"
+Function,+,dir_walk_set_recurse_filter,void,"DirWalk*, const char**, size_t"
 Function,+,dir_walk_set_recursive,void,"DirWalk*, _Bool"
 Function,-,div,div_t,"int, int"
 Function,+,dolphin_deed,void,DolphinDeed
diff --git a/lib/toolbox/dir_walk.c b/lib/toolbox/dir_walk.c
index 003863588..e309e1d90 100644
--- a/lib/toolbox/dir_walk.c
+++ b/lib/toolbox/dir_walk.c
@@ -13,6 +13,8 @@ struct DirWalk {
     bool recursive;
     DirWalkFilterCb filter_cb;
     void* filter_context;
+    const char** recurse_filter;
+    size_t recurse_filter_count;
 };
 
 DirWalk* dir_walk_alloc(Storage* storage) {
@@ -22,6 +24,8 @@ DirWalk* dir_walk_alloc(Storage* storage) {
     DirIndexList_init(dir_walk->index_list);
     dir_walk->recursive = true;
     dir_walk->filter_cb = NULL;
+    dir_walk->recurse_filter = NULL;
+    dir_walk->recurse_filter_count = 0;
     return dir_walk;
 }
 
@@ -41,6 +45,11 @@ void dir_walk_set_filter_cb(DirWalk* dir_walk, DirWalkFilterCb cb, void* context
     dir_walk->filter_context = context;
 }
 
+void dir_walk_set_recurse_filter(DirWalk* dir_walk, const char** array, size_t count) {
+    dir_walk->recurse_filter = array;
+    dir_walk->recurse_filter_count = count;
+}
+
 bool dir_walk_open(DirWalk* dir_walk, const char* path) {
     furi_string_set(dir_walk->path, path);
     dir_walk->current_index = 0;
@@ -86,13 +95,30 @@ static DirWalkResult
             }
 
             if(file_info_is_dir(&info) && dir_walk->recursive) {
-                // step into
-                DirIndexList_push_back(dir_walk->index_list, dir_walk->current_index);
-                dir_walk->current_index = 0;
-                storage_dir_close(dir_walk->file);
-
                 furi_string_cat_printf(dir_walk->path, "/%s", name);
-                storage_dir_open(dir_walk->file, furi_string_get_cstr(dir_walk->path));
+
+                bool filter = false;
+                for(size_t i = 0; i < dir_walk->recurse_filter_count; i++) {
+                    if(furi_string_start_with_str(dir_walk->path, dir_walk->recurse_filter[i])) {
+                        filter = true;
+                        break;
+                    }
+                }
+
+                if(filter) {
+                    // reset path
+                    size_t last_char = furi_string_search_rchar(dir_walk->path, '/');
+                    if(last_char != FURI_STRING_FAILURE) {
+                        furi_string_left(dir_walk->path, last_char);
+                    }
+
+                } else {
+                    // step into
+                    DirIndexList_push_back(dir_walk->index_list, dir_walk->current_index);
+                    dir_walk->current_index = 0;
+                    storage_dir_close(dir_walk->file);
+                    storage_dir_open(dir_walk->file, furi_string_get_cstr(dir_walk->path));
+                }
             }
         } else if(storage_file_get_error(dir_walk->file) == FSE_NOT_EXIST) {
             if(DirIndexList_size(dir_walk->index_list) == 0) {
diff --git a/lib/toolbox/dir_walk.h b/lib/toolbox/dir_walk.h
index 535237fc6..67c364b47 100644
--- a/lib/toolbox/dir_walk.h
+++ b/lib/toolbox/dir_walk.h
@@ -43,6 +43,14 @@ void dir_walk_set_recursive(DirWalk* dir_walk, bool recursive);
  */
 void dir_walk_set_filter_cb(DirWalk* dir_walk, DirWalkFilterCb cb, void* context);
 
+/**
+ * Set recurse filtered paths
+ * @param dir_walk 
+ * @param array 
+ * @param count 
+ */
+void dir_walk_set_recurse_filter(DirWalk* dir_walk, const char** array, size_t count);
+
 /**
  * Open directory 
  * @param dir_walk 
@@ -76,4 +84,4 @@ void dir_walk_close(DirWalk* dir_walk);
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif