Merge 0.8->trunk

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index cffc4dfc46d458f793a503946fb7e3dd993ab2a0..1aedd6302e1670ed9d1fc3bc93fe290a501de2ec 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,29 +1,30 @@
 -- 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 plugin_dir = CFG_PLUGINDIR or "./plugins/";
+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 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, "*", "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);
+       local file, err;
+       for i=1,#plugin_dir do
+               file, err = io_open(plugin_dir[i]..name);
+               if file then break; end
+       end
        if not file then return file, err; end
        local content = file:read("*a");
        file:close();
@@ -31,33 +32,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
+       local path, name = plugin:match("([^/]*)/?(.*)");
+       if name == "" then
+               if not resource then
+                       resource = "mod_"..plugin..".lua";
+               end
+               loader = loader or load_file;
 
-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 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, "*", "plugins", store);
 end
 
 function load_code(plugin, resource)