util.events: Add local reference to table.remove (fixes traceback)
[prosody.git] / util / events.lua
index 363d2ac6b0907977e862e281fb84756a6f03de91..81fbc13fc127e285c96f78b1d4d2d9d418c8891e 100644 (file)
@@ -1,35 +1,38 @@
 -- 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 ipairs = ipairs;
 local pairs = pairs;
 local t_insert = table.insert;
+local t_remove = table.remove;
 local t_sort = table.sort;
-local select = select;
+local setmetatable = setmetatable;
+local next = next;
 
 module "events"
 
 function new()
-       local dispatchers = {};
        local handlers = {};
+       local global_wrappers;
+       local wrappers = {};
        local event_map = {};
-       local function _rebuild_index(event) -- TODO optimize index rebuilding
+       local function _rebuild_index(handlers, event)
                local _handlers = event_map[event];
-               local index = handlers[event];
-               if index then
-                       for i=#index,1,-1 do index[i] = nil; end
-               else index = {}; handlers[event] = index; end
+               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
@@ -38,13 +41,16 @@ function new()
                        map = {[handler] = priority or 0};
                        event_map[event] = map;
                end
-               _rebuild_index(event);
+               handlers[event] = nil;
        end;
        local function remove_handler(event, handler)
                local map = event_map[event];
                if map then
                        map[handler] = nil;
-                       _rebuild_index(event);
+                       handlers[event] = nil;
+                       if next(map) == nil then
+                               event_map[event] = nil;
+                       end
                end
        end;
        local function add_handlers(handlers)
@@ -57,48 +63,85 @@ function new()
                        remove_handler(event, handler);
                end
        end;
-       local function _create_dispatcher(event) -- FIXME duplicate code in fire_event
-               local h = handlers[event];
-               if not h then h = {}; handlers[event] = h; end
-               local dispatcher = function(...)
-                       for i=1,#h do
-                               local ret = h[i](...);
-                               if ret ~= nil then return ret; end
-                       end
-               end;
-               dispatchers[event] = dispatcher;
-               return dispatcher;
-       end;
-       local function get_dispatcher(event)
-               return dispatchers[event] or _create_dispatcher(event);
-       end;
-       local function fire_event(event, ...) -- FIXME duplicates dispatcher code
-               local h = handlers[event];
+       local function _fire_event(event_name, event_data)
+               local h = handlers[event_name];
                if h then
                        for i=1,#h do
-                               local ret = h[i](...);
+                               local ret = h[i](event_data);
                                if ret ~= nil then return ret; end
                        end
                end
        end;
-       local function get_named_arg_dispatcher(event, ...)
-               local dispatcher = get_dispatcher(event);
-               local keys = {...};
-               local data = {};
-               return function(...)
-                       for i, key in ipairs(keys) do data[key] = select(i, ...); end
-                       dispatcher(data);
-               end;
-       end;
+       local function fire_event(event_name, event_data)
+               local w = wrappers[event_name] or global_wrappers;
+               if w then
+                       local curr_wrapper = #w;
+                       local function c(event_name, event_data)
+                               curr_wrapper = curr_wrapper - 1;
+                               if curr_wrapper == 0 then
+                                       if global_wrappers == nil or w == global_wrappers then
+                                               return _fire_event(event_name, event_data);
+                                       end
+                                       w, curr_wrapper = global_wrappers, #global_wrappers;
+                                       return w[curr_wrapper](c, event_name, event_data);
+                               else
+                                       return w[curr_wrapper](c, event_name, event_data);
+                               end
+                       end
+                       return w[curr_wrapper](c, event_name, event_data);
+               end
+               return _fire_event(event_name, event_data);
+       end
+       local function add_wrapper(event_name, wrapper)
+               local w;
+               if event_name == false then
+                       w = global_wrappers;
+                       if not w then
+                               w = {};
+                               global_wrappers = w;
+                       end
+               else
+                       w = wrappers[event_name];
+                       if not w then
+                               w = {};
+                               wrappers[event_name] = w;
+                       end
+               end
+               w[#w+1] = wrapper;
+       end
+       local function remove_wrapper(event_name, wrapper)
+               local w;
+               if event_name == false then
+                       w = global_wrappers;
+               else
+                       w = wrappers[event_name];
+               end
+               if not w then return; end
+               for i = #w, 1 do
+                       if w[i] == wrapper then
+                               t_remove(w, i);
+                       end
+               end
+               if #w == 0 then
+                       if event_name == nil then
+                               global_wrappers = nil;
+                       else
+                               wrappers[event_name] = nil;
+                       end
+               end
+       end
        return {
                add_handler = add_handler;
                remove_handler = remove_handler;
-               add_plugin = add_plugin;
-               remove_plugin = remove_plugin;
-               get_dispatcher = get_dispatcher;
+               add_handlers = add_handlers;
+               remove_handlers = remove_handlers;
+               wrappers = {
+                       add_handler = add_wrapper;
+                       remove_handler = remove_wrapper;
+               };
+               add_wrapper = add_wrapper;
+               remove_wrapper = remove_wrapper;
                fire_event = fire_event;
-               get_named_arg_dispatcher = get_named_arg_dispatcher;
-               _dispatchers = dispatchers;
                _handlers = handlers;
                _event_map = event_map;
        };