From 2d84fae2c85d2a57d378f99c46e511060c15e07b Mon Sep 17 00:00:00 2001
From: BenDol <dolb90@gmail.com>
Date: Wed, 2 Apr 2014 01:54:13 +1300
Subject: [PATCH] Can now create new configs on the fly using: local config =
 g_configs.create(file)

---
 init.lua                             |  2 +-
 src/framework/core/configmanager.cpp | 33 +++++++++++++++++++++++-----
 src/framework/core/configmanager.h   |  1 +
 src/framework/luafunctions.cpp       |  1 +
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/init.lua b/init.lua
index fcd95c53..64ddbf10 100644
--- a/init.lua
+++ b/init.lua
@@ -27,7 +27,7 @@ g_resources.setupUserWriteDir(g_app.getCompactName())
 -- search all packages
 g_resources.searchAndAddPackages('/', '.otpkg', true)
 
--- load configurations
+-- load settings
 g_configs.loadSettings("/config.otml")
 
 g_modules.discoverModules()
diff --git a/src/framework/core/configmanager.cpp b/src/framework/core/configmanager.cpp
index 2e291ed8..b11fc382 100644
--- a/src/framework/core/configmanager.cpp
+++ b/src/framework/core/configmanager.cpp
@@ -59,7 +59,6 @@ ConfigPtr ConfigManager::get(const std::string& file)
             return config;
         }
     }
-    g_logger.error(stdext::format("Unable to find configuration for '%s' ", file));
     return nullptr;
 }
 
@@ -76,19 +75,41 @@ ConfigPtr ConfigManager::loadSettings(const std::string file)
     return nullptr;
 }
 
+ConfigPtr ConfigManager::create(const std::string& file)
+{
+    ConfigPtr config = load(file);
+    if(!config) {
+        config = ConfigPtr(new Config());
+
+        config->load(file);
+        config->save();
+
+        m_configs.push_back(config);
+    }
+    return config;
+}
+
 ConfigPtr ConfigManager::load(const std::string& file)
 {
     if(file.empty()) {
         g_logger.error("Must provide a configuration file to load.");
+        return nullptr;
     }
     else {
-        ConfigPtr config = ConfigPtr(new Config());
-        if(config->load(file)) {
-            m_configs.push_back(config);
-            return config;
+        ConfigPtr config = get(file);
+        if(!config) {
+            config = ConfigPtr(new Config());
+
+            if(config->load(file)) {
+                m_configs.push_back(config);
+            }
+            else {
+                // cannot load config
+                config = nullptr;
+            }
         }
+        return config;
     }
-    return nullptr;
 }
 
 bool ConfigManager::unload(const std::string& file)
diff --git a/src/framework/core/configmanager.h b/src/framework/core/configmanager.h
index a49f084b..fea43dac 100644
--- a/src/framework/core/configmanager.h
+++ b/src/framework/core/configmanager.h
@@ -35,6 +35,7 @@ public:
     ConfigPtr getSettings();
     ConfigPtr get(const std::string& file);
 
+    ConfigPtr create(const std::string& file);
     ConfigPtr loadSettings(const std::string file);
     ConfigPtr load(const std::string& file);
     bool unload(const std::string& file);
diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp
index 30d51c8c..9f23f549 100644
--- a/src/framework/luafunctions.cpp
+++ b/src/framework/luafunctions.cpp
@@ -141,6 +141,7 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_configs", "loadSettings", &ConfigManager::loadSettings, &g_configs);
     g_lua.bindSingletonFunction("g_configs", "load", &ConfigManager::load, &g_configs);
     g_lua.bindSingletonFunction("g_configs", "unload", &ConfigManager::unload, &g_configs);
+    g_lua.bindSingletonFunction("g_configs", "create", &ConfigManager::create, &g_configs);
 
     // Logger
     g_lua.registerSingletonClass("g_logger");