Merge pull request #3105 from Digitalone1/master

Optimize search file util

Author: wwmm

include/presets_manager.hpp

@@ -79,7 +79,7 @@ class PresetsManager {
 
   auto load_local_preset_file(const PresetType& preset_type, const std::string& name) -> bool;
 
-  auto load_community_preset_file(const PresetType& preset_type, const std::string& full_path) -> bool;
+  auto load_community_preset_file(const PresetType& preset_type, const std::string& full_path_stem) -> bool;
 
   auto read_effects_pipeline_from_preset(const PresetType& preset_type,
                                          const std::filesystem::path& input_file,

src/equalizer_ui.cpp

@@ -369,7 +369,7 @@ auto import_apo_preset(EqualizerBox* self, const std::string& file_path) -> bool
   double preamp = 0.0;
 
   if (const auto re = std::regex(R"(^[ \t]*#)"); eq_file.is_open()) {
-    for (std::string line; getline(eq_file, line);) {
+    for (std::string line; std::getline(eq_file, line);) {
       if (std::regex_search(line, re)) {  // Avoid commented lines
         continue;
       }
@@ -666,7 +666,7 @@ auto import_graphiceq_preset(EqualizerBox* self, const std::string& file_path) -
   std::vector<struct GraphicEQ_Band> bands;
 
   if (const auto re = std::regex(R"(^[ \t]*#)"); eq_file.is_open()) {
-    for (std::string line; getline(eq_file, line);) {
+    for (std::string line; std::getline(eq_file, line);) {
       if (std::regex_search(line, re)) {  // Avoid commented lines
         continue;
       }

src/presets_manager.cpp

@@ -620,12 +620,13 @@ auto PresetsManager::load_local_preset_file(const PresetType& preset_type, const
   return false;
 }
 
-auto PresetsManager::load_community_preset_file(const PresetType& preset_type, const std::string& full_path) -> bool {
-  const auto input_file = std::filesystem::path{full_path + json_ext};
+auto PresetsManager::load_community_preset_file(const PresetType& preset_type, const std::string& full_path_stem)
+    -> bool {
+  const auto input_file = std::filesystem::path{full_path_stem + json_ext};
 
   // Check preset existence
   if (!std::filesystem::exists(input_file)) {
-    util::warning("the community preset \"" + full_path + "\" does not exist on the filesystem");
+    util::warning("the community preset \"" + input_file.string() + "\" does not exist on the filesystem");
 
     return false;
   }

src/util.cpp

@@ -424,31 +424,39 @@ auto search_filename(const std::filesystem::path& path,
                      const std::string& filename,
                      std::string& full_path_result,
                      const uint& top_scan_level) -> bool {
-  // Recursive util to search a filename from an origin full path.
+  // Recursive util to search a filename from an origin full path directory.
   // The search is performed in subdirectories and it's stopped at a specified
   // sublevel (top_scan_level = 1 searches only in the path).
 
-  if (!std::filesystem::exists(path)) {
+  if (!std::filesystem::exists(path) || !std::filesystem::is_directory(path)) {
     return false;
   }
 
+  const auto fn = path / filename;
+
+  // Get the file in this directory, if exists.
+  if (std::filesystem::exists(fn) && std::filesystem::is_regular_file(fn)) {
+    // File found, abort the search.
+    full_path_result = fn.c_str();
+
+    return true;
+  }
+
+  // The file is not in this directory, search in subdirectories.
   const auto scan_level = top_scan_level - 1U;
 
+  if (scan_level == 0U) {
+    return false;
+  }
+
   auto it = std::filesystem::directory_iterator{path};
 
   try {
     while (it != std::filesystem::directory_iterator{}) {
-      if (std::filesystem::is_regular_file(it->status())) {
-        if (const auto path = it->path(); path.filename().c_str() == filename) {
-          // File found, abort the search.
-          full_path_result = path.c_str();
-
-          return true;
-        }
-      } else if (scan_level > 0U && std::filesystem::is_directory(it->status())) {
-        if (const auto path = it->path(); !path.empty()) {
+      if (std::filesystem::is_directory(it->status())) {
+        if (const auto p = it->path(); !p.empty()) {
           // Continue the search in the subfolder.
-          const auto found = search_filename(path, filename, full_path_result, scan_level);
+          const auto found = search_filename(p, filename, full_path_result, scan_level);
 
           if (found) {
             return true;