X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fpluginloader.lua;h=31ab1e882fa0fcb595dab277c3bfb8b46f39dcf7;hb=f2c0726e2c08c9c7c4d82075de645c05eac2623e;hp=aedec4b4219b7af6aa8246e760c54540c30e54f0;hpb=b4cb1e8079c6d93fdb6997327f06b8461244175b;p=prosody.git

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index aedec4b4..31ab1e88 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -9,8 +9,8 @@
 
 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"
 
@@ -22,14 +22,31 @@ local function load_file(name)
 	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)