Merge 0.10->trunk

[prosody.git] / util / pluginloader.lua

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index b9b3e207fa685ffbf38dbc4f474567fd7a81f6a8..004855f092ee7cabb4655b9533b14642ecb685cf 100644 (file)
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -17,9 +17,7 @@ end
 local io_open = io.open;
 local envload = require "util.envload".envload;
 
-module "pluginloader"
-
-function load_file(names)
+local function load_file(names)
        local file, err, path;
        for i=1,#plugin_dir do
                for j=1,#names do
@@ -35,7 +33,7 @@ function load_file(names)
        return file, err;
 end
 
-function load_resource(plugin, resource)
+local function load_resource(plugin, resource)
        resource = resource or "mod_"..plugin..".lua";
 
        local names = {
@@ -48,7 +46,7 @@ function load_resource(plugin, resource)
        return load_file(names);
 end
 
-function load_code(plugin, resource, env)
+local function load_code(plugin, resource, env)
        local content, err = load_resource(plugin, resource);
        if not content then return content, err; end
        local path = err;
@@ -57,4 +55,23 @@ function load_code(plugin, resource, env)
        return f, path;
 end
 
-return _M;
+local function load_code_ext(plugin, resource, extension, env)
+       local content, err = load_resource(plugin, resource.."."..extension);
+       if not content then
+               content, err = load_resource(resource, resource.."."..extension);
+               if not content then
+                       return content, err;
+               end
+       end
+       local path = err;
+       local f, err = envload(content, "@"..path, env);
+       if not f then return f, err; end
+       return f, path;
+end
+
+return {
+       load_file = load_file;
+       load_resource = load_resource;
+       load_code = load_code;
+       load_code_ext = load_code_ext;
+};