Merge pull request #14230 from Sintendo/file-search

Common/FileSearch: Refactor DoFileSearch

17 files changed, 54 insertions, 54 deletions

diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
index 9eb74e4fcf..1eecb1d36d 100644
--- a/Source/Core/Common/FileSearch.cpp
+++ b/Source/Core/Common/FileSearch.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 #include <filesystem>
-#include <functional>
-#include <iterator>
 #include <system_error>
 
 #include "Common/CommonPaths.h"
@@ -21,16 +19,14 @@
 #endif
 
 #include <cstring>
-#include "Common/CommonFuncs.h"
-#include "Common/FileUtil.h"
 #endif
 
 namespace fs = std::filesystem;
 
 namespace Common
 {
-std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
-                                      const std::vector<std::string>& exts, bool recursive)
+std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                      std::span<const std::string_view> exts, bool recursive)
 {
   const bool accept_all = exts.empty();
 
diff --git a/Source/Core/Common/FileSearch.h b/Source/Core/Common/FileSearch.h
index ac8fb7bf1b..ef28e244d3 100644
--- a/Source/Core/Common/FileSearch.h
+++ b/Source/Core/Common/FileSearch.h
@@ -3,14 +3,36 @@
 
 #pragma once
 
+#include <span>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Common
 {
 // Callers can pass empty "exts" to indicate they want all files + directories in results
 // Otherwise, only files matching the extensions are returned
-std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
-                                      const std::vector<std::string>& exts = {},
+std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                      std::span<const std::string_view> exts = {},
                                       bool recursive = false);
+
+inline std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                             std::string_view ext, bool recursive = false)
+{
+  return DoFileSearch(directories, std::span(&ext, 1), recursive);
+}
+
+inline std::vector<std::string> DoFileSearch(std::string_view directory,
+                                             std::span<const std::string_view> exts = {},
+                                             bool recursive = false)
+{
+  return DoFileSearch(std::span(&directory, 1), exts, recursive);
+}
+
+inline std::vector<std::string> DoFileSearch(std::string_view directory, std::string_view ext,
+                                             bool recursive = false)
+{
+  return DoFileSearch(std::span(&directory, 1), std::span(&ext, 1), recursive);
+}
+
 }  // namespace Common
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
index 66629d43f1..9d3639ed04 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <chrono>
 #include <cstring>
-#include <memory>
 #include <mutex>
 #include <string>
 #include <string_view>
