X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fpluginloader.lua;h=9300b98ab0ff9a46805a5c6143694e067a00c8e6;hb=03d868111471b5f30a34a816b202304b1c9ccae3;hp=696af34f2ef7404e8ebd93a74508ac1736a8ca6f;hpb=82aa9c749335a601ec308148ce95e3c680ad7705;p=prosody.git

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 696af34f..9300b98a 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,41 +1,71 @@
 -- 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, path;
+	for i=1,#plugin_dir do
+		path = plugin_dir[i]..name;
+		file, err = io_open(path);
+		if file then break; end
+	end
 	if not file then return file, err; end
 	local content = file:read("*a");
 	file:close();
-	return content, name;
+	return content, path;
 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)
 	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;