From ede1bd83a82243ffd64b44bd4fda445f8eb97a2c Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 21 Nov 2008 05:47:27 +0000
Subject: Import initial configmanager, not sure if it works yet, but it does
 pass the unit tests ;)

---
 core/configmanager.lua | 105 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 core/configmanager.lua

(limited to 'core/configmanager.lua')

diff --git a/core/configmanager.lua b/core/configmanager.lua
new file mode 100644
index 00000000..cc7ffb7e
--- /dev/null
+++ b/core/configmanager.lua
@@ -0,0 +1,105 @@
+
+local _G = _G;
+module "configmanager"
+
+local parsers = {};
+
+local config = { ["*"] = { core = {} } };
+
+local global_config = config["*"];
+
+-- When host not found, use global
+setmetatable(config, { __index = function () return global_config; end});
+local host_mt = { __index = global_config };
+
+-- When key not found in section, check key in global's section
+function section_mt(section_name)
+	return { __index = 	function (t, k)
+									local section = rawget(global_config, section_name);
+									if not section then return nil; end
+									return section[k];
+							end };
+end
+
+function get(host, section, key)
+	local sec = config[host][section];
+	if sec then
+		return sec[key];
+	end
+	return nil;
+end
+
+function set(host, section, key, value)
+	if host and section and key then
+		local hostconfig = rawget(config, host);
+		if not hostconfig then
+			hostconfig = rawset(config, host, setmetatable({}, host_mt))[host];
+		end
+		if not rawget(hostconfig, section) then
+			hostconfig[section] = setmetatable({}, section_mt(section));
+		end
+		hostconfig[section][key] = value;
+		return true;
+	end
+	return false;
+end
+
+function load(filename, format)
+	if parsers[format] and parsers[format].load then
+		local f = io.open(filename);
+		if f then 
+			local ok, err = parsers[format](f:read("*a"));
+			f:close();
+			return ok, err;
+		end
+	end
+	return false, "no parser";
+end
+
+function save(filename, format)
+end
+
+function addparser(format, parser)
+	if format and parser then
+		parsers[format] = parser;
+	end
+end
+
+do
+	parsers.lua = {};
+	function parsers.lua.load(data)
+		local env = setmetatable({}, { __index = function (t, k)
+											if k:match("^mod_") then
+												return function (settings_table)
+															config[__currenthost or "*"][k] = settings_table;
+														end;
+											end
+											return rawget(_G, k);
+										end});
+		
+		function env.Host(name)
+			env.__currenthost = name;
+		end
+		
+		local chunk, err = loadstring(data);
+		
+		if not chunk then
+			return nil, err;
+		end
+		
+		setfenv(chunk, env);
+		
+		local ok, err = pcall(chunk);
+		
+		if not ok then
+			return nil, err;
+		end
+		
+		
+		
+		return true;
+	end
+	
+end
+
+return _M;
\ No newline at end of file
-- 
cgit v1.2.3


From d4f1fa92a2fc10324565151769344981ec26f30c Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 23 Nov 2008 02:12:46 +0000
Subject: New configmanager. Old-style config files still work, but will print
 a warning

---
 core/configmanager.lua | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'core/configmanager.lua')

diff --git a/core/configmanager.lua b/core/configmanager.lua
index cc7ffb7e..5f5648b9 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,5 +1,7 @@
 
 local _G = _G;
+local 	setmetatable, loadfile, pcall, rawget, rawset, io = 
+		setmetatable, loadfile, pcall, rawget, rawset, io;
 module "configmanager"
 
 local parsers = {};
@@ -21,6 +23,10 @@ function section_mt(section_name)
 							end };
 end
 
+function getconfig()
+	return config;
+end
+
 function get(host, section, key)
 	local sec = config[host][section];
 	if sec then
@@ -45,15 +51,20 @@ function set(host, section, key, value)
 end
 
 function load(filename, format)
+	format = format or filename:match("%w+$");
 	if parsers[format] and parsers[format].load then
 		local f = io.open(filename);
 		if f then 
-			local ok, err = parsers[format](f:read("*a"));
+			local ok, err = parsers[format].load(f:read("*a"));
 			f:close();
 			return ok, err;
 		end
 	end
-	return false, "no parser";
+	if not format then
+		return nil, "no parser specified";
+	else
+		return false, "no parser";
+	end
 end
 
 function save(filename, format)
@@ -65,21 +76,28 @@ function addparser(format, parser)
 	end
 end
 
+-- Built-in Lua parser
 do
+	local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
+	local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
 	parsers.lua = {};
 	function parsers.lua.load(data)
-		local env = setmetatable({}, { __index = function (t, k)
-											if k:match("^mod_") then
-												return function (settings_table)
+		local env;
+		env = setmetatable({ Host = true; host = true; }, { __index = function (t, k)
+												return rawget(_G, k) or
+														function (settings_table)
 															config[__currenthost or "*"][k] = settings_table;
 														end;
-											end
-											return rawget(_G, k);
+										end,
+								__newindex = function (t, k, v)
+											set(env.__currenthost or "*", "core", k, v);
 										end});
 		
 		function env.Host(name)
-			env.__currenthost = name;
+			rawset(env, "__currenthost", name);
+			set(name or "*", "core", "defined", true);
 		end
+		env.host = env.Host;
 		
 		local chunk, err = loadstring(data);
 		
@@ -95,8 +113,6 @@ do
 			return nil, err;
 		end
 		
-		
-		
 		return true;
 	end
 	
-- 
cgit v1.2.3