From 1f0de6b9cd0625b15d107d95592e0f88578cde3a Mon Sep 17 00:00:00 2001 From: wulan17 Date: Tue, 10 Sep 2024 14:54:54 +0700 Subject: [PATCH] pyrofork: Ignore excluded plugins Signed-off-by: wulan17 --- pyrogram/client.py | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/pyrogram/client.py b/pyrogram/client.py index 82c72df6b..be3dece33 100644 --- a/pyrogram/client.py +++ b/pyrogram/client.py @@ -865,11 +865,14 @@ def load_plugins(self): root = plugins["root"] include = plugins.get("include", []) exclude = plugins.get("exclude", []) + exclude_path = [path for path, _ in exclude] count = 0 if not include: for path in sorted(Path(root.replace(".", "/")).rglob("*.py")): + if exclude_path and path.name.replace(".py", "") in exclude_path: + continue module_path = '.'.join(path.parent.parts + (path.stem,)) module = import_module(module_path) @@ -888,6 +891,8 @@ def load_plugins(self): pass else: for path, handlers in include: + if exclude_path and path in exclude_path: + continue module_path = root.replace("/",".") + "." + path warn_non_existent_functions = True @@ -921,41 +926,6 @@ def load_plugins(self): log.warning('[{}] [LOAD] Ignoring non-existent function "{}" from "{}"'.format( self.name, name, module_path)) - if exclude: - for path, handlers in exclude: - module_path = root.replace("/",".") + "." + path - warn_non_existent_functions = True - - try: - module = import_module(module_path) - except ImportError: - log.warning('[%s] [UNLOAD] Ignoring non-existent module "%s"', self.name, module_path) - continue - - if "__path__" in dir(module): - log.warning('[%s] [UNLOAD] Ignoring namespace "%s"', self.name, module_path) - continue - - if handlers is None: - handlers = vars(module).keys() - warn_non_existent_functions = False - - for name in handlers: - # noinspection PyBroadException - try: - for handler, group in getattr(module, name).handlers: - if isinstance(handler, Handler) and isinstance(group, int): - self.remove_handler(handler, group) - - log.info('[{}] [UNLOAD] {}("{}") from group {} in "{}"'.format( - self.name, type(handler).__name__, name, group, module_path)) - - count -= 1 - except Exception: - if warn_non_existent_functions: - log.warning('[{}] [UNLOAD] Ignoring non-existent function "{}" from "{}"'.format( - self.name, name, module_path)) - if count > 0: log.info('[{}] Successfully loaded {} plugin{} from "{}"'.format( self.name, count, "s" if count > 1 else "", root))