0.3->0.4

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 075fcd3eff675b085023fc78fea081c4ec390b4b..f04c557541c1c943484fb2c1b5e199676d49c32c 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -9,8 +9,8 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io = 
-               setmetatable, loadfile, pcall, rawget, rawset, io;
+local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 
+               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
 
 module "configmanager"
 
@@ -68,15 +68,15 @@ function load(filename, format)
                if f then 
                        local ok, err = parsers[format].load(f:read("*a"));
                        f:close();
-                       return ok, err;
+                       return ok, "parser", err;
                end
-               return f, err;
+               return f, "file", err;
        end
 
        if not format then
-               return nil, "no parser specified";
+               return nil, "file", "no parser specified";
        else
-               return nil, "no parser for "..(format);
+               return nil, "file", "no parser for "..(format);
        end
 end
 
@@ -97,7 +97,8 @@ do
        function parsers.lua.load(data)
                local env;
                -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
-               env = setmetatable({ Host = true; host = true; Component = true, component = true }, { __index = function (t, k)
+               env = setmetatable({ Host = true; host = true; Component = true, component = true,
+                                                       Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
                                                                                                return rawget(_G, k) or
                                                                                                                function (settings_table)
                                                                                                                        config[__currenthost or "*"][k] = settings_table;
@@ -116,14 +117,28 @@ do
                
                function env.Component(name)
                        return function (module)
-                                       set(name, "core", "component_module", module);
-                                       -- Don't load the global modules by default
-                                       set(name, "core", "modules_enable", false);
-                                       rawset(env, "__currenthost", name);
+                                       if type(module) == "string" then
+                                               set(name, "core", "component_module", module);
+                                               -- Don't load the global modules by default
+                                               set(name, "core", "modules_enable", false);
+                                               rawset(env, "__currenthost", name);
+                                       end
                                end
                end
                env.component = env.Component;
                
+               function env.Include(file)
+                       local f, err = io.open(file);
+                       if f then
+                               local data = f:read("*a");
+                               local ok, err = parsers.lua.load(data);
+                               if not ok then error(err:gsub("%[string.-%]", file), 0); end
+                       end
+                       if not f then error("Error loading included "..file..": "..err, 0); end
+                       return f, err;
+               end
+               env.include = env.Include;
+               
                local chunk, err = loadstring(data);
                
                if not chunk then