@@ -26,7 +25,6 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
-#include "Common/Timer.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SessionSettings.h"
@@ -134,7 +132,7 @@ std::vector<std::string> GCMemcardDirectory::GetFileNamesForGameID(const std::st
     game_code = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
 
   std::vector<Memcard::DEntry> loaded_saves;
-  for (const std::string& file_name : Common::DoFileSearch({directory}, {".gci"}))
+  for (const std::string& file_name : Common::DoFileSearch(directory, ".gci"))
   {
     File::IOFile gci_file(file_name, "rb");
     if (!gci_file)
@@ -190,7 +188,7 @@ GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, ExpansionIn
   }
 
   const bool current_game_only = Config::Get(Config::SESSION_GCI_FOLDER_CURRENT_GAME_ONLY);
-  const std::vector<std::string> filenames = Common::DoFileSearch({m_save_directory}, {".gci"});
+  const std::vector<std::string> filenames = Common::DoFileSearch(m_save_directory, ".gci");
 
   // split up into files for current games we should definitely load,
   // and files for other games that we don't care too much about
diff --git a/Source/Core/DiscIO/RiivolutionParser.cpp b/Source/Core/DiscIO/RiivolutionParser.cpp
index 6fbb4d41c4..754419f33f 100644
--- a/Source/Core/DiscIO/RiivolutionParser.cpp
+++ b/Source/Core/DiscIO/RiivolutionParser.cpp
@@ -399,7 +399,7 @@ std::vector<Patch> GenerateRiivolutionPatchesFromConfig(const std::string& root_
   const std::optional<Config> config = ParseConfigFile(
       fmt::format("{}/riivolution/config/{}.xml", root_directory, game_id.substr(0, 4)));
 
-  for (const std::string& path : Common::DoFileSearch({root_directory + "riivolution"}, {".xml"}))
+  for (const std::string& path : Common::DoFileSearch(root_directory + "riivolution", ".xml"))
   {
     std::optional<Disc> parsed = ParseFile(path);
     if (!parsed || !parsed->IsValidForGame(game_id, revision, disc_number))
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
index 23ce80a489..ddb9d39ee6 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -534,7 +534,7 @@ void MappingWindow::PopulateProfileSelection()
   m_profiles_combo->clear();
 
   const std::string profiles_path = m_config->GetUserProfileDirectoryPath();
-  for (const auto& filename : Common::DoFileSearch({profiles_path}, {".ini"}))
+  for (const auto& filename : Common::DoFileSearch(profiles_path, ".ini"))
   {
     std::string basename;
     SplitPath(filename, nullptr, &basename, nullptr);
@@ -544,8 +544,7 @@ void MappingWindow::PopulateProfileSelection()
 
   m_profiles_combo->insertSeparator(m_profiles_combo->count());
 
-  for (const auto& filename :
-       Common::DoFileSearch({m_config->GetSysProfileDirectoryPath()}, {".ini"}))
+  for (const auto& filename : Common::DoFileSearch(m_config->GetSysProfileDirectoryPath(), ".ini"))
   {
     std::string basename;
     SplitPath(filename, nullptr, &basename, nullptr);
diff --git a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
index aedb42c903..ce8dbdbe97 100644
--- a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
+++ b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
@@ -109,7 +109,7 @@ void RiivolutionBootWidget::LoadMatchingXMLs()
 {
   const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX);
   const auto config = LoadConfigXML(riivolution_dir);
-  for (const std::string& path : Common::DoFileSearch({riivolution_dir + "riivolution"}, {".xml"}))
+  for (const std::string& path : Common::DoFileSearch(riivolution_dir + "riivolution", ".xml"))
   {
     auto parsed = DiscIO::Riivolution::ParseFile(path);
     if (!parsed || !parsed->IsValidForGame(m_game_id, m_revision, m_disc_number))
diff --git a/Source/Core/DolphinQt/Settings/InterfacePane.cpp b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
index a12434236c..c9b5cfd89d 100644
--- a/Source/Core/DolphinQt/Settings/InterfacePane.cpp
+++ b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
@@ -16,7 +16,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 
 #include "Core/AchievementManager.h"
@@ -34,8 +33,6 @@
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
-#include "UICommon/GameFile.h"
-
 static ConfigStringChoice* MakeLanguageComboBox()
 {
   using QPair = std::pair<QString, QString>;
@@ -132,8 +129,8 @@ void InterfacePane::CreateUI()
   combobox_layout->addRow(tr("&Language:"), m_combobox_language);
 
   // List available themes
-  auto theme_paths =
-      Common::DoFileSearch({File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR});
+  auto theme_paths = Common::DoFileSearch(
+      {{File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR}});
   std::vector<std::string> theme_names;
   theme_names.reserve(theme_paths.size());
   std::ranges::transform(theme_paths, std::back_inserter(theme_names), PathToFileName);
@@ -147,7 +144,7 @@ void InterfacePane::CreateUI()
   m_label_userstyle = new QLabel(tr("Style:"));
   combobox_layout->addRow(m_label_userstyle, m_combobox_userstyle);
 
-  auto userstyle_search_results = Common::DoFileSearch({File::GetUserPath(D_STYLES_IDX)});
+  auto userstyle_search_results = Common::DoFileSearch(File::GetUserPath(D_STYLES_IDX));
 
   m_combobox_userstyle->addItem(tr("(System)"), static_cast<int>(Settings::StyleType::System));
 
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 48eebbb7f6..a0a3f7c8c2 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -1173,7 +1173,7 @@ JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_getAllDeviceStrings(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
+  return SpanToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
 }
 
 JNIEXPORT jobject JNICALL
diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
index af5214bd37..be5c963409 100644
--- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
@@ -9,12 +9,10 @@
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
 
 #include "InputCommon/DynamicInputTextures/DITConfiguration.h"
 #include "InputCommon/ImageOperations.h"
 #include "VideoCommon/HiresTextures.h"
-#include "VideoCommon/TextureCacheBase.h"
 
 namespace InputCommon
 {
@@ -32,7 +30,7 @@ void DynamicInputTextureManager::Load()
 
   for (const auto& dynamic_input_directory : dynamic_input_directories)
   {
-    const auto json_files = Common::DoFileSearch({dynamic_input_directory}, {".json"});
+    const auto json_files = Common::DoFileSearch(dynamic_input_directory, ".json");
     for (auto& file : json_files)
     {
       m_configuration.emplace_back(file);
diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp
index 0bb452ac1e..f483e8a9c3 100644
--- a/Source/Core/InputCommon/InputProfile.cpp
+++ b/Source/Core/InputCommon/InputProfile.cpp
@@ -15,8 +15,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/HotkeyManager.h"
 
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
 
@@ -37,7 +37,7 @@ std::vector<std::string> GetProfilesFromSetting(const std::string& setting, cons
     const std::string path = root + std::string(StripWhitespace(setting_choice));
     if (File::IsDirectory(path))
     {
-      const auto files_under_directory = Common::DoFileSearch({path}, {".ini"}, true);
+      const auto files_under_directory = Common::DoFileSearch(path, ".ini", true);
       result.insert(result.end(), files_under_directory.begin(), files_under_directory.end());
     }
     else
@@ -57,7 +57,7 @@ std::vector<std::string> ProfileCycler::GetProfilesForDevice(InputConfig* device
 {
   const std::string device_profile_root_location(
       device_configuration->GetUserProfileDirectoryPath());
-  return Common::DoFileSearch({device_profile_root_location}, {".ini"}, true);
+  return Common::DoFileSearch(device_profile_root_location, ".ini", true);
 }
 
 std::string ProfileCycler::GetProfile(CycleDirection cycle_direction, int& profile_index,
diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp
index f72f47c11e..37a130599d 100644
--- a/Source/Core/UICommon/GameFileCache.cpp
+++ b/Source/Core/UICommon/GameFileCache.cpp
@@ -5,10 +5,7 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
-#include <list>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <unordered_set>
 #include <utility>
@@ -28,12 +25,12 @@ namespace UICommon
 {
 static constexpr u32 CACHE_REVISION = 26;  // Last changed in PR 10084
 
-std::vector<std::string> FindAllGamePaths(const std::vector<std::string>& directories_to_scan,
+std::vector<std::string> FindAllGamePaths(std::span<const std::string_view> directories_to_scan,
                                           bool recursive_scan)
 {
-  static const std::vector<std::string> search_extensions = {
-      ".gcm", ".tgc", ".bin", ".iso", ".ciso", ".gcz", ".wbfs",
-      ".wia", ".rvz", ".nfs", ".wad", ".dol",  ".elf", ".json"};
+  constexpr auto search_extensions =
+      std::to_array<std::string_view>({".gcm", ".tgc", ".bin", ".iso", ".ciso", ".gcz", ".wbfs",
+                                       ".wia", ".rvz", ".nfs", ".wad", ".dol", ".elf", ".json"});
 
   // TODO: We could process paths iteratively as they are found
   return Common::DoFileSearch(directories_to_scan, search_extensions, recursive_scan);
diff --git a/Source/Core/UICommon/GameFileCache.h b/Source/Core/UICommon/GameFileCache.h
index 5544b3a143..4c4ab15557 100644
--- a/Source/Core/UICommon/GameFileCache.h
+++ b/Source/Core/UICommon/GameFileCache.h
@@ -19,7 +19,7 @@ namespace UICommon
 {
 class GameFile;
 
-std::vector<std::string> FindAllGamePaths(const std::vector<std::string>& directories_to_scan,
+std::vector<std::string> FindAllGamePaths(std::span<const std::string_view> directories_to_scan,
                                           bool recursive_scan);
 
 class GameFileCache
diff --git a/Source/Core/UICommon/ResourcePack/Manager.cpp b/Source/Core/UICommon/ResourcePack/Manager.cpp
index b1fd555c85..f3abf44ebc 100644
--- a/Source/Core/UICommon/ResourcePack/Manager.cpp
+++ b/Source/Core/UICommon/ResourcePack/Manager.cpp
@@ -32,7 +32,7 @@ bool Init()
 {
   packs.clear();
   const std::vector<std::string> pack_list =
-      Common::DoFileSearch({File::GetUserPath(D_RESOURCEPACK_IDX)}, {".zip"});
+      Common::DoFileSearch(File::GetUserPath(D_RESOURCEPACK_IDX), ".zip");
 
   Common::IniFile file = GetPackConfig();
 
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 73f271c6bc..f755dae6f5 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -305,7 +305,7 @@ bool ResourcePack::Uninstall(const std::string& path)
 
     while (dir.length() > (path + TEXTURE_PATH).length())
     {
-      auto is_empty = Common::DoFileSearch({dir}).empty();
+      const auto is_empty = Common::DoFileSearch(dir).empty();
 
       if (is_empty)
         File::DeleteDir(dir);
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
index 12f59f5ff5..1e423a8aa6 100644
--- a/Source/Core/VideoCommon/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -3,15 +3,11 @@
 
 #include "VideoCommon/HiresTextures.h"
 
-#include <algorithm>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <unordered_map>
 #include <utility>
-#include <vector>
 #include <xxhash.h>
 
 #include <fmt/format.h>
@@ -21,10 +17,8 @@
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/System.h"
-#include "VideoCommon/Assets/CustomAsset.h"
 #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/Resources/CustomResourceManager.h"
@@ -93,7 +87,7 @@ void HiresTexture::Update()
   const std::string& game_id = SConfig::GetInstance().GetGameID();
   const std::set<std::string> texture_directories =
       GetTextureDirectoriesWithGameId(File::GetUserPath(D_HIRESTEXTURES_IDX), game_id);
-  const std::vector<std::string> extensions{".png", ".dds"};
+  constexpr auto extensions = std::to_array<std::string_view>({".png", ".dds"});
 
   for (const auto& texture_directory : texture_directories)
   {
@@ -101,7 +95,7 @@ void HiresTexture::Update()
     s_file_library->Watch(texture_directory);
 
     const auto texture_paths =
-        Common::DoFileSearch({texture_directory}, extensions, /*recursive*/ true);
+        Common::DoFileSearch(texture_directory, extensions, /*recursive*/ true);
 
     bool failed_insert = false;
     for (auto& path : texture_paths)
@@ -227,7 +221,7 @@ std::set<std::string> GetTextureDirectoriesWithGameId(const std::string& root_di
   };
 
   // Look for any other directories that might be specific to the given gameid
-  const auto files = Common::DoFileSearch({root_directory}, {".txt"}, true);
+  const auto files = Common::DoFileSearch(root_directory, ".txt", true);
   for (const auto& file : files)
   {
     if (match_gameid_or_all(file))
diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp
index 94da639bca..804c24eef6 100644
--- a/Source/Core/VideoCommon/PostProcessing.cpp
+++ b/Source/Core/VideoCommon/PostProcessing.cpp
@@ -24,7 +24,6 @@
 #include "VideoCommon/AbstractPipeline.h"
 #include "VideoCommon/AbstractShader.h"
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/Present.h"
 #include "VideoCommon/ShaderCache.h"
 #include "VideoCommon/ShaderCompileUtils.h"
@@ -387,9 +386,9 @@ PostProcessing::~PostProcessing()
 static std::vector<std::string> GetShaders(const std::string& sub_dir = "")
 {
   std::vector<std::string> paths =
-      Common::DoFileSearch({File::GetUserPath(D_SHADERS_IDX) + sub_dir,
-                            File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir},
-                           {".glsl"});
+      Common::DoFileSearch({{File::GetUserPath(D_SHADERS_IDX) + sub_dir,
+                             File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir}},
+                           ".glsl");
   std::vector<std::string> result;
   for (std::string path : paths)
   {
diff --git a/Source/Core/VideoCommon/TextureUtils.cpp b/Source/Core/VideoCommon/TextureUtils.cpp
index 907b1ac523..bd41550877 100644
--- a/Source/Core/VideoCommon/TextureUtils.cpp
+++ b/Source/Core/VideoCommon/TextureUtils.cpp
@@ -58,7 +58,7 @@ void TextureDumper::DumpTexture(const ::AbstractTexture& texture, std::string ba
     if (!File::IsDirectory(dump_dir))
       File::CreateDir(dump_dir);
 
-    for (auto& filename : Common::DoFileSearch({dump_dir}, {".png"}, true))
+    for (auto& filename : Common::DoFileSearch(dump_dir, ".png", true))
     {
       std::string name;
       SplitPath(filename, nullptr, &name, nullptr);