util.stanza: Iterate on childtags instead of all childs.

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 90138a3eff86b895e6d719bb5a8cddd2a6096d7c..31ab1e882fa0fcb595dab277c3bfb8b46f39dcf7 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -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)