From 9e8a5c0c2e1ddd423461055ce8fd5e88ffe87abb Mon Sep 17 00:00:00 2001 From: Balakrishnan Balasubramanian Date: Sun, 11 Jun 2023 20:14:50 -0400 Subject: [PATCH] small refactor --- mail4one/config.py | 37 ++++++++++++++++++++----------------- mail4one/config_test.py | 4 ++-- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/mail4one/config.py b/mail4one/config.py index b855c1a..8e37aaf 100644 --- a/mail4one/config.py +++ b/mail4one/config.py @@ -51,7 +51,11 @@ class Config(Jata): matches: list[Match] -def parse_rules(cfg: Config) -> list[tuple[str, Callable[[str], bool], bool]]: +CheckerFn = Callable[[str], bool] +Checker = tuple[str, CheckerFn, bool] + + +def parse_checkers(cfg: Config) -> list[Checker]: def make_match_fn(m: Match): if m.addrs and m.addr_rexs: @@ -71,28 +75,27 @@ def parse_rules(cfg: Config) -> list[tuple[str, Callable[[str], bool], bool]]: } matches[DEFAULT_MATCH_ALL] = lambda _: True - def flat_rules(): - for mbox in cfg.boxes: - for rule in mbox.rules: - rule = Rule(rule) - fn = matches[rule.match_name] - if rule.negate: - match_fn = lambda malias, fn=fn: not fn(malias) - else: - match_fn = fn - yield (mbox.name, match_fn, rule.stop_check) + def make_checker(mbox_name: str, rule: Rule) -> Checker: + fn = matches[rule.match_name] + if rule.negate: + match_fn = lambda malias: not fn(malias) + else: + match_fn = fn + return mbox_name, match_fn, rule.stop_check - return list(flat_rules()) + return [ + make_checker(mbox.name, Rule(rule)) for mbox in cfg.boxes + for rule in mbox.rules + ] -def get_mboxes( - addr: str, rules: list[tuple[str, Callable[[str], bool], - bool]]) -> list[str]: +def get_mboxes(addr: str, checks: list[Checker]) -> list[str]: def inner(): - for mbox, match_fn, stop_check in rules: + for mbox, match_fn, stop_check in checks: if match_fn(addr): - yield mbox + if mbox != DEFAULT_NULL_MBOX: + yield mbox if stop_check: return diff --git a/mail4one/config_test.py b/mail4one/config_test.py index f14c1a2..aa64bf4 100644 --- a/mail4one/config_test.py +++ b/mail4one/config_test.py @@ -61,12 +61,12 @@ class TestConfig(unittest.TestCase): def test_parse_rules(self) -> None: cfg = config.Config(TEST_CONFIG) - op = config.parse_rules(cfg) + op = config.parse_checkers(cfg) self.assertEqual(len(op), 3) def test_get_mboxes(self) -> None: cfg = config.Config(TEST_CONFIG) - rules = config.parse_rules(cfg) + rules = config.parse_checkers(cfg) self.assertEqual(config.get_mboxes("foo@bar.com", rules), ['spam']) self.assertEqual(config.get_mboxes("foo@mydomain.com", rules), ['all']) self.assertEqual(config.get_mboxes("first.last@mydomain.com", rules),