Ticket #1462: recursive tech loading.2.patch

source/simulation2/system/ComponentManager.h

@@ -22 +22 @@
 #include "Components.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/helpers/Player.h"
+#include "ps/Filesystem.h"
 
 #include <boost/random/linear_congruential.hpp>
 #include <boost/unordered_map.hpp>
@@ -70 +71 @@
         std::string schema; // RelaxNG fragment
         CScriptValRooted ctor; // only valid if type == CT_Script
     };
+    
+    struct FindJSONFilesCallbackData {
+        VfsPath path;
+        std::vector<std::string> templates;
+    };
 
 public:
     CComponentManager(CSimContext&, bool skipScriptFunctions = false);
@@ -237 +243 @@
     static std::vector<std::string> Script_FindJSONFiles(void* cbdata, std::wstring subPath);
 
     static CScriptVal ReadJSONFile(void *cbdata, std::wstring filePath, std::wstring fileName);
+    
+    // callback function to handle recursively finding files in a directory
+    static Status FindJSONFilesCallback(const VfsPath&, const FileInfo&, const uintptr_t);
 
     CMessage* ConstructMessage(int mtid, CScriptVal data);
     void SendGlobalMessage(entity_id_t ent, const CMessage& msg) const;

source/simulation2/system/ComponentManager.cpp

@@ -957 +957 @@
 
     return componentManager->GetScriptInterface().ReadJSONFile(path).get();
 }
+    
+Status CComponentManager::FindJSONFilesCallback(const VfsPath& pathname, const FileInfo& UNUSED(fileInfo), const uintptr_t cbData)
+{
+    FindJSONFilesCallbackData* data = (FindJSONFilesCallbackData*)cbData;
+    
+    VfsPath pathstem = pathname.ChangeExtension(L"");
+    // Strip the root from the path
+    std::wstring name = pathstem.string().substr(data->path.string().length());
 
+    data->templates.push_back(std::string(name.begin(), name.end()));
+
+    return INFO::OK;
+}
+
 std::vector<std::string> CComponentManager::Script_FindJSONFiles(void* UNUSED(cbdata), std::wstring subPath)
 {
-    VfsPath path(L"simulation/data/" + subPath + L"/");
-    VfsPaths pathnames;
+    FindJSONFilesCallbackData cbData;
+    cbData.path = VfsPath(L"simulation/data/" + subPath + L"/");
 
-    std::vector<std::string> templates;
-
-    // Find all simulation/data/{subPath}/*.json
-    Status ret = vfs::GetPathnames(g_VFS, path, L"*.json", pathnames);
-    if (ret == INFO::OK)
+    // Find all simulation/data/{subPath}/*.json recursively
+    Status ret = vfs::ForEachFile(g_VFS, cbData.path, FindJSONFilesCallback, (uintptr_t)&cbData, L"*.json", vfs::DIR_RECURSIVE);
+    if (ret != INFO::OK)
     {
-        for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
-        {
-            // Strip the .json extension
-            VfsPath pathstem = it->ChangeExtension(L"");
-            // Strip the root from the path
-            std::wstring name = pathstem.string().substr(path.string().length());
-
-            templates.push_back(std::string(name.begin(), name.end()));
-        }
-    }
-    else
-    {
         // Some error reading directory
         wchar_t error[200];
-        LOGERROR(L"Error reading directory '%ls': %ls", path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
+        LOGERROR(L"Error reading directory '%ls': %ls", cbData.path.string().c_str(), StatusDescription(ret, error, ARRAY_SIZE(error)));
     }
-
-    return templates;
+    
+    return cbData.templates;
 }