From 1f66d719f2cbbcb144b5080c89dd73fcae261798 Mon Sep 17 00:00:00 2001 From: StormBytePP Date: Sat, 15 Aug 2015 02:19:10 +0200 Subject: Core/BuildSystem: Merge collision, debugging, threading, utilities and configuration into "common" which does not depend on shared anymore and moved database out of shared library These changes enables to build tools only without even having MySQL installed --- src/server/shared/Configuration/Config.cpp | 114 ----------------------------- src/server/shared/Configuration/Config.h | 63 ---------------- 2 files changed, 177 deletions(-) delete mode 100644 src/server/shared/Configuration/Config.cpp delete mode 100644 src/server/shared/Configuration/Config.h (limited to 'src/server/shared/Configuration') diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp deleted file mode 100644 index ea426a5d33e..00000000000 --- a/src/server/shared/Configuration/Config.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2008-2015 TrinityCore - * Copyright (C) 2005-2009 MaNGOS - * - * 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 . - */ - -#include -#include -#include -#include -#include "Config.h" - -using namespace boost::property_tree; - -bool ConfigMgr::LoadInitial(std::string const& file, std::string& error) -{ - std::lock_guard lock(_configLock); - - _filename = file; - - try - { - ptree fullTree; - ini_parser::read_ini(file, fullTree); - - if (fullTree.empty()) - { - error = "empty file (" + file + ")"; - return false; - } - - // Since we're using only one section per config file, we skip the section and have direct property access - _config = fullTree.begin()->second; - } - catch (ini_parser::ini_parser_error const& e) - { - if (e.line() == 0) - error = e.message() + " (" + e.filename() + ")"; - else - error = e.message() + " (" + e.filename() + ":" + std::to_string(e.line()) + ")"; - return false; - } - - return true; -} - -bool ConfigMgr::Reload(std::string& error) -{ - return LoadInitial(_filename, error); -} - -std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def) -{ - std::string value = _config.get(ptree::path_type(name, '/'), def); - - value.erase(std::remove(value.begin(), value.end(), '"'), value.end()); - - return value; -} - -bool ConfigMgr::GetBoolDefault(std::string const& name, bool def) -{ - try - { - std::string val = _config.get(ptree::path_type(name, '/')); - val.erase(std::remove(val.begin(), val.end(), '"'), val.end()); - return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" || val == "1"); - } - catch (std::exception const& /*ex*/) - { - return def; - } -} - -int ConfigMgr::GetIntDefault(std::string const& name, int def) -{ - return _config.get(ptree::path_type(name, '/'), def); -} - -float ConfigMgr::GetFloatDefault(std::string const& name, float def) -{ - return _config.get(ptree::path_type(name, '/'), def); -} - -std::string const& ConfigMgr::GetFilename() -{ - std::lock_guard lock(_configLock); - return _filename; -} - -std::list ConfigMgr::GetKeysByString(std::string const& name) -{ - std::lock_guard lock(_configLock); - - std::list keys; - - for (const ptree::value_type& child : _config) - if (child.first.compare(0, name.length(), name) == 0) - keys.push_back(child.first); - - return keys; -} diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h deleted file mode 100644 index 5fb7cef9241..00000000000 --- a/src/server/shared/Configuration/Config.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2008-2015 TrinityCore - * Copyright (C) 2005-2009 MaNGOS - * - * 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 . - */ - -#ifndef CONFIG_H -#define CONFIG_H - -#include -#include -#include -#include - -class ConfigMgr -{ - ConfigMgr() { } - ~ConfigMgr() { } - -public: - /// Method used only for loading main configuration files (authserver.conf and worldserver.conf) - bool LoadInitial(std::string const& file, std::string& error); - - static ConfigMgr* instance() - { - static ConfigMgr instance; - return &instance; - } - - bool Reload(std::string& error); - - std::string GetStringDefault(std::string const& name, const std::string& def); - bool GetBoolDefault(std::string const& name, bool def); - int GetIntDefault(std::string const& name, int def); - float GetFloatDefault(std::string const& name, float def); - - std::string const& GetFilename(); - std::list GetKeysByString(std::string const& name); - -private: - std::string _filename; - boost::property_tree::ptree _config; - std::mutex _configLock; - - ConfigMgr(ConfigMgr const&); - ConfigMgr& operator=(ConfigMgr const&); -}; - -#define sConfigMgr ConfigMgr::instance() - -#endif -- cgit v1.2.3