worker tune per Nother request

firmware/application/file.cpp

@@ -487,6 +487,19 @@ path path::extract_first_level() const {  // /abc/def/ghi/hjk.q to /abc
     }
 }
 
+path path::absolute_trimmed_path() const {
+    basic_string<char16_t> path_str = _s.substr();
+
+    if (path_str.front() == '/') {
+        path_str.erase(0, 1);
+    }
+    if (path_str.back() == '/') {
+        path_str.pop_back();
+    }
+
+    return path{path_str};
+}
+
 path path::stem() const {
     const auto t = filename().native();
     const auto index = t.find_last_of(u'.');

firmware/application/file.hpp

@@ -119,6 +119,7 @@ struct path {
     path filename() const;
     path remove_first_level() const;
     path extract_first_level() const;
+    path absolute_trimmed_path() const;
     path stem() const;
 
     bool empty() const {

firmware/application/file_path.cpp

@@ -107,3 +107,20 @@ const std::filesystem::path wav_dir_user = u"/WAV";
 const std::filesystem::path wav_dir_resources = u"SYS/WAV";
 
 const std::filesystem::path whipcalc_dir = u"SYS/WHIPCALC";
+
+// vector
+
+const std::vector<std::string> allow_dirs = {
+    "ADSB",
+    "AIS",
+    "BLETX",
+    "GPS",
+    "LOOKINGGLASS",
+    "PLAYLIST",
+    "REMOTES",
+    "SPLASH",
+    "SSTV",
+    "WAV",
+    "WHIPCALC",
+    "SAMPLES",
+};

firmware/application/file_path.hpp

@@ -103,4 +103,6 @@ extern const std::filesystem::path wav_dir_resources;
 
 extern const std::filesystem::path whipcalc_dir;
 
+extern const std::vector<std::string> allow_dirs;
+
 #endif /* __FILE_PATH_H__ */

firmware/application/ui_navigation.cpp

@@ -599,27 +599,42 @@ void SystemStatusView::new_sdcard_structure_checker() {
 }
 
 void SystemStatusView::new_sdcard_structure_worker() {
+    ////
+    ui::Painter painter{};
+    std::string debug_dir = "DEBUG";
+    std::filesystem::path filename{};
+    File zxkmm_dump_file{};
+    // create new dump file name and DEBUG directory
+    ensure_directory(debug_dir);
+    filename = next_filename_matching_pattern(debug_dir + "/ZXKMM_DUMP_????.TXT");
+    if (filename.empty()) {
+        painter.draw_string({0, 320 - 16}, ui::Styles::red, "COULD NOT GET DUMP NAME !");
+    }
+    // dump data fo filename
+    auto error = zxkmm_dump_file.create(filename);
+    if (error) {
+        painter.draw_string({0, 320 - 16}, ui::Styles::red, "ERROR DUMPING " + filename.filename().string() + " !");
+    }
+    ////
+
     const std::filesystem::path root_dir = u"/";
     const std::filesystem::path system_dir = u"SYS";
 
-    std::vector<std::filesystem::path> ignore_dirs = {u"FIRMWARE",
-                                                      u"APPS",
-                                                      u"SYS",
-                                                      u"SETTINGS",
-                                                      u"DEBUG",
-                                                      u"LOGS",
-                                                      u"CAPTURES",
-                                                      u".Trash-1000",
-                                                      u"SCREENSHOTS"};
+    std::vector<std::filesystem::path> root_dirs = scan_root_directories(root_dir);
 
     /// worker moving folders
     ensure_directory(system_dir);
 
     auto directories = scan_root_directories(root_dir);
-    for (const auto& dir_entry : directories) {
-        if (std::find(ignore_dirs.begin(), ignore_dirs.end(), dir_entry) == ignore_dirs.end()) {
-            std::filesystem::path new_path = system_dir / dir_entry.filename();
-            rename_file(dir_entry, new_path);
+
+    for (const auto& e : root_dirs) {
+        for (const auto& d : allow_dirs) {
+            if (e.absolute_trimmed_path().string() == d) {
+                std::filesystem::path new_path = system_dir / d;
+                rename_file(e, new_path);
+                break;
+            } else {
+            }
         }
     }