scripts for tld filters

crossing fingers

.github/workflows/update.yml

@@ -6,6 +6,7 @@ on:
       - master
     paths:
       - 'sources/**.txt'
+      - 'filters/**.txt'
   workflow_dispatch:
 
 jobs:

filters/TLDs.txt

@@ -0,0 +1,2 @@
+gop
+republican

scripts/domains_to_adblock.py

@@ -2,9 +2,16 @@
 # Usage:
 #	python domains_to_adblock.py > adblock.txt
 
-text_file = open("domains.txt", "r")
-lines = text_file.readlines()
-text_file.close()
+with open("domains.txt", "r") as domains:
+	linesdomains = domains.readlines()
+
+# Additional filters
+## TLDs
+with open("filters/TLDs.txt", "r") as tlds:
+	linestlds = tlds.readlines()
+
+# Complete list generation
+lines = linesdomains + linestlds
 
 for line in lines:
 	print('||' + line.strip() + '^')

scripts/domains_to_dnsmasq.py

@@ -1,9 +1,17 @@
 # This script converts domains.txt into dnsmasq's blocking syntax.
+# Usage:
 #	python domains_to_dnsmasq.py > dnsmasq.txt
 
-text_file = open("domains.txt", "r")
-lines = text_file.readlines()
-text_file.close()
+with open("domains.txt", "r") as domains:
+	linesdomains = domains.readlines()
+
+# Additional filters
+## TLDs
+with open("filters/TLDs.txt", "r") as tlds:
+	linestlds = tlds.readlines()
+
+# Complete list generation
+lines = linesdomains + linestlds
 
 for line in lines:
 	print('address=/' + line.strip() + '/')

scripts/domains_to_ublacklist.py

@@ -2,9 +2,16 @@
 # Usage:
 #	python domains_to_ublacklist.py > ublacklist.txt
 
-text_file = open("domains.txt", "r")
-lines = text_file.readlines()
-text_file.close()
+with open("domains.txt", "r") as domains:
+	linesdomains = domains.readlines()
+
+# Additional filters
+## TLDs
+with open("filters/TLDs.txt", "r") as tlds:
+	linestlds = tlds.readlines()
+
+# Complete list generation
+lines = linesdomains + linestlds
 
 for line in lines:
 	print('*://*.' + line.strip() + '/*')

scripts/update.sh

@@ -31,15 +31,14 @@ python scripts/domains_to_hosts.py > hosts.txt
 cp hosts.txt etc_hosts.txt # Previous filename for PiHole installations still subscribed to the old url.
 python scripts/domains_to_hosts_ipv6.py > hosts.txt.ipv6
 python scripts/domains_to_dnsmasq.py > dnsmasq.txt
-cat ./filters/dnsmasq.txt >> dnsmasq.txt
 
 ## For browser extensions.
 python scripts/domains_to_netsane.py > netsane.txt
 python scripts/domains_to_adblock.py > adblock_temp.txt
 cp ./headers/adblock.txt adblock.txt
-cat adblock_temp.txt ./filters/adblock.txt >> adblock.txt
+cat adblock_temp.txt >> adblock.txt
 rm adblock_temp.txt
 python scripts/domains_to_ublacklist.py > ublacklist_temp.txt
 cp ./headers/adblock.txt ublacklist.txt # Currently using the same adblock header until uBlacklist implements its own header. https://github.com/iorate/ublacklist/issues/351
-cat ublacklist_temp.txt ./filters/ublacklist.txt >> ublacklist.txt
+cat ublacklist_temp.txt >> ublacklist.txt
 rm ublacklist_temp.txt

sources/Police and army/README.md

@@ -0,0 +1 @@
+Anything related to Blue Live Matters, the Thin Blue Line, etc.