Implement new getResourceFiles function

Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -11,6 +11,9 @@
 
 #include "StdInc.h"
 #include <lua/CLuaFunctionParser.h>
+#include <algorithm>
+#include <unordered_map>
+#include <variant>
 
 using std::list;
 
@@ -26,6 +29,7 @@ void CLuaResourceDefs::LoadFunctions()
         {"getResourceGUIElement", GetResourceGUIElement},
         {"getResourceDynamicElementRoot", GetResourceDynamicElementRoot},
         {"getResourceExportedFunctions", GetResourceExportedFunctions},
+        {"getResourceFiles", ArgumentParser<GetResourceFiles>},
         {"getResourceState", GetResourceState},
         {"loadstring", LoadString},
         {"load", Load},
@@ -51,6 +55,7 @@ void CLuaResourceDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getConfig", "getResourceConfig");
     lua_classfunction(luaVM, "getDynamicElementRoot", "getResourceDynamicElementRoot");
     lua_classfunction(luaVM, "getExportedFunctions", "getResourceExportedFunctions");
+    lua_classfunction(luaVM, "getFiles", "getResourceFiles");
     lua_classfunction(luaVM, "getState", "getResourceState");
 
     lua_classvariable(luaVM, "config", NULL, "getResourceConfig");
@@ -391,6 +396,113 @@ int CLuaResourceDefs::GetResourceExportedFunctions(lua_State* luaVM)
     return 1;
 }
 
+namespace
+{
+    auto ParseFilterString(const std::string& strFilter) -> CLuaResourceDefs::eResourceFileFilter
+    {
+        std::string strLower = strFilter;
+        std::transform(strLower.begin(), strLower.end(), strLower.begin(), ::tolower);
+
+        if (strLower == "map")
+            return CLuaResourceDefs::eResourceFileFilter::MAP;
+        else if (strLower == "script")
+            return CLuaResourceDefs::eResourceFileFilter::SCRIPT;
+        else if (strLower == "config")
+            return CLuaResourceDefs::eResourceFileFilter::CONFIG;
+        else if (strLower == "html")
+            return CLuaResourceDefs::eResourceFileFilter::HTML;
+        else if (strLower == "file")
+            return CLuaResourceDefs::eResourceFileFilter::FILE;
+        else
+            return CLuaResourceDefs::eResourceFileFilter::ALL;
+    }
+
+    bool MatchesFilter(CDownloadableResource::eResourceType fileType, CLuaResourceDefs::eResourceFileFilter filter)
+    {
+        switch (filter)
+        {
+            case CLuaResourceDefs::eResourceFileFilter::ALL:
+                return true;
+
+            case CLuaResourceDefs::eResourceFileFilter::MAP:
+                return fileType == CDownloadableResource::RESOURCE_FILE_TYPE_MAP;
+
+            case CLuaResourceDefs::eResourceFileFilter::SCRIPT:
+                return fileType == CDownloadableResource::RESOURCE_FILE_TYPE_SCRIPT ||
+                       fileType == CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_SCRIPT;
+
+            case CLuaResourceDefs::eResourceFileFilter::CONFIG:
+                return fileType == CDownloadableResource::RESOURCE_FILE_TYPE_CONFIG ||
+                       fileType == CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_CONFIG;
+
+            case CLuaResourceDefs::eResourceFileFilter::HTML:
+            case CLuaResourceDefs::eResourceFileFilter::FILE:
+                return fileType == CDownloadableResource::RESOURCE_FILE_TYPE_HTML ||
+                       fileType == CDownloadableResource::RESOURCE_FILE_TYPE_CLIENT_FILE;
+
+            default:
+                return false;
+        }
+    }
+}
+
+std::variant<std::vector<std::string>, std::unordered_map<std::string, std::unordered_map<std::string, std::string>>>
+CLuaResourceDefs::GetResourceFiles(lua_State* luaVM, std::optional<CResource*> optResource, std::optional<bool> optIncludeAttributes, std::optional<std::string> optFilter)
+{
+    CResource* pResource = optResource.value_or(nullptr);
+    bool bIncludeAttributes = optIncludeAttributes.value_or(false);
+    eResourceFileFilter filter = ParseFilterString(optFilter.value_or("all"));
+
+    if (!pResource)
+    {
+        CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+        if (pLuaMain)
+        {
+            pResource = pLuaMain->GetResource();
+        }
+    }
+
+    if (!pResource)
+    {
+        throw std::invalid_argument("Invalid resource");
+    }
+
+    if (bIncludeAttributes)
+    {
+        std::unordered_map<std::string, std::unordered_map<std::string, std::string>> result;
+
+        for (auto iter = pResource->IterBeginResourceFiles(); iter != pResource->IterEndResourceFiles(); ++iter)
+        {
+            CResourceFile* pResourceFile = *iter;
+
+            if (!MatchesFilter(pResourceFile->GetResourceType(), filter))
+                continue;
+
+            std::unordered_map<std::string, std::string> attrs;
+
+            attrs["download"] = pResourceFile->IsAutoDownload() ? "true" : "false";
+
+            result[pResourceFile->GetShortName()] = attrs;
+        }
+        return result;
+    }
+    else
+    {
+        std::vector<std::string> result;
+
+        for (auto iter = pResource->IterBeginResourceFiles(); iter != pResource->IterEndResourceFiles(); ++iter)
+        {
+            CResourceFile* pResourceFile = *iter;
+
+            if (!MatchesFilter(pResourceFile->GetResourceType(), filter))
+                continue;
+
+            result.push_back(pResourceFile->GetShortName());
+        }
+        return result;
+    }
+}
+
 int CLuaResourceDefs::GetResourceState(lua_State* luaVM)
 {
     //  string getResourceState ( resource theResource )

Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h

@@ -26,6 +26,19 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(GetResourceGUIElement);
     LUA_DECLARE(GetResourceDynamicElementRoot);
     LUA_DECLARE(GetResourceExportedFunctions);
+
+    enum class eResourceFileFilter
+    {
+        ALL,
+        MAP,
+        SCRIPT,
+        CONFIG,
+        HTML,
+        FILE
+    };
+
+    static std::variant<std::vector<std::string>, std::unordered_map<std::string, std::unordered_map<std::string, std::string>>> GetResourceFiles(
+        lua_State* luaVM, std::optional<CResource*> pResource, std::optional<bool> includeAttributes, std::optional<std::string> filter);
     LUA_DECLARE(GetResourceState);
     LUA_DECLARE(LoadString);
     LUA_DECLARE(Load);

Server/mods/deathmatch/logic/CResourceFile.h

@@ -69,5 +69,6 @@ class CResourceFile
 
     uint    GetSizeHint() { return m_uiFileSizeHint; }            // Only used by download counters
     string  GetMetaFileAttribute(const string& key) { return m_attributeMap[key]; }
+    const map<string, string>& GetAttributeMap() const { return m_attributeMap; }
     SString GetCachedPathFilename(bool bForceClientCachePath = false);
 };

Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -19,6 +19,9 @@
 #include "CResourceConfigItem.h"
 #include "CDummy.h"
 #include "Utils.h"
