X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=util%2Fpluginloader.lua;h=c10fdf6525ae2e34868a5bf8bf90c3104664d920;hb=ea9c53231bbd3b3b280389b63380944f5b0fadb8;hp=07b4e5c7b7f5545a998e42ae9cb953a091d51b81;hpb=f297cfe3191e17e1e95429b8b3a5905ff44f6869;p=prosody.git

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 07b4e5c7..c10fdf65 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -6,55 +6,55 @@
 -- 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, os_time = io.open, os.time;
-local loadstring, pairs = loadstring, pairs;
-
-local datamanager = require "util.datamanager";
+local io_open = io.open;
+local envload = require "util.envload".envload;
 
 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;
+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)
-	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;
+function load_resource(plugin, resource)
+	resource = resource or "mod_"..plugin..".lua";
 
-		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 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
+	};
+
+	return load_file(names);
 end
 
-function load_code(plugin, resource)
+function load_code(plugin, resource, env)
 	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 = envload(content, "@"..path, env);
+	if not f then return f, err; end
+	return f, path;
 end
 
 return _M;