util.pluginloader: Remove unused support for custom loaders, to simplify further...

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 86075c9071ac50fe57df53b293971295760df0f6..3a4e80030022b08043cd2e6441cd7803e55fdcc2 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,33 +1,67 @@
+-- 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 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 = 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";
+       local path, name = plugin:match("([^/]*)/?(.*)");
+       if name == "" then
+               if not resource then
+                       resource = "mod_"..plugin..".lua";
+               end
+
+               local content, err = load_file(plugin.."/"..resource);
+               if not content then content, err = load_file(resource); end
+               
+               return content, err;
+       else
+               if not resource then
+                       resource = "mod_"..name..".lua";
+               end
+
+               local content, err = load_file(plugin.."/"..resource);
+               if not content then content, err = load_file(path.."/"..resource); end
+               
+               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;