mirror of
https://github.com/DandelionSprout/adfilt.git
synced 2026-10-06 10:54:55 +01:00
Removed IP address filtering from the AdGuard version
As per https://github.com/AdguardTeam/AdguardFilters/issues/41275#issuecomment-536003247.
This commit is contained in:
Imre Kristoffer Eilertsen
@@ -1,6 +1,6 @@
|
||||
msFilterList
|
||||
# Version: 26September2019v2-Beta
|
||||
# Version: 260920192 (for Adblock Plus' issue report system)
|
||||
# Version: 27September2019v1-Beta
|
||||
# Version: 270920191 (for Adblock Plus' issue report system)
|
||||
# Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider
|
||||
# Translated title: Dandelion Sprout's Nordic filters for tidier websites
|
||||
: expires = 1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Adblock Plus 3.4]
|
||||
! Version: 26September2019v2
|
||||
! Version: 260920192 (for Adblock Plus' issue report system)
|
||||
! Version: 27September2019v1
|
||||
! Version: 270920191 (for Adblock Plus' issue report system)
|
||||
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)
|
||||
! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus)
|
||||
! Expires: 12 hours
|
||||
@@ -52,7 +52,6 @@
|
||||
##div[data-contenttype="ad"]
|
||||
##optimus-element[id^="art-bazaarAd-"][version="default"]
|
||||
.oasfile
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
@@||fagbladetjournalen.no/*/300x250_
|
||||
@@||seher.no/reise$generichide
|
||||
bt.dk##.hidden-md-down.col-xl-12
|
||||
@@ -123,8 +122,6 @@ viafree.no,viafree.dk##.pause-ad
|
||||
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
|
||||
||getsentry.com^$third-party,domain=viafree.no|viafree.dk
|
||||
||sentry-cdn.com^$third-party,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
||ssl.p.jwpcdn.com^*/freewheel.js$script,domain=eurosport.no|eurosport.dk
|
||||
||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no
|
||||
||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk
|
||||
@@ -597,10 +594,14 @@ langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opac
|
||||
||elderlyscissors.com^
|
||||
@@||eurosport.no^$generichide
|
||||
minmote.no,godt.no##.adblock-info
|
||||
@@||fwmrm.net/libs/adm/*/AdManager.js$script,domain=viafree.dk|viafree.no
|
||||
@@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/*/AdManager.js$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party
|
||||
@@||eurosport.*^$generichide
|
||||
godt.no##.adblock-info-box
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
|
||||
@@||bildeler.name$generichide
|
||||
@@||reservedele.name$generichide
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[AdGuard ≥6]
|
||||
! Version: 26September2019v2
|
||||
! Version: 27September2019v1
|
||||
|
||||
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
|
||||
! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
|
||||
@@ -52,7 +52,6 @@
|
||||
##div[data-contenttype="ad"]
|
||||
##optimus-element[id^="art-bazaarAd-"][version="default"]
|
||||
.oasfile
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
@@||fagbladetjournalen.no/*/300x250_
|
||||
@@||seher.no/reise$generichide
|
||||
bt.dk##.hidden-md-down.col-xl-12
|
||||
@@ -131,8 +130,6 @@ viafree.no,viafree.dk##.pause-ad
|
||||
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
|
||||
||getsentry.com^$third-party,domain=viafree.no|viafree.dk
|
||||
||sentry-cdn.com^$third-party,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
||ssl.p.jwpcdn.com^*/freewheel.js$important,script,domain=eurosport.no|eurosport.dk
|
||||
||ssl.p.jwpcdn.com^*/jwpsrv.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no
|
||||
||ssl.p.jwpcdn.com^*/sharing.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk
|
||||
@@ -636,7 +633,10 @@ langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opac
|
||||
||elderlyscissors.com^
|
||||
@@||eurosport.no^$generichide
|
||||
minmote.no,godt.no##.adblock-info
|
||||
@@||fwmrm.net/libs/adm/*/AdManager.js$script,domain=viafree.dk|viafree.no
|
||||
@@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/*/AdManager.js$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
|
||||
||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party
|
||||
vg.no##+js(addEventListener-defuser.js, load, concat)
|
||||
1200kcalkostplan.dk,1800kcalkostplan.dk##+js(abort-on-property-write.js, KillAdBlock)
|
||||
@@ -648,6 +648,7 @@ dagensbyggeri.dk##+js(setTimeout-defuser.js, (), 2500)
|
||||
godt.no##.adblock-info-box
|
||||
||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.dk|dplay.no
|
||||
||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.dk|dplay.no
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
!#if !ext_ublock
|
||||
@@||bildeler.name$generichide
|
||||
@@||reservedele.name$generichide
|
||||
@@ -1144,146 +1145,3 @@ fuglelyder.net#@##banner_ad
|
||||
||nofotballshop.com^$empty,important
|
||||
||nofotballstore.com^$empty,important
|
||||
||dkfodboldstore.com^$empty,important
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
! Experimental use of «$network» to block IP addresses from my IP list version
|
||||
3.210.252.48$network
|
||||
3.248.18.175$network
|
||||
5.39.220.85$network
|
||||
13.225.212.101$network
|
||||
13.225.212.53$network
|
||||
13.225.62.2$network
|
||||
18.189.126.183$network
|
||||
23.227.38.32$network
|
||||
23.23.86.44$network
|
||||
23.27.73.214$network
|
||||
23.94.235.88$network
|
||||
23.95.244.102$network
|
||||
31.169.51.140$network
|
||||
31.222.200.102$network
|
||||
31.222.201.66$network
|
||||
31.222.202.71$network
|
||||
31.3.65.30$network
|
||||
35.186.219.42$network
|
||||
35.227.255.245$network
|
||||
35.241.20.53$network
|
||||
37.157.2.236$network
|
||||
43.248.10.237$network
|
||||
45.58.146.154$network
|
||||
46.183.136.42$network
|
||||
46.250.210.141$network
|
||||
46.30.215.134$network
|
||||
47.91.170.222$network
|
||||
50.63.202.42$network
|
||||
52.164.250.133$network
|
||||
52.216.109.170$network
|
||||
52.58.78.16$network
|
||||
54.157.54.26$network
|
||||
62.50.190.101$network
|
||||
67.227.226.240$network
|
||||
69.172.201.153$network
|
||||
74.91.20.131$network
|
||||
77.234.171.173$network
|
||||
81.95.105.70$network
|
||||
82.196.13.38$network
|
||||
83.221.150.162$network
|
||||
86.48.36.52$network
|
||||
89.188.76.230$network
|
||||
89.248.170.156$network
|
||||
91.189.177.154$network
|
||||
91.225.60.235$network
|
||||
94.23.105.26$network
|
||||
95.128.27.38$network
|
||||
98.126.4.66$network
|
||||
100.42.68.162$network
|
||||
103.232.215.144$network
|
||||
104.140.186.144$network
|
||||
104.164.143.147$network
|
||||
104.164.177.83$network
|
||||
104.165.52.83$network
|
||||
104.18.119.98$network
|
||||
104.18.32.122$network
|
||||
104.237.152.201$network
|
||||
104.24.111.20$network
|
||||
104.24.119.5$network
|
||||
104.24.124.114$network
|
||||
104.24.97.65$network
|
||||
104.27.145.13$network
|
||||
104.28.4.240$network
|
||||
104.28.8.151$network
|
||||
107.150.93.71$network
|
||||
107.172.160.239$network
|
||||
107.172.160.99$network
|
||||
107.172.163.217$network
|
||||
107.172.163.50$network
|
||||
107.172.169.215$network
|
||||
107.173.121.244$network
|
||||
107.173.172.61$network
|
||||
107.173.172.62$network
|
||||
107.174.198.168$network
|
||||
107.174.201.232$network
|
||||
107.174.202.107$network
|
||||
107.179.67.145$network
|
||||
122.10.109.175$network
|
||||
136.243.23.201$network
|
||||
141.255.161.124$network
|
||||
142.93.134.57$network
|
||||
151.80.13.35$network
|
||||
154.92.189.29$network
|
||||
156.234.4.218$network
|
||||
158.255.2.99$network
|
||||
159.8.209.70$network
|
||||
160.153.128.26$network
|
||||
165.231.102.178$network
|
||||
165.231.198.15$network
|
||||
165.231.2.215$network
|
||||
165.231.202.19$network
|
||||
167.160.13.5$network
|
||||
172.217.12.198$network
|
||||
172.241.59.200$network
|
||||
172.241.59.217$network
|
||||
172.241.59.218$network
|
||||
172.255.61.238$network
|
||||
172.82.206.20$network
|
||||
173.82.167.117$network
|
||||
173.82.48.54$network
|
||||
176.9.53.166$network
|
||||
184.168.131.241$network
|
||||
185.13.40.150$network
|
||||
185.191.120.62$network
|
||||
185.53.177.20$network
|
||||
185.53.179.7$network
|
||||
185.53.179.8$network
|
||||
185.57.253.48$network
|
||||
185.65.143.249$network
|
||||
185.87.187.198$network
|
||||
192.64.147.215$network
|
||||
193.106.122.91$network
|
||||
194.63.248.52$network
|
||||
194.63.249.232$network
|
||||
195.149.158.3$network
|
||||
195.178.187.50$network
|
||||
196.196.112.67$network
|
||||
196.196.113.215$network
|
||||
196.196.115.171$network
|
||||
196.196.115.36$network
|
||||
196.196.118.17$network
|
||||
196.196.252.54$network
|
||||
196.247.26.241$network
|
||||
198.211.23.249$network
|
||||
198.54.117.197$network
|
||||
198.55.28.201$network
|
||||
199.115.115.102$network
|
||||
199.59.242.152$network
|
||||
202.208.203.101$network
|
||||
204.15.79.70$network
|
||||
208.43.231.246$network
|
||||
209.124.66.22$network
|
||||
213.236.166.56$network
|
||||
216.157.88.25$network
|
||||
217.65.231.100$network
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
! Version: 26September2019v2
|
||||
! Version: 27September2019v1
|
||||
|
||||
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)
|
||||
! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings)
|
||||
@@ -52,7 +52,6 @@
|
||||
##div[data-contenttype="ad"]
|
||||
##optimus-element[id^="art-bazaarAd-"][version="default"]
|
||||
.oasfile
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
@@||fagbladetjournalen.no/*/300x250_
|
||||
@@||seher.no/reise$generichide
|
||||
bt.dk##.hidden-md-down.col-xl-12
|
||||
@@ -131,8 +130,6 @@ viafree.*##.pause-ad
|
||||
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
|
||||
||getsentry.com^$3p,domain=viafree.no|viafree.dk
|
||||
||sentry-cdn.com^$3p,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xhr,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
|
||||
||ssl.p.jwpcdn.com^*/freewheel.js$important,script,domain=eurosport.no|eurosport.dk
|
||||
||ssl.p.jwpcdn.com^*/jwpsrv.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no
|
||||
||ssl.p.jwpcdn.com^*/sharing.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk
|
||||
@@ -636,7 +633,10 @@ langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opac
|
||||
||elderlyscissors.com^
|
||||
@@||eurosport.no^$generichide
|
||||
minmote.no,godt.no##.adblock-info
|
||||
@@||fwmrm.net/libs/adm/*/AdManager.js$script,domain=viafree.dk|viafree.no
|
||||
@@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/*/AdManager.js$script,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/ad/$xhr,domain=viafree.no|viafree.dk
|
||||
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
|
||||
||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p
|
||||
vg.no##+js(addEventListener-defuser.js, load, concat)
|
||||
1200kcalkostplan.dk,1800kcalkostplan.dk##+js(abort-on-property-write.js, KillAdBlock)
|
||||
@@ -648,6 +648,7 @@ dagensbyggeri.dk##+js(setTimeout-defuser.js, (), 2500)
|
||||
godt.no##.adblock-info-box
|
||||
||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.dk|dplay.no
|
||||
||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.dk|dplay.no
|
||||
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
|
||||
!#if !ext_ublock
|
||||
@@||bildeler.name$generichide
|
||||
@@||reservedele.name$generichide
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{+block}
|
||||
# Version: 26September2019v2-Alpha
|
||||
# Version: 260920192 (for Adblock Plus' issue report system)
|
||||
# Version: 27September2019v1-Alpha
|
||||
# Version: 270920191 (for Adblock Plus' issue report system)
|
||||
# Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy)
|
||||
# Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy)
|
||||
# Expires: 12 hours
|
||||
|
||||
@@ -9,6 +9,7 @@ UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$']
|
||||
UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#']
|
||||
|
||||
OUTPUT = 'xyzzyx.txt'
|
||||
OUTPUT_AG = 'NordicFiltersAdGuard.txt'
|
||||
OUTPUT_ABP = 'NordicFiltersABP.txt'
|
||||
OUTPUT_TPL = 'DandelionSproutsNorskeFiltre.tpl'
|
||||
OUTPUT_PRIVOXY = 'NordicFiltersPrivoxy.action'
|
||||
@@ -22,6 +23,135 @@ def download_filters() -> str:
|
||||
text += r.text
|
||||
return text
|
||||
|
||||
# ——— AdGuard version ———
|
||||
|
||||
# function that prepares the filter list for AdGuard
|
||||
def prepare_ag(lines) -> str:
|
||||
text = ''
|
||||
|
||||
for line in lines:
|
||||
|
||||
# until this is done: https://github.com/AdguardTeam/CoreLibs/issues/152
|
||||
line = re.sub(
|
||||
r"([\$,])doc.*",
|
||||
r"\1empty,important",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"(itle:.*Dandelion Sprout.*)",
|
||||
r"\1 (for AdGuard)",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"! Version: [0-9][0-9][0-9][0-9].*",
|
||||
"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"\[Adblock Plus 3.4\]",
|
||||
"[AdGuard ≥6]",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"! Redirect:.*",
|
||||
"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,])xhr",
|
||||
r"\1xmlhttprequest",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,~])3p",
|
||||
r"\1third-party",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,])1p",
|
||||
r"\1~third-party",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"viaplay.\*#",
|
||||
"viaplay.no,viaplay.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"google.\*#",
|
||||
"google.no,google.dk,google.is#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"eurogamer.\*#",
|
||||
"eurogamer.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"ticketmaster.\*#",
|
||||
"ticketmaster.no,ticketmaster.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"qxl.\*#",
|
||||
"qxl.no,qxl.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"expedia.\*#",
|
||||
"expedia.no,expedia.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"gamereactor.\*#",
|
||||
"gamereactor.no,gamereactor.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"viafree.\*#",
|
||||
"viafree.no,viafree.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"momondo.\*#",
|
||||
"momondo.no,monondo.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"eurosport.\*#",
|
||||
"eurosport.no,eurosport.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"prisjakt.\*,",
|
||||
"prisjakt.no,",
|
||||
line
|
||||
)
|
||||
|
||||
text += line + '\r\n'
|
||||
|
||||
return text
|
||||
|
||||
# ——— Adblock Plus version ———
|
||||
|
||||
def is_supported_abp(line) -> bool:
|
||||
for token in UNSUPPORTED_ABP:
|
||||
if token in line:
|
||||
@@ -644,6 +774,7 @@ if __name__ == "__main__":
|
||||
lines = text.splitlines(False)
|
||||
print('Total number of rules: ' + str(len(lines)))
|
||||
|
||||
ag_filter = prepare_ag(lines)
|
||||
abp_filter = prepare_abp(lines)
|
||||
tpl_filter = prepare_tpl(lines)
|
||||
privoxy_filter = prepare_privoxy(lines)
|
||||
@@ -652,6 +783,9 @@ if __name__ == "__main__":
|
||||
with open(OUTPUT, "w") as text_file:
|
||||
text_file.write(text)
|
||||
|
||||
with open(OUTPUT_AG, "w") as text_file:
|
||||
text_file.write(ag_filter)
|
||||
|
||||
with open(OUTPUT_ABP, "w") as text_file:
|
||||
text_file.write(abp_filter)
|
||||
|
||||
@@ -668,179 +802,6 @@ if __name__ == "__main__":
|
||||
|
||||
|
||||
|
||||
import requests
|
||||
import re
|
||||
|
||||
SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianList.txt', 'https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersIPs.txt']
|
||||
|
||||
OUTPUT_AG = 'NordicFiltersAdGuard.txt'
|
||||
|
||||
# function that downloads the filter list
|
||||
def download_filters() -> str:
|
||||
text = ''
|
||||
for url in SOURCES:
|
||||
r = requests.get(url)
|
||||
text += r.text
|
||||
return text
|
||||
|
||||
# function that prepares the filter list for AdGuard
|
||||
def prepare_ag(lines) -> str:
|
||||
text = ''
|
||||
|
||||
for line in lines:
|
||||
|
||||
# until this is done: https://github.com/AdguardTeam/CoreLibs/issues/152
|
||||
line = re.sub(
|
||||
r"([\$,])doc.*",
|
||||
r"\1empty,important",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"(itle:.*Dandelion Sprout.*)",
|
||||
r"\1 (for AdGuard)",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"! Version: [0-9][0-9][0-9][0-9].*",
|
||||
"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"\[Adblock Plus 3.4\]",
|
||||
"[AdGuard ≥6]",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"! Redirect:.*",
|
||||
"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,])xhr",
|
||||
r"\1xmlhttprequest",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,~])3p",
|
||||
r"\1third-party",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"([$,])1p",
|
||||
r"\1~third-party",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"viaplay.\*#",
|
||||
"viaplay.no,viaplay.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"google.\*#",
|
||||
"google.no,google.dk,google.is#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"eurogamer.\*#",
|
||||
"eurogamer.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"ticketmaster.\*#",
|
||||
"ticketmaster.no,ticketmaster.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"qxl.\*#",
|
||||
"qxl.no,qxl.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"expedia.\*#",
|
||||
"expedia.no,expedia.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"gamereactor.\*#",
|
||||
"gamereactor.no,gamereactor.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"viafree.\*#",
|
||||
"viafree.no,viafree.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"momondo.\*#",
|
||||
"momondo.no,monondo.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"eurosport.\*#",
|
||||
"eurosport.no,eurosport.dk#",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
"prisjakt.\*,",
|
||||
"prisjakt.no,",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"# For more information and details.*",
|
||||
"! Experimental use of «$network» to block IP addresses from my IP list version",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^# .*",
|
||||
"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^([0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?\.[0-9][0-9]?[0-9]?)$",
|
||||
r"\1$network",
|
||||
line
|
||||
)
|
||||
|
||||
text += line + '\r\n'
|
||||
|
||||
return text
|
||||
|
||||
if __name__ == "__main__":
|
||||
print('Starting the script')
|
||||
text = download_filters()
|
||||
lines = text.splitlines(False)
|
||||
print('Total number of rules: ' + str(len(lines)))
|
||||
|
||||
ag_filter = prepare_ag(lines)
|
||||
|
||||
with open(OUTPUT_AG, "w") as text_file:
|
||||
text_file.write(ag_filter)
|
||||
|
||||
print('The AdGuard list version has been generated.')
|
||||
|
||||
|
||||
|
||||
import requests
|
||||
import re
|
||||
|
||||
|
||||
Reference in New Issue
Block a user