diff options
| -rw-r--r-- | src/infini/logging.py | 3 | ||||
| -rw-r--r-- | src/infini/matcher.py | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/infini/logging.py b/src/infini/logging.py index d9b4ecc1..979fee7d 100644 --- a/src/infini/logging.py +++ b/src/infini/logging.py @@ -11,7 +11,8 @@ from .settings import DEBUG __all__ = ["logger", "error_or_exception"] -logger = multilogger(name="Infini", payload="Core", level="DEBUG" if DEBUG else "INFO") +logger = multilogger(name="Infini", payload="Core", + level="DEBUG" if DEBUG else "INFO") CURRENT_PATH = Path(__file__).resolve().parent DATA_PATH = Path.home() / ".infini" LOG_PATH = DATA_PATH / "logs" diff --git a/src/infini/matcher.py b/src/infini/matcher.py index 364bc5ea..8c11ff29 100644 --- a/src/infini/matcher.py +++ b/src/infini/matcher.py @@ -1,3 +1,8 @@ +"""Infini Matcher + +用于处理和匹配事件。 +""" + from .register import Register, register from .event import MatcherEvent from .handler import Handler @@ -10,14 +15,11 @@ class Matcher: register: Register def __init__(self, _register: Register | None = None) -> None: - self.register = _register if _register else register + self.register = _register or register def match(self, name: str) -> Handler: if handler := self.register.handlers.match(name): - if isinstance(handler, Handler): - return handler - else: - return handler() + return handler if isinstance(handler, Handler) else handler() else: raise UnknownMatcherEvent(f"未知的规则包: {name}") @@ -25,7 +27,7 @@ class Matcher: callback_event = self.match(event.name).process(event) return self.register.events.process( callback_event.name, - **callback_event.kwargs if callback_event.kwargs else callback_event.kwargs, + **callback_event.kwargs or callback_event.kwargs, ) |