From ea0b1142fdf5af4378ca3448adffc0f3502460af Mon Sep 17 00:00:00 2001 From: Johnshall <71166067+Johnshall@users.noreply.github.com> Date: Fri, 20 May 2022 18:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=90=20Add=20ad=5Fignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- factory/ad.py | 17 +++++++++++++++++ factory/resultant/ad_ignore.list | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 factory/resultant/ad_ignore.list diff --git a/factory/ad.py b/factory/ad.py index 2e6d13f..74a5c78 100644 --- a/factory/ad.py +++ b/factory/ad.py @@ -50,6 +50,19 @@ for rule_url in rules_url: rule = rule + r.text + '\n' +# except rules +ignore = [] +ad_ignore = sys.stdout +try: + if sys.version_info.major == 3: + ad_ignore = open('resultant/ad_ignore.list', 'r', encoding='utf-8') + else: + ad_ignore = open('resultant/ad_ignore.list', 'r') +except: + pass +for ig in ad_ignore.readlines(): + if ig[0] != '#' and ig != '\n': + ignore.append(ig.strip()) # parse rule rule = rule.split('\n') @@ -90,6 +103,10 @@ for row in rule: if re.search(r'[/^:*]', row): print('ignore: '+row0) continue + + # 去除 ignore 中的内容 + if row in ignore: + continue # 只匹配域名或 IP if re.match(r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,9}$', row) or re.match(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$', row): diff --git a/factory/resultant/ad_ignore.list b/factory/resultant/ad_ignore.list new file mode 100644 index 0000000..32d8c7d --- /dev/null +++ b/factory/resultant/ad_ignore.list @@ -0,0 +1,2 @@ +# This file is used to fix the wrong domains from upstream repositories +t.co