Fixed #21: moved resource manager to wsjcpp core

Author: sea5kg

CMakeLists.txt

@@ -17,8 +17,6 @@ list (APPEND WSJCPP_INCLUDE_DIRS "src")
 
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_core.h")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_core.cpp")
-list (APPEND WSJCPP_SOURCES "src/wsjcpp_resources_manager.h")
-list (APPEND WSJCPP_SOURCES "src/wsjcpp_resources_manager.cpp")
 
 list (APPEND WSJCPP_SOURCES "src/main.cpp")
 

src/wsjcpp_core.cpp

@@ -1213,4 +1213,122 @@ void WsjcppLog::add(WsjcppColorModifier &clr, const std::string &sType, const st
     }
 }
 
+// ---------------------------------------------------------------------
+// WsjcppResourceFile
+
+WsjcppResourceFile::WsjcppResourceFile() {
+    WsjcppResourcesManager::add(this);
+}
+
+// ---------------------------------------------------------------------
+
+
+// ---------------------------------------------------------------------
+// WsjcppResourcesManager
+
+std::vector<WsjcppResourceFile*> *g_pWsjcppResourceFiles = nullptr;
+
+void WsjcppResourcesManager::initGlobalVariables() {
+    if (g_pWsjcppResourceFiles == nullptr) {
+        g_pWsjcppResourceFiles = new std::vector<WsjcppResourceFile*>();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppResourcesManager::add(WsjcppResourceFile* pStorage) {
+    WsjcppResourcesManager::initGlobalVariables();
+    g_pWsjcppResourceFiles->push_back(pStorage);
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::has(const std::string &sFilename) {
+    WsjcppResourcesManager::initGlobalVariables();
+    for (int i = 0; i < WsjcppResourcesManager::list().size(); i++) {
+        if (WsjcppResourcesManager::list()[i]->getFilename() == sFilename) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// ---------------------------------------------------------------------
+
+WsjcppResourceFile* WsjcppResourcesManager::get(const std::string &sFilename) {
+    WsjcppResourcesManager::initGlobalVariables();
+    for (int i = 0; i < WsjcppResourcesManager::list().size(); i++) {
+        if (WsjcppResourcesManager::list()[i]->getFilename() == sFilename) {
+            return WsjcppResourcesManager::list()[i];
+        }
+    }
+    return nullptr;
+}
+
+// ---------------------------------------------------------------------
+
+const std::vector<WsjcppResourceFile*> &WsjcppResourcesManager::list() {
+    return *g_pWsjcppResourceFiles;
+}
+
+// ---------------------------------------------------------------------
+
+/*
+bool WsjcppResourcesManager::make(const std::string &sWorkspace) {
+    if (!WsjcppResourcesManager::createFolders(sWorkspace)) {
+        return false;
+    }
+    return WsjcppResourcesManager::extractFiles(sWorkspace);
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::createFolders(const std::string &sWorkspace) {
+    // prepare folders
+    std::vector<std::string> vCreateDirs;
+    vCreateDirs.push_back(sWorkspace + "/logs");
+    vCreateDirs.push_back(sWorkspace + "/teams");
+    vCreateDirs.push_back(sWorkspace + "/checkers");
+    vCreateDirs.push_back(sWorkspace + "/html");
+    vCreateDirs.push_back(sWorkspace + "/html/css");
+    vCreateDirs.push_back(sWorkspace + "/html/js");
+    vCreateDirs.push_back(sWorkspace + "/html/images");
+    vCreateDirs.push_back(sWorkspace + "/html/images/teams");
+    vCreateDirs.push_back(sWorkspace + "/html/images/states");
+
+    for(int i = 0; i < vCreateDirs.size(); i++) {
+        std::string sPath = vCreateDirs[i];
+        // check dir existing
+        if (!FS::dirExists(sPath)) {
+            // try make dir
+            if (!FS::makeDir(sPath)) {
+                std::cout << "Could not create folder " << sPath << std::endl;
+                return false;
+            } else {
+                std::cout << "Created folder " << sPath << std::endl;
+            }
+        }
+    }
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WsjcppResourcesManager::extractFiles(const std::string &sWorkspace) {
+    // TODO mkdir -p for files
+    const std::vector<WsjcppResourceFile*> list = WsjcppResourcesManager::list();
+    for(int i = 0; i < list.size(); i++) {
+        std::string sFilename = sWorkspace + "/" + list[i]->filename();
+        if (!FS::fileExists(sFilename)) {
+            if (!FS::writeFile(sFilename, list[i]->buffer(), list[i]->bufferSize())) {
+                std::cout << "Could not write file " << sFilename << std::endl;
+                return false;
+            } else {
+                std::cout << "Created file " << sFilename << std::endl;
+            }
+        }
+    }
+    return true;
+}
+*/
 

src/wsjcpp_core.h

@@ -194,6 +194,42 @@ class WsjcppLog {
         static void add(WsjcppColorModifier &clr, const std::string &sType, const std::string &sTag, const std::string &sMessage);
 };
 
+// ---------------------------------------------------------------------
+// WsjcppResourceFile
+
+class WsjcppResourceFile {
+    public:
+        WsjcppResourceFile();
+        virtual const std::string &getFilename() const = 0;
+        virtual const std::string &getPackAs() const = 0;
+        virtual int getBufferSize() const = 0;
+        virtual const char *getBuffer() const = 0;
+};
+
+
+// ---------------------------------------------------------------------
+// WsjcppResourcesManager
+
+extern std::vector<WsjcppResourceFile*> *g_pWsjcppResourceFiles;
+
+class WsjcppResourcesManager {
+    public:
+        static void initGlobalVariables();
+        static void add(WsjcppResourceFile*);
+        static const std::vector<WsjcppResourceFile*> &list();
+        static bool has(const std::string &sFilename);
+        static WsjcppResourceFile* get(const std::string &sFilename);
+        static bool make(const std::string &sWorkspace);
+        // static bool createFolders(const std::string &sWorkspace);
+        // static bool extractFiles(const std::string &sWorkspace);
+};
+
+// ---------------------------------------------------------------------
+// Registry WsjcppResourceFile
+#define REGISTRY_WSJCPP_RESOURCE_FILE( classname ) \
+    static classname * pRegistryWsjcppResourceFile ## classname = new classname(); \
+
+
 #endif // WSJCPP_CORE_H
 
 

src/wsjcpp_resources_manager.cpp

@@ -26,8 +26,6 @@ list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests.h")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests_main.cpp")
-list (APPEND WSJCPP_SOURCES "../src/wsjcpp_resources_manager.h")
-list (APPEND WSJCPP_SOURCES "../src/wsjcpp_resources_manager.cpp")
 
 # unit-tests
 list (APPEND WSJCPP_INCLUDE_DIRS "src")

src/wsjcpp_resources_manager.h

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ ! -d tmp ]; then
-	mkdir -p tmp
+    mkdir -p tmp
 fi
 
 cd tmp

unit-tests.wsjcpp/CMakeLists.txt

@@ -1,4 +1,4 @@
-#include <wsjcpp_resources_manager.h>
+#include <wsjcpp_core.h>
 
 class RES_html_images_points_svg : public WsjcppResourceFile { 
     public:

unit-tests.wsjcpp/build_simple.sh

@@ -1,7 +1,6 @@
 #include "unit_test_test_resources.h"
 #include <vector>
 #include <wsjcpp_core.h>
-#include <wsjcpp_resources_manager.h>
 
 REGISTRY_WSJCPP_UNIT_TEST(UnitTestTestResources)
 

unit-tests.wsjcpp/src/resources.wsjcpp/html_images_points_svg_path_835d61.h

@@ -39,12 +39,6 @@ distribution:
   - source-file: "scripts.wsjcpp/generate.Class"
     target-file: "generate.Class"
     type: "safe-scripting-generate"
-  - source-file: "src/wsjcpp_resources_manager.h"
-    target-file: "wsjcpp_resources_manager.h"
-    type: "source-code"
-  - source-file: "src/wsjcpp_resources_manager.cpp"
-    target-file: "wsjcpp_resources_manager.cpp"
-    type: "source-code"
 
 unit-tests:
   cases: