mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

little optimization on handler dictionary building: code duplication lessened

Browse Source
This commit is contained in:
Max 2016-06-13 14:15:15 +03:00
parent 57486b18cd
commit eb4d58bec1
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
telebot/__init__.py
View File

@ -654,6 +654,12 @@ class TeleBot:
self.message_subscribers_next_step[k] = self.pre_message_subscribers_next_step[k] self.message_subscribers_next_step[k] = self.pre_message_subscribers_next_step[k]
self.pre_message_subscribers_next_step = {} self.pre_message_subscribers_next_step = {}
def _build_handler_dict(self, handler, **filters):
return {
'function': handler,
'filters': filters
}
def message_handler(self, commands=None, regexp=None, func=None, content_types=['text']): def message_handler(self, commands=None, regexp=None, func=None, content_types=['text']):
""" """
Message handler decorator. Message handler decorator.
@ -685,54 +691,34 @@ class TeleBot:
""" """
def decorator(handler): def decorator(handler):
self.add_message_handler(handler, commands, regexp, func, content_types) handler_dict = self._build_handler_dict(handler,
commands=commands,
regexp=regexp,
func=func,
content_types=content_types)
self.add_message_handler(handler_dict)
return handler return handler
return decorator return decorator
def add_message_handler(self, handler, commands=None, regexp=None, func=None, content_types=None): def add_message_handler(self, handler_dict):
if content_types is None:
content_types = ['text']
filters = {'content_types': content_types}
if regexp:
filters['regexp'] = regexp
if func:
filters['lambda'] = func
if commands:
filters['commands'] = commands
handler_dict = {
'function': handler,
'filters': filters
}
self.message_handlers.append(handler_dict) self.message_handlers.append(handler_dict)
def edited_message_handler(self, commands=None, regexp=None, func=None, content_types=['text']): def edited_message_handler(self, commands=None, regexp=None, func=None, content_types=['text']):
def decorator(handler): def decorator(handler):
self.add_edited_message_handler(handler, commands, regexp, func, content_types) handler_dict = self._build_handler_dict(handler,
commands=commands,
regexp=regexp,
func=func,
content_types=content_types)
self.add_edited_message_handler(handler_dict)
return handler return handler
return decorator return decorator
def add_edited_message_handler(self, handler, commands=None, regexp=None, func=None, content_types=None): def add_edited_message_handler(self, handler_dict):
if content_types is None:
content_types = ['text']
filters = {'content_types': content_types}
if regexp:
filters['regexp'] = regexp
if func:
filters['lambda'] = func
if commands:
filters['commands'] = commands
handler_dict = {
'function': handler,
'filters': filters
}
self.edited_message_handlers.append(handler_dict) self.edited_message_handlers.append(handler_dict)
def inline_handler(self, func): def inline_handler(self, func):