+#include <algorithm>
+#include <unordered_map>
+#include <variant>
 
 extern CNetServer* g_pRealNetServer;
 
@@ -60,6 +63,7 @@ void CLuaResourceDefs::LoadFunctions()
         {"getResourceMapRootElement", getResourceMapRootElement},
         {"getResourceExportedFunctions", getResourceExportedFunctions},
         {"getResourceOrganizationalPath", getResourceOrganizationalPath},
+        {"getResourceFiles", ArgumentParser<getResourceFiles>},
         {"isResourceArchived", isResourceArchived},
         {"isResourceProtected", ArgumentParser<isResourceProtected>},
 
@@ -118,6 +122,7 @@ void CLuaResourceDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getDynamicElementRoot", "getResourceDynamicElementRoot");
     lua_classfunction(luaVM, "getRootElement", "getResourceRootElement");
     lua_classfunction(luaVM, "getExportedFunctions", "getResourceExportedFunctions");
+    lua_classfunction(luaVM, "getFiles", "getResourceFiles");
     lua_classfunction(luaVM, "getOrganizationalPath", "getResourceOrganizationalPath");
     lua_classfunction(luaVM, "getLastStartTime", "getResourceLastStartTime");
     lua_classfunction(luaVM, "getLoadTime", "getResourceLoadTime");
@@ -1068,6 +1073,111 @@ int CLuaResourceDefs::getResourceExportedFunctions(lua_State* luaVM)
     return 1;
 }
 
