diff options
| -rw-r--r-- | core/modulemanager.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_console.lua | 26 | ||||
| -rw-r--r-- | util/array.lua | 70 |
3 files changed, 76 insertions, 21 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 9b5acffa..0b5f0351 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -101,6 +101,7 @@ function load(host, module_name, config) if not modulemap[host] then modulemap[host] = {}; + hosts[host].modules = modulemap[host]; end if modulemap[host][module_name] then diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index e8d31ceb..73a83f17 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -183,6 +183,7 @@ function commands.help(session, data) print [[module:load(module, host) - Load the specified module on the specified host (or all hosts if none given)]] print [[module:reload(module, host) - The same, but unloads and loads the module (saving state if the module supports it)]] print [[module:unload(module, host) - The same, but just unloads the module from memory]] + print [[module:list(host) - List the modules loaded on the specified host]] elseif section == "server" then print [[server:version() - Show the server's version number]] print [[server:uptime() - Show how long the server has been running]] @@ -327,6 +328,31 @@ function def_env.module:reload(name, hosts) return ok, (ok and "Module reloaded on "..count.." host"..(count ~= 1 and "s" or "")) or ("Last error: "..tostring(err)); end +function def_env.module:list(hosts) + if hosts == nil then + hosts = array.collect(keys(prosody.hosts)); + end + if type(hosts) == "string" then + hosts = { hosts }; + end + if type(hosts) ~= "table" then + return false, "Please supply a host or a list of hosts you would like to see"; + end + + local print = self.session.print; + for _, host in ipairs(hosts) do + print(host..":"); + local modules = array.collect(keys(prosody.hosts[host].modules or {})):sort(); + if #modules == 0 then + print(" No modules loaded"); + else + for _, name in ipairs(modules) do + print(" "..name); + end + end + end +end + def_env.config = {}; function def_env.config:load(filename, format) local config_load = require "core.configmanager".load; diff --git a/util/array.lua b/util/array.lua index ce5ce077..ae3a0b5b 100644 --- a/util/array.lua +++ b/util/array.lua @@ -6,9 +6,14 @@ -- COPYING file in the source package for more information. -- +local t_insert, t_sort, t_remove, t_concat + = table.insert, table.sort, table.remove, table.concat; + local array = {}; +local array_base = {}; +local array_methods = {}; +local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end }; -local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end }; local function new_array(_, t) return setmetatable(t or {}, array_mt); end @@ -20,36 +25,36 @@ end setmetatable(array, { __call = new_array }); -function array:map(func, t2) - local t2 = t2 or array{}; - for k,v in ipairs(self) do - t2[k] = func(v); +function array_base.map(outa, ina, func) + for k,v in ipairs(ina) do + outa[k] = func(v); end - return t2; + return outa; end -function array:filter(func, t2) - local t2 = t2 or array{}; - for k,v in ipairs(self) do +function array_base.filter(outa, ina, func) + for k,v in ipairs(ina) do if func(v) then - t2:push(v); + outa:push(v); end end - return t2; + return outa; end +function array_base.sort(outa, ina, ...) + if ina ~= outa then + outa:append(ina); + end + t_sort(outa, ...); + return outa; +end -array.push = table.insert; -array.pop = table.remove; -array.sort = table.sort; -array.concat = table.concat; -array.length = function (t) return #t; end - -function array:random() +--- These methods only mutate +function array_methods:random() return self[math.random(1,#self)]; end -function array:shuffle() +function array_methods:shuffle(outa, ina) local len = #self; for i=1,#self do local r = math.random(i,len); @@ -58,7 +63,7 @@ function array:shuffle() return self; end -function array:reverse() +function array_methods:reverse() local len = #self-1; for i=len,1,-1 do self:push(self[i]); @@ -67,7 +72,7 @@ function array:reverse() return self; end -function array:append(array) +function array_methods:append(array) local len,len2 = #self, #array; for i=1,len2 do self[len+i] = array[i]; @@ -75,6 +80,12 @@ function array:append(array) return self; end +array_methods.push = table.insert; +array_methods.pop = table.remove; +array_methods.concat = table.concat; +array_methods.length = function (t) return #t; end + +--- These methods always create a new array function array.collect(f, s, var) local t, var = {}; while true do @@ -85,6 +96,23 @@ function array.collect(f, s, var) return setmetatable(t, array_mt); end +--- + +-- Setup methods from array_base +for method, f in pairs(array_base) do + local method = method; -- Yes, this is necessary :) + local base_method = f; + -- Setup global array method which makes new array + array[method] = function (old_a, ...) + local a = new_array(); + return base_method(a, old_a, ...); + end + -- Setup per-array (mutating) method + array_methods[method] = function (self, ...) + return base_method(self, self, ...); + end +end + _G.array = array; module("array"); |