From 8c744d621eda0c38dcfcfeed02900623a77bc5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Tue, 3 Dec 2019 18:43:23 +0100 Subject: [PATCH] Removed too restrictive source Was blocking ssl.ovh.net and akaimi.net --- fetch_resources.sh | 2 +- filter_subdomains.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fetch_resources.sh b/fetch_resources.sh index 107635f..1875276 100755 --- a/fetch_resources.sh +++ b/fetch_resources.sh @@ -17,7 +17,7 @@ dl https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.tx dl https://raw.githubusercontent.com/StevenBlack/hosts/master/data/add.2o7Net/hosts rules_hosts/add2o7.cache.txt dl https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt rules_hosts/spy.cache.txt dl https://raw.githubusercontent.com/Kees1958/WS3_annual_most_used_survey_blocklist/master/w3tech_hostfile.txt rules/w3tech.cache.list -dl https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt rules_hosts/ads-and-tracking-extended.cache.txt +# dl https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt rules_hosts/ads-and-tracking-extended.cache.txt # dl https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/android-tracking.txt rules_hosts/android-tracking.cache.txt # dl https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt rules_hosts/smart-tv.cache.txt # dl https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt rules_hosts/amazon-fire-tv.cache.txt diff --git a/filter_subdomains.py b/filter_subdomains.py index d523c69..1c13c7c 100755 --- a/filter_subdomains.py +++ b/filter_subdomains.py @@ -92,11 +92,15 @@ if __name__ == '__main__': for rule in args.rules: register_rule(rule.strip()) - # Reading domains to filter + # Approximating line count if args.input.seekable(): - progress.max_value = len(args.input.readlines()) + lines = 0 + for line in args.input: + lines += 1 + progress.max_value = lines args.input.seek(0) + # Reading domains to filter reader = csv.reader(args.input) progress.start() for chain in reader: