-- 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.
--
plugin_dir[#plugin_dir + 1] = path;
end
-local io_open, os_time = io.open, os.time;
-local loadstring, pairs = loadstring, pairs;
+local io_open = io.open;
+local envload = require "util.envload".envload;
module "pluginloader"
-local function load_file(name)
- local file, err;
+function load_file(names)
+ local file, err, path;
for i=1,#plugin_dir do
- file, err = io_open(plugin_dir[i]..name);
- if file then break; end
+ for j=1,#names do
+ path = plugin_dir[i]..names[j];
+ file, err = io_open(path);
+ if file then
+ local content = file:read("*a");
+ file:close();
+ return content, path;
+ end
+ end
end
- if not file then return file, err; end
- local content = file:read("*a");
- file:close();
- return content, name;
+ return file, err;
end
-function load_resource(plugin, resource, loader)
- local path, name = plugin:match("([^/]*)/?(.*)");
- if name == "" then
- if not resource then
- resource = "mod_"..plugin..".lua";
- end
- loader = loader or load_file;
+function load_resource(plugin, resource)
+ resource = resource or "mod_"..plugin..".lua";
- 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 names = {
+ "mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
+ "mod_"..plugin..dir_sep..resource; -- mod_hello/mod_hello.lua
+ plugin..dir_sep..resource; -- hello/mod_hello.lua
+ resource; -- mod_hello.lua
+ };
- 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
+ return load_file(names);
end
-function load_code(plugin, resource)
+function load_code(plugin, resource, env)
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 = envload(content, "@"..path, env);
+ if not f then return f, err; end
+ return f, path;
end
return _M;