Big re-organization of repository [W.I.P]

modules/acore/framework/Configuration/Config.cpp

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 
+ * Copyright (C) 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Config.h"
+#include "Errors.h"
+
+// Defined here as it must not be exposed to end-users.
+bool ConfigMgr::GetValueHelper(const char* name, ACE_TString &result)
+{
+    GuardType guard(_configLock);
+
+    if (_config.get() == 0)
+        return false;
+
+    ACE_TString section_name;
+    ACE_Configuration_Section_Key section_key;
+    const ACE_Configuration_Section_Key &root_key = _config->root_section();
+
+    int i = 0;
+    while (_config->enumerate_sections(root_key, i, section_name) == 0)
+    {
+        _config->open_section(root_key, section_name.c_str(), 0, section_key);
+        if (_config->get_string_value(section_key, name, result) == 0)
+            return true;
+        ++i;
+    }
+
+    return false;
+}
+
+bool ConfigMgr::LoadInitial(char const* file)
+{
+    ASSERT(file);
+
+    GuardType guard(_configLock);
+
+    _config.reset(new ACE_Configuration_Heap());
+    if (_config->open() == 0)
+        if (LoadData(file))
+            return true;
+
+    _config.reset();
+    return false;
+}
+
+bool ConfigMgr::LoadMore(char const* file)
+{
+    ASSERT(file);
+    ASSERT(_config);
+
+    GuardType guard(_configLock);
+
+    return LoadData(file);
+}
+
+bool ConfigMgr::Reload()
+{
+    for(std::vector<std::string>::iterator it = _confFiles.begin(); it != _confFiles.end(); ++it) {
+        if (it==_confFiles.begin()) {
+            if (!LoadInitial((*it).c_str()))
+                return false;
+        } else {
+            if (!LoadMore((*it).c_str()))
+                return false;
+        }
+    }
+
+    return true;
+}
+
+bool ConfigMgr::LoadData(char const* file)
+{
+    if(std::find(_confFiles.begin(), _confFiles.end(), file) == _confFiles.end()) {
+        _confFiles.push_back(file);
+    }
+
+    ACE_Ini_ImpExp config_importer(*_config.get());
+    if (config_importer.import_config(file) == 0)
+        return true;
+
+    return false;
+}
+
+std::string ConfigMgr::GetStringDefault(const char* name, const std::string &def)
+{
+    ACE_TString val;
+    return GetValueHelper(name, val) ? val.c_str() : def;
+}
+
+bool ConfigMgr::GetBoolDefault(const char* name, bool def)
+{
+    ACE_TString val;
+
+    if (!GetValueHelper(name, val))
+        return def;
+
+    return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" ||
+        val == "1");
+}
+
+int ConfigMgr::GetIntDefault(const char* name, int def)
+{
+    ACE_TString val;
+    return GetValueHelper(name, val) ? atoi(val.c_str()) : def;
+}
+
+float ConfigMgr::GetFloatDefault(const char* name, float def)
+{
+    ACE_TString val;
+    return GetValueHelper(name, val) ? (float)atof(val.c_str()) : def;
+}
+
+std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name)
+{
+    GuardType guard(_configLock);
+
+    std::list<std::string> keys;
+    if (_config.get() == 0)
+        return keys;
+
+    ACE_TString section_name;
+    ACE_Configuration_Section_Key section_key;
+    const ACE_Configuration_Section_Key &root_key = _config->root_section();
+
+    int i = 0;
+    while (_config->enumerate_sections(root_key, i++, section_name) == 0)
+    {
+        _config->open_section(root_key, section_name.c_str(), 0, section_key);
+
+        ACE_TString key_name;
+        ACE_Configuration::VALUETYPE type;
+        int j = 0;
+        while (_config->enumerate_values(section_key, j++, key_name, type) == 0)
+        {
+            std::string temp = key_name.c_str();
+
+            if (!temp.find(name))
+                keys.push_back(temp);
+        }
+    }
+
+    return keys;
+}

modules/acore/framework/Configuration/Config.h

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 
+ * Copyright (C) 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include <string>
+#include <list>
+#include <vector>
+#include <ace/Singleton.h>
+#include <ace/Configuration_Import_Export.h>
+#include <ace/Thread_Mutex.h>
+#include <AutoPtr.h>
+
+typedef Trinity::AutoPtr<ACE_Configuration_Heap, ACE_Null_Mutex> Config;
+
+class ConfigMgr
+{
+    friend class ACE_Singleton<ConfigMgr, ACE_Null_Mutex>;
+    friend class ConfigLoader;
+
+    ConfigMgr() { }
+    ~ConfigMgr() { }
+
+public:
+    /// Method used only for loading main configuration files (authserver.conf and worldserver.conf)
+    bool LoadInitial(char const* file);
+
+    /**
+     * This method loads additional configuration files
+     * It is recommended to use this method in WorldScript::OnConfigLoad hooks
+     *
+     * @return true if loading was successful
+     */
+    bool LoadMore(char const* file);
+
+    bool Reload();
+
+    std::string GetStringDefault(const char* name, const std::string& def);
+    bool GetBoolDefault(const char* name, bool def);
+    int GetIntDefault(const char* name, int def);
+    float GetFloatDefault(const char* name, float def);
+
+    std::list<std::string> GetKeysByString(std::string const& name);
+
+private:
+    bool GetValueHelper(const char* name, ACE_TString &result);
+    bool LoadData(char const* file);
+
+    typedef ACE_Thread_Mutex LockType;
+    typedef ACE_Guard<LockType> GuardType;
+
+    std::vector<std::string> _confFiles;
+    Config _config;
+    LockType _configLock;
+
+    ConfigMgr(ConfigMgr const&);
+    ConfigMgr& operator=(ConfigMgr const&);
+};
+
+#define sConfigMgr ACE_Singleton<ConfigMgr, ACE_Null_Mutex>::instance()
+
+#endif