TeamPGM/pyrogram
2
0
Fork 0
mirror of https://github.com/TeamPGM/pyrogram.git synced 2024-11-16 20:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't raise exceptions in case of non-existent plugins folder

Browse Source 
Don't even warn in case the default plugins folder doesn't exist
This commit is contained in:
Dan 2018-10-12 14:32:35 +02:00
parent 0b79f96b4f
commit 4e516d097f
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pyrogram/client/client.py
View File

@ -231,22 +231,30 @@ class Client(Methods, BaseClient):
)
if self.plugins_dir is not None:
for i in os.listdir(self.plugins_dir):
module = import_module("{}.{}".format(self.plugins_dir, i.split(".")[0]))
try:
dirs = os.listdir(self.plugins_dir)
except FileNotFoundError as e:
if self.plugins_dir == Client.PLUGINS_DIR:
pass
else:
log.warning(e)
else:
for i in dirs:
module = import_module("{}.{}".format(self.plugins_dir, i.split(".")[0]))
for j in dir(module):
# noinspection PyBroadException
try:
handler, group = getattr(module, j)
for j in dir(module):
# noinspection PyBroadException
try:
handler, group = getattr(module, j)
if isinstance(handler, Handler) and isinstance(group, int):
self.add_handler(handler, group)
if isinstance(handler, Handler) and isinstance(group, int):
self.add_handler(handler, group)
log.info('{}("{}") from "{}/{}" registered in group {}'.format(
type(handler).__name__, j, self.plugins_dir, i, group)
)
except Exception:
pass
log.info('{}("{}") from "{}/{}" registered in group {}'.format(
type(handler).__name__, j, self.plugins_dir, i, group)
)
except Exception:
pass
self.session.start()
self.is_started = True