Merge 0.8->trunk

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 03679531b1b20b8a3847ec27c4ed6d962a281ed6..4cc3ef467f963b360d6dbb573a3641ded702b744 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -7,12 +7,13 @@
 --
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, format =
-               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format;
-
+local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table =
+      setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table;
+local format, math_max = string.format, math.max;
 
 local fire_event = prosody and prosody.events.fire_event or function () end;
 
+local lfs = require "lfs";
 local path_sep = package.config:sub(1,1);
 
 module "configmanager"
@@ -46,6 +47,15 @@ function get(host, section, key)
        end
        return nil;
 end
+function _M.rawget(host, section, key)
+       local hostconfig = rawget(config, host);
+       if hostconfig then
+               local sectionconfig = rawget(hostconfig, section);
+               if sectionconfig then
+                       return rawget(sectionconfig, key);
+               end
+       end
+end
 
 local function set(config, host, section, key, value)
        if host and section and key then
@@ -71,6 +81,10 @@ do
        local rel_path_start = ".."..path_sep;
        function resolve_relative_path(parent_path, path)
                if path then
+                       -- Some normalization
+                       parent_path = parent_path:gsub("%"..path_sep.."+$", "");
+                       path = path:gsub("^%.%"..path_sep.."+", "");
+                       
                        local is_relative;
                        if path_sep == "/" and path:sub(1,1) ~= "/" then
                                is_relative = true;
@@ -85,6 +99,19 @@ do
        end     
 end
 
+-- Helper function to convert a glob to a Lua pattern
+local function glob_to_pattern(glob)
+       return "^"..glob:gsub("[%p*?]", function (c)
+               if c == "*" then
+                       return ".*";
+               elseif c == "?" then
+                       return ".";
+               else
+                       return "%"..c;
+               end
+       end).."$";
+end
+
 function load(filename, format)
        format = format or filename:match("%w+$");
 
@@ -102,7 +129,7 @@ function load(filename, format)
                                        config = config
                                });
                        end
-                       return not not new_config, "parser", err;
+                       return ok, "parser", err;
                end
                return f, "file", err;
        end
@@ -137,7 +164,7 @@ 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, filename, config)
+       function parsers.lua.load(data, config_file, config)
                local env;
                -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
                env = setmetatable({
@@ -199,24 +226,41 @@ do
                end
                env.component = env.Component;
                
-               function env.Include(file)
-                       local f, err = io.open(file);
-                       if f then
-                               local data = f:read("*a");
-                               local file = resolve_relative_path(filename:gsub("[^"..path_sep.."]+$", ""), file);
-                               local ret, err = parsers.lua.load(data, file, config);
-                               if not ret then error(err:gsub("%[string.-%]", file), 0); end
+               function env.Include(file, wildcard)
+                       if file:match("[*?]") then
+                               local path_pos, glob = file:match("()([^"..path_sep.."]+)$");
+                               local path = file:sub(1, math_max(path_pos-2,0));
+                               local config_path = config_file:gsub("[^"..path_sep.."]+$", "");
+                               if #path > 0 then
+                                       path = resolve_relative_path(config_path, path);
+                               else
+                                       path = config_path;
+                               end
+                               local patt = glob_to_pattern(glob);
+                               for f in lfs.dir(path) do
+                                       if f:sub(1,1) ~= "." and f:match(patt) then
+                                               env.Include(path..path_sep..f);
+                                       end
+                               end
+                       else
+                               local f, err = io.open(file);
+                               if f then
+                                       local data = f:read("*a");
+                                       local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
+                                       local ret, err = parsers.lua.load(data, file, config);
+                                       if not ret 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
-                       if not f then error("Error loading included "..file..": "..err, 0); end
-                       return f, err;
                end
                env.include = env.Include;
                
                function env.RunScript(file)
-                       return dofile(resolve_relative_path(filename:gsub("[^"..path_sep.."]+$", ""), file));
+                       return dofile(resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file));
                end
                
-               local chunk, err = loadstring(data, "@"..filename);
+               local chunk, err = loadstring(data, "@"..config_file);
                
                if not chunk then
                        return nil, err;