From 1e85536babbad8061f9f0575be01ef7980e9c4d6 Mon Sep 17 00:00:00 2001 From: Andrei Date: Mon, 10 Oct 2016 01:32:04 -0500 Subject: [PATCH] Move away from globals() in GatewayEvent Instead of the inflection/globals bullshit we where doing for each GatewayEvent recieved, now just lookup the discord version of the event type in a mapping. Metaclass is used to not-to-magically generate the mapping. This should be quite a bit more performant, and way less silly. --- disco/gateway/events.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/disco/gateway/events.py b/disco/gateway/events.py index 55dd3b1..18e505b 100644 --- a/disco/gateway/events.py +++ b/disco/gateway/events.py @@ -9,10 +9,23 @@ from disco.types.message import Message from disco.types.voice import VoiceState from disco.types.guild import Guild, GuildMember, Role -from disco.types.base import Model, Field, snowflake, listof +from disco.types.base import Model, ModelMeta, Field, snowflake, listof +# Mapping of discords event name to our event classes +EVENTS_MAP = {} -class GatewayEvent(Model): + +class GatewayEventMeta(ModelMeta): + def __new__(cls, name, parents, dct): + obj = super(GatewayEventMeta, cls).__new__(cls, name, parents, dct) + + if name != 'GatewayEvent': + EVENTS_MAP[inflection.underscore(name).upper()] = obj + + return obj + + +class GatewayEvent(six.with_metaclass(GatewayEventMeta, Model)): """ The GatewayEvent class wraps various functionality for events passed to us over the gateway websocket, and serves as a simple proxy to inner values for @@ -25,7 +38,7 @@ class GatewayEvent(Model): """ Create a new GatewayEvent instance based on event data. """ - cls = globals().get(inflection.camelize(data['t'].lower())) + cls = EVENTS_MAP.get(data['t']) if not cls: raise Exception('Could not find cls for {} ({})'.format(data['t'], data))