Merge pull request #510 from edubart/configs_impl
Implementing ability to load custom config filesmaster
Henrique Santiago
10 years ago
commit
f334a03397
@ -0,0 +1,73 @@
|
||||
-- @docclass
|
||||
|
||||
local function convertSettingValue(value)
|
||||
if type(value) == 'table' then
|
||||
if value.x and value.width then
|
||||
return recttostring(value)
|
||||
elseif value.x then
|
||||
return pointtostring(value)
|
||||
elseif value.width then
|
||||
return sizetostring(value)
|
||||
elseif value.r then
|
||||
return colortostring(value)
|
||||
else
|
||||
return value
|
||||
end
|
||||
elseif value == nil then
|
||||
return ''
|
||||
else
|
||||
return tostring(value)
|
||||
end
|
||||
end
|
||||
|
||||
function Config:set(key, value)
|
||||
self:setValue(key, convertSettingValue(value))
|
||||
end
|
||||
|
||||
function Config:setDefault(key, value)
|
||||
if self:exists(key) then return false end
|
||||
self:set(key, value)
|
||||
return true
|
||||
end
|
||||
|
||||
function Config:get(key, default)
|
||||
if not self:exists(key) and default ~= nil then
|
||||
self:set(key, default)
|
||||
end
|
||||
return self:getValue(key)
|
||||
end
|
||||
|
||||
function Config:getString(key, default)
|
||||
return self:get(key, default)
|
||||
end
|
||||
|
||||
function Config:getInteger(key, default)
|
||||
local v = tonumber(self:get(key, default)) or 0
|
||||
return v
|
||||
end
|
||||
|
||||
function Config:getNumber(key, default)
|
||||
local v = tonumber(self:get(key, default)) or 0
|
||||
return v
|
||||
end
|
||||
|
||||
function Config:getBoolean(key, default)
|
||||
return toboolean(self:get(key, default))
|
||||
end
|
||||
|
||||
function Config:getPoint(key, default)
|
||||
return topoint(self:get(key, default))
|
||||
end
|
||||
|
||||
function Config:getRect(key, default)
|
||||
return torect(self:get(key, default))
|
||||
end
|
||||
|
||||
function Config:getSize(key, default)
|
||||
return tosize(self:get(key, default))
|
||||
end
|
||||
|
||||
function Config:getColor(key, default)
|
||||
return tocolor(self:get(key, default))
|
||||
end
|
||||
|
||||
@ -1,86 +1,3 @@
|
||||
-- @docclass
|
||||
g_settings = {}
|
||||
g_settings = makesingleton(g_configs.getSettings())
|
||||
|
||||
g_settings.exists = g_configs.exists
|
||||
g_settings.setNode = g_configs.setNode
|
||||
g_settings.mergeNode = g_configs.mergeNode
|
||||
g_settings.getNode = g_configs.getNode
|
||||
g_settings.remove = g_configs.remove
|
||||
g_settings.setList = g_configs.setList
|
||||
g_settings.getList = g_configs.getList
|
||||
g_settings.save = g_configs.save
|
||||
|
||||
local function convertSettingValue(value)
|
||||
if type(value) == 'table' then
|
||||
if value.x and value.width then
|
||||
return recttostring(value)
|
||||
elseif value.x then
|
||||
return pointtostring(value)
|
||||
elseif value.width then
|
||||
return sizetostring(value)
|
||||
elseif value.r then
|
||||
return colortostring(value)
|
||||
else
|
||||
return value
|
||||
end
|
||||
elseif value == nil then
|
||||
return ''
|
||||
else
|
||||
return tostring(value)
|
||||
end
|
||||
end
|
||||
|
||||
function g_settings.set(key, value)
|
||||
g_configs.set(key, convertSettingValue(value))
|
||||
end
|
||||
|
||||
function g_settings.setDefault(key, value)
|
||||
if g_settings.exists(key) then return false end
|
||||
g_settings.set(key, value)
|
||||
return true
|
||||
end
|
||||
|
||||
function g_settings.get(key, default)
|
||||
if not g_settings.exists(key) and default ~= nil then
|
||||
g_settings.set(key, default)
|
||||
end
|
||||
return g_configs.get(key)
|
||||
end
|
||||
|
||||
function g_settings.getString(key, default)
|
||||
return g_settings.get(key, default)
|
||||
end
|
||||
|
||||
function g_settings.getInteger(key, default)
|
||||
local v = tonumber(g_settings.get(key, default)) or 0
|
||||
return v
|
||||
end
|
||||
|
||||
function g_settings.getNumber(key, default)
|
||||
local v = tonumber(g_settings.get(key, default)) or 0
|
||||
return v
|
||||
end
|
||||
|
||||
function g_settings.getBoolean(key, default)
|
||||
return toboolean(g_settings.get(key, default))
|
||||
end
|
||||
|
||||
function g_settings.getPoint(key, default)
|
||||
return topoint(g_settings.get(key, default))
|
||||
end
|
||||
|
||||
function g_settings.getRect(key, default)
|
||||
return torect(g_settings.get(key, default))
|
||||
end
|
||||
|
||||
function g_settings.getSize(key, default)
|
||||
return tosize(g_settings.get(key, default))
|
||||
end
|
||||
|
||||
function g_settings.getColor(key, default)
|
||||
return tocolor(g_settings.get(key, default))
|
||||
end
|
||||
|
||||
function g_settings.getColor(key, default)
|
||||
return tocolor(g_settings.get(key, default))
|
||||
end
|
||||
-- Reserved for future functionality
|
||||
|
||||
@ -0,0 +1,159 @@
|
||||
/*
|
||||
* Copyright (c) 2010-2014 OTClient <https://github.com/edubart/otclient>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "resourcemanager.h"
|
||||
#include "configmanager.h"
|
||||
|
||||
#include <framework/otml/otml.h>
|
||||
|
||||
Config::Config()
|
||||
{
|
||||
m_confsDoc = OTMLDocument::create();
|
||||
m_fileName = "";
|
||||
}
|
||||
|
||||
bool Config::load(const std::string& file)
|
||||
{
|
||||
m_fileName = file;
|
||||
|
||||
if(!g_resources.fileExists(file))
|
||||
return false;
|
||||
|
||||
try {
|
||||
OTMLDocumentPtr confsDoc = OTMLDocument::parse(file);
|
||||
if(confsDoc)
|
||||
m_confsDoc = confsDoc;
|
||||
return true;
|
||||
} catch(stdext::exception& e) {
|
||||
g_logger.error(stdext::format("Unable to parse configuration file '%s': ", e.what()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool Config::unload()
|
||||
{
|
||||
if(isLoaded()) {
|
||||
m_confsDoc = nullptr;
|
||||
m_fileName = "";
|
||||
g_configs.remove(this);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Config::save()
|
||||
{
|
||||
if(m_fileName.length() == 0)
|
||||
return false;
|
||||
return m_confsDoc->save(m_fileName);
|
||||
}
|
||||
|
||||
void Config::clear()
|
||||
{
|
||||
m_confsDoc->clear();
|
||||
}
|
||||
|
||||
void Config::setValue(const std::string& key, const std::string& value)
|
||||
{
|
||||
if(key == "") {
|
||||
remove(key);
|
||||
return;
|
||||
}
|
||||
|
||||
OTMLNodePtr child = OTMLNode::create(key, value);
|
||||
m_confsDoc->addChild(child);
|
||||
}
|
||||
|
||||
void Config::setList(const std::string& key, const std::vector<std::string>& list)
|
||||
{
|
||||
remove(key);
|
||||
|
||||
if(list.size() == 0)
|
||||
return;
|
||||
|
||||
OTMLNodePtr child = OTMLNode::create(key, true);
|
||||
for(const std::string& value : list)
|
||||
child->writeIn(value);
|
||||
m_confsDoc->addChild(child);
|
||||
}
|
||||
|
||||
bool Config::exists(const std::string& key)
|
||||
{
|
||||
return m_confsDoc->hasChildAt(key);
|
||||
}
|
||||
|
||||
std::string Config::getValue(const std::string& key)
|
||||
{
|
||||
OTMLNodePtr child = m_confsDoc->get(key);
|
||||
if(child)
|
||||
return child->value();
|
||||
else
|
||||
return "";
|
||||
}
|
||||
|
||||
std::vector<std::string> Config::getList(const std::string& key)
|
||||
{
|
||||
std::vector<std::string> list;
|
||||
OTMLNodePtr child = m_confsDoc->get(key);
|
||||
if(child) {
|
||||
for(const OTMLNodePtr& subchild : child->children())
|
||||
list.push_back(subchild->value());
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
void Config::remove(const std::string& key)
|
||||
{
|
||||
OTMLNodePtr child = m_confsDoc->get(key);
|
||||
if(child)
|
||||
m_confsDoc->removeChild(child);
|
||||
}
|
||||
|
||||
void Config::setNode(const std::string& key, const OTMLNodePtr& node)
|
||||
{
|
||||
remove(key);
|
||||
mergeNode(key, node);
|
||||
}
|
||||
|
||||
void Config::mergeNode(const std::string& key, const OTMLNodePtr& node)
|
||||
{
|
||||
OTMLNodePtr clone = node->clone();
|
||||
node->setTag(key);
|
||||
node->setUnique(true);
|
||||
m_confsDoc->addChild(node);
|
||||
}
|
||||
|
||||
OTMLNodePtr Config::getNode(const std::string& key)
|
||||
{
|
||||
return m_confsDoc->get(key);
|
||||
}
|
||||
|
||||
bool Config::isLoaded()
|
||||
{
|
||||
return !m_fileName.empty() && m_confsDoc;
|
||||
}
|
||||
|
||||
std::string Config::getFileName()
|
||||
{
|
||||
return m_fileName;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue