Merge 0.8->trunk

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 696af34f2ef7404e8ebd93a74508ac1736a8ca6f..1aedd6302e1670ed9d1fc3bc93fe290a501de2ec 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,35 +1,61 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
+local dir_sep, path_sep = package.config:match("^(%S+)%s(%S+)");
+local plugin_dir = {};
+for path in (CFG_PLUGINDIR or "./plugins/"):gsub("[/\\]", dir_sep):gmatch("[^"..path_sep.."]+") do
+       path = path..dir_sep; -- add path separator to path end
+       path = path:gsub(dir_sep..dir_sep.."+", dir_sep); -- coalesce multiple separaters
+       plugin_dir[#plugin_dir + 1] = path;
+end
 
-local plugin_dir = CFG_PLUGINDIR or "./plugins/";
-
-local io_open = io.open;
-local loadstring = loadstring;
+local io_open, os_time = io.open, os.time;
+local loadstring, pairs = loadstring, pairs;
 
 module "pluginloader"
 
 local function load_file(name)
-       local file, err = io_open(plugin_dir..name);
+       local file, err;
+       for i=1,#plugin_dir do
+               file, err = io_open(plugin_dir[i]..name);
+               if file then break; end
+       end
        if not file then return file, err; end
        local content = file:read("*a");
        file:close();
        return content, name;
 end
 
-function load_resource(plugin, resource)
-       if not resource then
-               resource = "mod_"..plugin..".lua";
+function load_resource(plugin, resource, loader)
+       local path, name = plugin:match("([^/]*)/?(.*)");
+       if name == "" then
+               if not resource then
+                       resource = "mod_"..plugin..".lua";
+               end
+               loader = loader or load_file;
+
+               local content, err = loader(plugin.."/"..resource);
+               if not content then content, err = loader(resource); end
+               -- TODO add support for packed plugins
+               
+               return content, err;
+       else
+               if not resource then
+                       resource = "mod_"..name..".lua";
+               end
+               loader = loader or load_file;
+
+               local content, err = loader(plugin.."/"..resource);
+               if not content then content, err = loader(path.."/"..resource); end
+               -- TODO add support for packed plugins
+               
+               return content, err;
        end
-       local content, err = load_file(plugin.."/"..resource);
-       if not content then content, err = load_file(resource); end
-       -- TODO add support for packed plugins
-       return content, err;
 end
 
 function load_code(plugin, resource)