+namespace
+{
+    auto ParseFilterString(const std::string& strFilter) -> CLuaResourceDefs::eResourceFileFilter
+    {
+        std::string strLower = strFilter;
+        std::transform(strLower.begin(), strLower.end(), strLower.begin(), ::tolower);
+
+        if (strLower == "map")
+            return CLuaResourceDefs::eResourceFileFilter::MAP;
+        else if (strLower == "script")
+            return CLuaResourceDefs::eResourceFileFilter::SCRIPT;
+        else if (strLower == "config")
+            return CLuaResourceDefs::eResourceFileFilter::CONFIG;
+        else if (strLower == "html")
+            return CLuaResourceDefs::eResourceFileFilter::HTML;
+        else if (strLower == "file")
+            return CLuaResourceDefs::eResourceFileFilter::FILE;
+        else
+            return CLuaResourceDefs::eResourceFileFilter::ALL;
+    }
+
+    bool MatchesFilter(CResourceFile::eResourceType fileType, CLuaResourceDefs::eResourceFileFilter filter)
+    {
+        switch (filter)
+        {
+            case CLuaResourceDefs::eResourceFileFilter::ALL:
+                return true;
+
+            case CLuaResourceDefs::eResourceFileFilter::MAP:
+                return fileType == CResourceFile::RESOURCE_FILE_TYPE_MAP;
+
+            case CLuaResourceDefs::eResourceFileFilter::SCRIPT:
+                return fileType == CResourceFile::RESOURCE_FILE_TYPE_SCRIPT ||
+                       fileType == CResourceFile::RESOURCE_FILE_TYPE_CLIENT_SCRIPT;
+
+            case CLuaResourceDefs::eResourceFileFilter::CONFIG:
+                return fileType == CResourceFile::RESOURCE_FILE_TYPE_CONFIG ||
+                       fileType == CResourceFile::RESOURCE_FILE_TYPE_CLIENT_CONFIG;
+
+            case CLuaResourceDefs::eResourceFileFilter::HTML:
+            case CLuaResourceDefs::eResourceFileFilter::FILE:
+                return fileType == CResourceFile::RESOURCE_FILE_TYPE_HTML ||
+                       fileType == CResourceFile::RESOURCE_FILE_TYPE_CLIENT_FILE;
+
+            default:
+                return false;
+        }
+    }
+}
+
+std::variant<std::vector<std::string>, std::unordered_map<std::string, std::unordered_map<std::string, std::string>>>
+CLuaResourceDefs::getResourceFiles(lua_State* luaVM, std::optional<CResource*> optResource, std::optional<bool> optIncludeAttributes, std::optional<std::string> optFilter)
+{
+    CResource* pResource = optResource.value_or(nullptr);
+    bool bIncludeAttributes = optIncludeAttributes.value_or(false);
+    eResourceFileFilter filter = ParseFilterString(optFilter.value_or("all"));
+
+    if (!pResource)
+    {
+        CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+        if (pLuaMain)
+        {
+            pResource = pLuaMain->GetResource();
+        }
+    }
+
+    if (!pResource)
+    {
+        throw std::invalid_argument("Invalid resource");
+    }
+
+    if (bIncludeAttributes)
+    {
+        std::unordered_map<std::string, std::unordered_map<std::string, std::string>> result;
+
+        for (auto iter = pResource->IterBegin(); iter != pResource->IterEnd(); ++iter)
+        {
+            CResourceFile* pResourceFile = *iter;
+
+            if (!MatchesFilter(pResourceFile->GetType(), filter))
+                continue;
+
+            const std::map<std::string, std::string>& attributeMap = pResourceFile->GetAttributeMap();
+            std::unordered_map<std::string, std::string> attrs(attributeMap.begin(), attributeMap.end());
+            result[pResourceFile->GetName()] = attrs;
+        }
+        return result;
+    }
+    else
+    {
+        std::vector<std::string> result;
+
+        for (auto iter = pResource->IterBegin(); iter != pResource->IterEnd(); ++iter)
+        {
+            CResourceFile* pResourceFile = *iter;
+
+            if (!MatchesFilter(pResourceFile->GetType(), filter))
+                continue;
+
+            result.push_back(pResourceFile->GetName());
+        }
+        return result;
+    }
+}
+
 int CLuaResourceDefs::getResourceOrganizationalPath(lua_State* luaVM)
 {
     // string getResourceOrganizationalPath ( resource theResource )

Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h

@@ -52,6 +52,19 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(getResourceMapRootElement);
     LUA_DECLARE(getResourceExportedFunctions);
     LUA_DECLARE(getResourceOrganizationalPath);
+
+    enum class eResourceFileFilter
+    {
+        ALL,
+        MAP,
+        SCRIPT,
+        CONFIG,
+        HTML,
+        FILE
+    };
+
+    static std::variant<std::vector<std::string>, std::unordered_map<std::string, std::unordered_map<std::string, std::string>>> getResourceFiles(
+        lua_State* luaVM, std::optional<CResource*> pResource, std::optional<bool> includeAttributes, std::optional<std::string> filter);
     LUA_DECLARE(isResourceArchived);
 
     static std::string GetResourceName(lua_State* luaVM, std::optional<CResource*> resourceElement);