X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fpluginloader.lua;h=b9b3e207fa685ffbf38dbc4f474567fd7a81f6a8;hb=2240827f41bbae46d46bfdf76c7c097ef8b8c021;hp=90138a3eff86b895e6d719bb5a8cddd2a6096d7c;hpb=416b600dd4475c7862070514895eb9314789d5e2;p=prosody.git

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 90138a3e..b9b3e207 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,69 +1,60 @@
 -- Prosody IM
 -- 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, 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_from_datastore(name)
-	local content = datamanager.load(name, nil, "plugins");
-	if not content or not content[1] then return nil, "Resource not found"; end
-	return content[1], name;
-end
-
-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)
-	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 content, err = loader(plugin.."/"..resource);
-	if not content then content, err = loader(resource); end
-	-- TODO add support for packed plugins
-	
-	if not content and loader == load_file then
-		return load_resource(plugin, resource, load_from_datastore);
-	end
-	
-	return content, err;
-end
+	local names = {
+		"mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
+		"mod_"..plugin..dir_sep..resource;                  -- mod_hello/mod_hello.lua
+		plugin..dir_sep..resource;                          -- hello/mod_hello.lua
+		resource;                                           -- mod_hello.lua
+	};
 
-function store_resource(plugin, resource, content, metadata)
-	if not resource then
-		resource = "mod_"..plugin..".lua";
-	end
-	local store = { content };
-	if metadata then
-		for k,v in pairs(metadata) do
-			store[k] = v;
-		end
-	end
-	datamanager.store(plugin.."/"..resource, nil, "plugins", store);
+	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;