util.pluginloader: Return full file path from internal file loader on success, not...
[prosody.git] / util / events.lua
index dc294a5539456e55a6f9f9195efb19004d9af3f8..412acccd762cb755a9c0627f2689ea82b5989465 100644 (file)
@@ -1,99 +1,83 @@
-\r
-local ipairs = ipairs;\r
-local pairs = pairs;\r
-local t_insert = table.insert;\r
-local t_sort = table.sort;\r
-local select = select;\r
-\r
-module "events"\r
-\r
-function new()\r
-       local dispatchers = {};\r
-       local handlers = {};\r
-       local event_map = {};\r
-       local function _rebuild_index(event) -- TODO optimize index rebuilding\r
-               local _handlers = event_map[event];\r
-               local index = handlers[event];\r
-               if index then\r
-                       for i=#index,1,-1 do index[i] = nil; end\r
-               else index = {}; handlers[event] = index; end\r
-               for handler in pairs(_handlers) do\r
-                       t_insert(index, handler);\r
-               end\r
-               t_sort(index, function(a, b) return _handlers[a] > _handlers[b]; end);\r
-       end;\r
-       local function add_handler(event, handler, priority)\r
-               local map = event_map[event];\r
-               if map then\r
-                       map[handler] = priority or 0;\r
-               else\r
-                       map = {[handler] = priority or 0};\r
-                       event_map[event] = map;\r
-               end\r
-               _rebuild_index(event);\r
-       end;\r
-       local function remove_handler(event, handler)\r
-               local map = event_map[event];\r
-               if map then\r
-                       map[handler] = nil;\r
-                       _rebuild_index(event);\r
-               end\r
-       end;\r
-       local function add_plugin(plugin)\r
-               for event, handler in pairs(plugin) do\r
-                       add_handler(event, handler);\r
-               end\r
-       end;\r
-       local function remove_plugin(plugin)\r
-               for event, handler in pairs(plugin) do\r
-                       remove_handler(event, handler);\r
-               end\r
-       end;\r
-       local function _create_dispatcher(event) -- FIXME duplicate code in fire_event\r
-               local h = handlers[event];\r
-               if not h then h = {}; handlers[event] = h; end\r
-               local dispatcher = function(data)\r
-                       for _, handler in ipairs(h) do\r
-                               local ret = handler(data);\r
-                               if ret ~= nil then return ret; end\r
-                       end\r
-               end;\r
-               dispatchers[event] = dispatcher;\r
-               return dispatcher;\r
-       end;\r
-       local function get_dispatcher(event)\r
-               return dispatchers[event] or _create_dispatcher(event);\r
-       end;\r
-       local function fire_event(event, data) -- FIXME duplicates dispatcher code\r
-               local h = handlers[event];\r
-               if h then\r
-                       for _, handler in ipairs(h) do\r
-                               local ret = handler(data);\r
-                               if ret ~= nil then return ret; end\r
-                       end\r
-               end\r
-       end;\r
-       local function get_named_arg_dispatcher(event, ...)\r
-               local dispatcher = get_dispatcher(event);\r
-               local keys = {...};\r
-               local data = {};\r
-               return function(...)\r
-                       for i, key in ipairs(keys) do data[key] = select(i, ...); end\r
-                       dispatcher(data);\r
-               end;\r
-       end;\r
-       return {\r
-               add_handler = add_handler;\r
-               remove_handler = remove_handler;\r
-               add_plugin = add_plugin;\r
-               remove_plugin = remove_plugin;\r
-               get_dispatcher = get_dispatcher;\r
-               fire_event = fire_event;\r
-               get_named_arg_dispatcher = get_named_arg_dispatcher;\r
-               _dispatchers = dispatchers;\r
-               _handlers = handlers;\r
-               _event_map = event_map;\r
-       };\r
-end\r
-\r
-return _M;\r
+-- 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 pairs = pairs;
+local t_insert = table.insert;
+local t_sort = table.sort;
+local setmetatable = setmetatable;
+local next = next;
+
+module "events"
+
+function new()
+       local handlers = {};
+       local event_map = {};
+       local function _rebuild_index(handlers, event)
+               local _handlers = event_map[event];
+               if not _handlers or next(_handlers) == nil then return; end
+               local index = {};
+               for handler in pairs(_handlers) do
+                       t_insert(index, handler);
+               end
+               t_sort(index, function(a, b) return _handlers[a] > _handlers[b]; end);
+               handlers[event] = index;
+               return index;
+       end;
+       setmetatable(handlers, { __index = _rebuild_index });
+       local function add_handler(event, handler, priority)
+               local map = event_map[event];
+               if map then
+                       map[handler] = priority or 0;
+               else
+                       map = {[handler] = priority or 0};
+                       event_map[event] = map;
+               end
+               handlers[event] = nil;
+       end;
+       local function remove_handler(event, handler)
+               local map = event_map[event];
+               if map then
+                       map[handler] = nil;
+                       handlers[event] = nil;
+                       if next(map) == nil then
+                               event_map[event] = nil;
+                       end
+               end
+       end;
+       local function add_handlers(handlers)
+               for event, handler in pairs(handlers) do
+                       add_handler(event, handler);
+               end
+       end;
+       local function remove_handlers(handlers)
+               for event, handler in pairs(handlers) do
+                       remove_handler(event, handler);
+               end
+       end;
+       local function fire_event(event, ...)
+               local h = handlers[event];
+               if h then
+                       for i=1,#h do
+                               local ret = h[i](...);
+                               if ret ~= nil then return ret; end
+                       end
+               end
+       end;
+       return {
+               add_handler = add_handler;
+               remove_handler = remove_handler;
+               add_handlers = add_handlers;
+               remove_handlers = remove_handlers;
+               fire_event = fire_event;
+               _handlers = handlers;
+               _event_map = event_map;
+       };
+end
+
+return _M;