X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fpluginloader.lua;h=31ab1e882fa0fcb595dab277c3bfb8b46f39dcf7;hb=8ffa161dfeecc372aa41361b35208508802a73ac;hp=8c22c2049c2bbc8f89b46b94a83d4cb3279a2758;hpb=332ebda71d7fa4771a8222664b3b8bf341109432;p=prosody.git

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 8c22c204..31ab1e88 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,6 +1,6 @@
 -- 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.
@@ -12,16 +12,8 @@ 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";
-
 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
@@ -31,33 +23,30 @@ local function load_file(name)
 end
 
 function load_resource(plugin, resource, loader)
-	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
-	
-	if not content and loader == load_file then
-		return load_resource(plugin, resource, load_from_datastore);
-	end
-	
-	return content, err;
-end
-
-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;
+	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
-	datamanager.store(plugin.."/"..resource, nil, "plugins", store);
 end
 
 function load_code(plugin, resource)