mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 956b92bd640f2d5b437f43ea8b41bcfea2286568..555e41bf82b176ab001a4b5d07d6a3c60e3b1457 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -6,41 +6,55 @@
 -- COPYING file in the source package for more information.
 --
 
-
-local plugin_dir = CFG_PLUGINDIR or "./plugins/";
+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 io_open, os_time = io.open, os.time;
 local loadstring, pairs = loadstring, pairs;
 
-local datamanager = require "util.datamanager";
-
 module "pluginloader"
 
-local function load_file(name)
-       local file, err = io_open(plugin_dir..name);
-       if not file then return file, err; end
-       local content = file:read("*a");
-       file:close();
-       return content, name;
+local function load_file(names)
+       local file, err, path;
+       for i=1,#plugin_dir do
+               for j=1,#names do
+                       path = plugin_dir[i]..names[j];
+                       file, err = io_open(path);
+                       if file then
+                               local content = file:read("*a");
+                               file:close();
+                               return content, path;
+                       end
+               end
+       end
+       return file, err;
 end
 
-function load_resource(plugin, resource, loader)
-       if not resource then
-               resource = "mod_"..plugin..".lua";
-       end
-       loader = loader or load_file;
+function load_resource(plugin, resource)
+       resource = resource or "mod_"..plugin..".lua";
+
+       local names = {
+               "mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua
+               "mod_"..plugin.."/"..resource;              -- mod_hello/mod_hello.lua
+               plugin.."/"..resource;                      -- hello/mod_hello.lua
+               resource;                                   -- mod_hello.lua
+       };
 
-       local content, err = loader(plugin.."/"..resource);
-       if not content then content, err = loader(resource); end
-       -- TODO add support for packed plugins
-       
-       return content, err;
+       return load_file(names);
 end
 
 function load_code(plugin, resource)
        local content, err = load_resource(plugin, resource);
        if not content then return content, err; end
-       return loadstring(content, "@"..err);
+       local path = err;
+       local f, err = loadstring(content, "@"..path);
+       if not f then return f, err; end
+       return f, path;
 end
 
 return _M;