Remove "unfiltered" version of ListFiles, and add a default argument …

…value of a blank string. Use `std::string::empty()` instead of string compare, and remove redundant check.
Malkierian · Dec 8, 2024 · d6ad7cb · d6ad7cb
1 parent 3435b55
commit d6ad7cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/resource/archive/ArchiveManager.cpp b/src/resource/archive/ArchiveManager.cpp
@@ -69,17 +69,13 @@ bool ArchiveManager::HasFile(uint64_t hash) {
 std::shared_ptr<std::vector<std::string>> ArchiveManager::ListFiles(const std::string& filter) {
     auto list = std::make_shared<std::vector<std::string>>();
     for (const auto& [hash, path] : mHashes) {
-        if (filter != "" && glob_match(filter.c_str(), path.c_str()) || filter == "") {
+        if (filter.empty() || glob_match(filter.c_str(), path.c_str())) {
             list->push_back(path);
         }
     }
     return list;
 }
 
-std::shared_ptr<std::vector<std::string>> ArchiveManager::ListFiles() {
-    return ListFiles("");
-}
-
 std::vector<uint32_t> ArchiveManager::GetGameVersions() {
     return mGameVersions;
 }

diff --git a/src/resource/archive/ArchiveManager.h b/src/resource/archive/ArchiveManager.h
@@ -31,8 +31,7 @@ class ArchiveManager {
     std::shared_ptr<File> LoadFile(uint64_t hash, std::shared_ptr<ResourceInitData> initData = nullptr);
     bool HasFile(const std::string& filePath);
     bool HasFile(uint64_t hash);
-    std::shared_ptr<std::vector<std::string>> ListFiles(const std::string& filter);
-    std::shared_ptr<std::vector<std::string>> ListFiles();
+    std::shared_ptr<std::vector<std::string>> ListFiles(const std::string& filter = "");
     std::vector<uint32_t> GetGameVersions();
     const std::string* HashToString(uint64_t hash) const;
     bool IsGameVersionValid(uint32_t gameVersion);