From e610038e65aa312ecfdcd71f0eef1f6388822e64 Mon Sep 17 00:00:00 2001 From: Muntashir Al-Islam Date: Tue, 20 Jul 2021 16:46:40 +0600 Subject: [PATCH] [UPDATE] Fix parsing remote files containing wildcards --- config/generate-domains-blocklist.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 config/generate-domains-blocklist.py diff --git a/config/generate-domains-blocklist.py b/config/generate-domains-blocklist.py old mode 100644 new mode 100755 index ca75d64..31fcc59 --- a/config/generate-domains-blocklist.py +++ b/config/generate-domains-blocklist.py @@ -61,13 +61,15 @@ def parse_list(content, trusted=False): rx_mdl = re.compile(r'^"[^"]+","([a-z0-9][a-z0-9.-]*[.][a-z]{2,})",') rx_b = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,}),.+,[0-9: /-]+,") rx_dq = re.compile(r"^address=/([a-z0-9][a-z0-9.-]*[.][a-z]{2,})/.") + rx_trusted = re.compile(r"^([*a-z0-9.-]+)\s*(@\S+)?$") + if trusted: return parse_trusted_list(content) names = set() time_restrictions = {} - rx_set = [rx_u, rx_l, rx_h, rx_mdl, rx_b, rx_dq] + rx_set = [rx_u, rx_l, rx_h, rx_mdl, rx_b, rx_dq, rx_trusted] for line in content.splitlines(): line = str.lower(str.strip(line)) if rx_comment.match(line):