Huge fix of TPL lists, part 1/2

As per #43.
This commit is contained in:
Imre Kristoffer Eilertsen
2019-09-12 16:48:45 +02:00
committed by GitHub
parent 9562a2d909
commit 6ffcdbea1c
6 changed files with 146 additions and 47 deletions
@@ -1,9 +1,9 @@
msFilterList
# Version: 04September2019v1-Beta
# Version: 040920191 (for Adblock Plus' issue report system)
# Version: 08September2019v1-Beta
# Version: 080920191 (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
: expires = 1
# Lisens Licence: https: github.com DandelionSprout adfilt blob master LICENSE.md
# 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https: github.com DandelionSprout adfilt blob master Wiki General-info.md#norsk
# 🇩🇰: Denne liste dækker websider for Danmark, Norge, Island, Færøerne, Grønland, og den samiske befolkning. For mere information, detaljer, nyttige værktøjer og andre lister, jeg har lavet, besøg https: github.com DandelionSprout adfilt blob master Wiki General-info.md
@@ -118,6 +118,8 @@ contentMarketing
+d eurosport.no
-d vg.no cnp-assets src sites vg components AdblockModal
+d eurosport.*
-d imasdk.googleapis.com pal sdkloader pal.js
-d dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com
+d bildeler.name
+d reservedele.name
+d eurosport.no,eurosport.dk
@@ -261,6 +263,9 @@ contentMarketing
-d arvetellefsen.no curry
-d handelihalden.no
-d holmedalblikk.no
- dnb11111
-d nymelding.com
-d mrcal365.com
# 🇳🇴: Som nevnt i https: www.dagbladet.no kultur jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen 70487841
# 🇬🇧: As mentioned in https: www.dagbladet.no kultur jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen 70487841
-d breakoutstory24.com
@@ -1,6 +1,6 @@
[Adblock Plus 3.4]
! Version: 04September2019v1
! Version: 040920191 (for Adblock Plus' issue report system)
! Version: 08September2019v1
! Version: 080920191 (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
@@ -495,6 +495,8 @@ win-xp.no#?#tr > td > div:-abp-has(a[href*="clk.tradedoubler."])
woman.dk##.gutter-bottom.article-content > div.wg-banner
||730.no/banner/*/sonymusic/$subdocument
||gaysir.no/rek/bb_inline$subdocument
dmi.dk##.add-container
dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
! — — — — —
! https://sol.no/
##.advertisement
@@ -919,6 +921,10 @@ fuglelyder.net#@##banner_ad
||arvetellefsen.no/curry^
||handelihalden.no^
||holmedalblikk.no^
||vipps-sikkerhet.*^
||*/dnb11111/^
||nymelding.com^
||mrcal365.com^
! 🇳🇴: Som nevnt i https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
! 🇬🇧: As mentioned in https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
@@ -1,5 +1,5 @@
[AdGuard ≥6]
! Version: 04September2019v1
! Version: 08September2019v1
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
@@ -532,6 +532,8 @@ win-xp.no#?#tr > td > div:-abp-has(a[href*="clk.tradedoubler."])
woman.dk##.gutter-bottom.article-content > div.wg-banner
||730.no/banner/*/sonymusic/$subdocument
||gaysir.no/rek/bb_inline$subdocument
dmi.dk##.add-container
dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
! — — — — —
! https://sol.no/
##.advertisement
@@ -620,6 +622,8 @@ techstart.dk##+js(set-constant.js, adblock, false)
dagensbyggeri.dk##+js(setTimeout-defuser.js, (), 2500)
@@||eurosport.*^$generichide
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
!#if !ext_ublock
@@||bildeler.name$generichide
@@||reservedele.name$generichide
@@ -974,6 +978,10 @@ fuglelyder.net#@##banner_ad
||arvetellefsen.no/curry^
||handelihalden.no^
||holmedalblikk.no^
||vipps-sikkerhet.*^empty,important
||*/dnb11111/^empty,important
||nymelding.com^empty,important
||mrcal365.com^empty,important
! 🇳🇴: Som nevnt i https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
! 🇬🇧: As mentioned in https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
@@ -1,5 +1,5 @@
! Version: 04September2019v1
! Version: 08September2019v1
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)
! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings)
@@ -532,6 +532,8 @@ win-xp.no#?#tr > td > div:-abp-has(a[href*="clk.tradedoubler."])
woman.dk##.gutter-bottom.article-content > div.wg-banner
||730.no/banner/*/sonymusic/$subdocument
||gaysir.no/rek/bb_inline$subdocument
dmi.dk##.add-container
dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad)
! — — — — —
! https://sol.no/
##.advertisement
@@ -620,6 +622,8 @@ techstart.dk##+js(set-constant.js, adblock, false)
dagensbyggeri.dk##+js(setTimeout-defuser.js, (), 2500)
@@||eurosport.*^$generichide
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
!#if !ext_ublock
@@||bildeler.name$generichide
@@||reservedele.name$generichide
@@ -974,6 +978,10 @@ fuglelyder.net#@##banner_ad
||arvetellefsen.no/curry^
||handelihalden.no^
||holmedalblikk.no^
||vipps-sikkerhet.*^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av Vipps
||*/dnb11111/^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av DNB
||nymelding.com^$doc
||mrcal365.com^$doc,domain=~ Warning displayed due to: Bitcoin scam fraudsters.
! 🇳🇴: Som nevnt i https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
! 🇬🇧: As mentioned in https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
@@ -1,6 +1,6 @@
{+block}
# Version: 04September2019v1-Alpha
# Version: 040920191 (for Adblock Plus' issue report system)
# Version: 08September2019v1-Alpha
# Version: 080920191 (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
@@ -142,6 +142,8 @@ contentMarketing
{+block{A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file}}
.elderlyscissors.com
.vg.no/cnp-assets/src/sites/vg/components/AdblockModal
.imasdk.googleapis.com/pal/sdkloader/pal.js
.dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/
#
#
#
@@ -340,6 +342,10 @@ contentMarketing
.arvetellefsen.no/curry
.handelihalden.no
.holmedalblikk.no
.vipps-sikkerhet.*
.*/dnb11111/
.nymelding.com
.mrcal365.com
#
# 🇳🇴: Som nevnt i https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841
{+block{As mentioned in https://www.dagbladet.no/kultur/jeg-blir-hver-dag-kontaktet-av-folk-som-faktisk-tror-pa-denne-svindelen/70487841}}
@@ -342,7 +342,7 @@ def prepare_tpl(lines) -> str:
)
line = re.sub(
"\[Adblock Plus 3.4\]",
r"\[Adblock Plus .*\]",
"msFilterList",
line
)
@@ -451,8 +451,8 @@ def prepare_tpl(lines) -> str:
)
line = re.sub(
"Expires: ",
"expires = ",
"# Expires: ",
": expires = ",
line
)
@@ -1214,7 +1214,7 @@ def prepare_tpl(lines) -> str:
)
line = re.sub(
"\[Adblock Plus 3.4\]",
r"\[Adblock Plus .*\]",
"msFilterList",
line
)
@@ -1245,13 +1245,31 @@ def prepare_tpl(lines) -> str:
)
line = re.sub(
"\^",
r"~([a-z0-9].*?)\|",
r"\n+d \1",
line
)
line = re.sub(
r"\$doc,domain=.*",
"",
line
)
line = re.sub(
r"\$.*",
r"-d (\..*)\^",
r"- *\1",
line
)
line = re.sub(
r"^- \^.*",
"",
line
)
line = re.sub(
r"\^",
"",
line
)
@@ -1268,24 +1286,12 @@ def prepare_tpl(lines) -> str:
line
)
line = re.sub(
"-d \.",
"- ",
line
)
line = re.sub(
"com\* ",
"com ",
line
)
line = re.sub(
r"([-][d].*[.][*].*)",
"",
line
)
line = re.sub(
r"@@\*\..*",
"",
@@ -1298,6 +1304,12 @@ def prepare_tpl(lines) -> str:
line
)
line = re.sub(
r"^\.[a-z]",
"",
line
)
line = re.sub(
r"^([+][d][\s][a-z].*[\s][a-z].*)",
"",
@@ -1323,8 +1335,8 @@ def prepare_tpl(lines) -> str:
)
line = re.sub(
"Expires: ",
"expires = ",
"# Expires: ",
": expires = ",
line
)
@@ -1394,24 +1406,6 @@ def prepare_tpl(lines) -> str:
line
)
line = re.sub(
r"^- agency$",
"",
line
)
line = re.sub(
r"^- gdn$",
"",
line
)
line = re.sub(
r"^- bid$",
"",
line
)
line = re.sub(
r"^-d .*\*\..*",
"",
@@ -1424,6 +1418,78 @@ def prepare_tpl(lines) -> str:
line
)
line = re.sub(
r": (.*?) ",
r"://\1/",
line
)
line = re.sub(
r": (.*?) ",
r"://\1/",
line
)
line = re.sub(
r"://(.*?) ",
r"://\1/",
line
)
line = re.sub(
r"://(.*?) ",
r"://\1/",
line
)
line = re.sub(
r"://(.*?) ",
r"://\1/",
line
)
line = re.sub(
r"([a-z])//",
r"\1/ ",
line
)
line = re.sub(
r"://(.*?) ",
r"://\1/",
line
)
line = re.sub(
r"([a-z])//",
r"\1/ ",
line
)
line = re.sub(
r"://(.*?) ",
r"://\1/",
line
)
line = re.sub(
r"([a-z])//",
r"\1/ ",
line
)
line = re.sub(
"Windows Mac",
"Windows/Mac",
line
)
line = re.sub(
r"\$domain.*",
"",
line
)
if is_supported_tpl(line):
text += line + '\r\n'