From c9839f602b54bb217bf66b95fd000a198466632b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 8 Mar 2020 04:59:44 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 23 +++++++++++-- .../NordicFiltersABP.txt | 22 ++++++++++++- .../NordicFiltersAdGuard.txt | 22 ++++++++++++- .../NordicFiltersPrivacy.txt | 22 ++++++++++++- .../NordicFiltersPrivoxy.action | 21 +++++++++++- .../XYZPrepareFilters.py | 32 ++++++++++++++++++- 6 files changed, 134 insertions(+), 8 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 1dcff8cae..8c2105c25 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 06March2020v4-Beta +# Version: 08March2020v2-Beta # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -8,8 +8,7 @@ msFilterList # 🇩🇰: 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 # 🇳🇴🏞: Denne lista dekkar nettstader for Noreg, Danmark, Island, Færøyane, Grønland, og samefolkesetnadene. For meire informasjon, detaljar, hjelpemiddel, og anna listar eg har laga, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk-nynorsk # Description: 🇬🇧: This list covers websites for Norway, Denmark, Iceland, Danish territories, and the Sami indigenous population. For more information, details, helpful tools, and other lists that I've made, visit https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english -# CRITICAL NOTE FOR PFBLOCKERNG USERS: This version of my list was never meant to be used with pfBlockerNG in the first place, and I was never asked or inquired about it before it was added to it. Instead I currently recommend https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts./This/has been fixed in fresh stock installations of ≥2.2.5_27. For all other pfBlockerNG users, please replace the list link manually. -# If you wish to remove cookie banners from Nordic websites, check out https://www.i-dont-care-about-cookies.eu/ +# If you wish to remove cookie banners from Nordic websites, check out https://easylist-downloads.adblockplus.org/easylist-cookie.tpl (Can also be subscribed to from https://raw.githack.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html) # 🇳🇴 🇩🇰: ——— Reklamer ——— # 🇳🇴🏞: ——— Reklamar ——— # 🇮🇸: ——— Auglýsingar ——— @@ -110,6 +109,22 @@ msFilterList -d advertising.no -d fotbolti.net banners -d samfilm.codelab.is +-d tvkampen.com banner* +-d tvkampen.com unibet-lo +-d 1819.is infosmall +-d austurfrett.is banners +-d austurfrett.is *augl.jpg +-d feltet.dk wallpaper_1.jpg +-d feltet.dk topbanner_*.jpg +-d feltet.dk Feltet.dk +-d feltet.dk *_300x60.gif +-d cdn.rikstoto.no GameShop +-d youtube.com *&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1 +-d karfan.is *-470x130*.jpg +-d karfan.is *.gif +-d karfan.is *300x250.jpg +- vefauglysingar +- blob:https://www.veier24.no/ # — — — — — # 🇳🇴: Generelle oppføringer med kilder # 🇬🇧: Generic entries that have sources @@ -251,6 +266,8 @@ msFilterList -d tipster.no embed # https://www.nettavisen.no/ # https://www.ba.no/s/5-8-1221171 +-d vg.no tipster.png +-d vgc.no betting-header.png # ——— Gamereactor + Viafree ——— # 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. # 🇩🇰: Disse regler bliver synkroniseret med de hos «Frellwit's Swedish Filter» med nogle måneders mellemrum, så det hadde blivet for tungt at kategorisere dem. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 6fb50c9be..9f2b6b961 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 060320204 +! Version: 080320202 ! 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 @@ -240,6 +240,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ||heartbeat.airserve.net^$third-party ||static.airserve.net^$third-party ||cdnboligkanalen.azureedge.net^$third-party +@@||cdnboligkanalen.azureedge.net/*width=2000^ ||tankeogteknikk.no^$third-party digi.no##.native ||adservice.dk^ @@ -257,6 +258,23 @@ digi.no##.native ||samfilm.codelab.is^$third-party bt.no##section[class$=-ad] ||finn.no$subdocument,domain=bt.no +||tvkampen.com/media/*/banner*$image +||tvkampen.com/media/partners/unibet-lo$image +||1819.is/infosmall/$image +||austurfrett.is/images/banners$image +||austurfrett.is/images/*augl.jpg^ +||feltet.dk/*/wallpaper_1.jpg^ +||feltet.dk/*/topbanner_*.jpg^ +||feltet.dk/octo_cms/files/Feltet.dk//$image +||feltet.dk/*_300x60.gif^ +||cdn.rikstoto.no/expert/GameShop^$subdocument,third-party,domain=~tipster.no +||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$subdocument +||karfan.is/*-470x130*.jpg^ + +||karfan.is/wp-content/uploads/*.gif^ +||karfan.is/*300x250.jpg^ +*/vefauglysingar/ +|blob:https://www.veier24.no/$image ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder ! 🇬🇧: Generic entries that have sources @@ -852,6 +870,8 @@ ba.no##.sportspill ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/lotteri/viking-lotto"] ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/sales/validateCouponAndStoreToSession.json"] ~norsk-tipping.no,~tipster.no##a[href*="nettavisen.no/sportspill/tipping/blir-du-mangemillionr-pa-onsdag"] +||vg.no/vgc/pool/tipster.png$image +||vgc.no/pustehullet/betting-header.png$image ! ——— Gamereactor + Viafree ——— ! 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index e6fcd23df..bd2cb7b70 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 06March2020v4 +! Version: 08March2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -244,6 +244,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ||heartbeat.airserve.net^$third-party ||static.airserve.net^$third-party ||cdnboligkanalen.azureedge.net^$third-party +@@||cdnboligkanalen.azureedge.net/*width=2000^ ||tankeogteknikk.no^$third-party digi.no##.native ||adservice.dk^ @@ -261,6 +262,23 @@ digi.no##.native ||samfilm.codelab.is^$third-party bt.no##section[class$=-ad] ||finn.no$subdocument,domain=bt.no +||tvkampen.com/media/*/banner*$image +||tvkampen.com/media/partners/unibet-lo$image +||1819.is/infosmall/$image +||austurfrett.is/images/banners$image +||austurfrett.is/images/*augl.jpg^ +||feltet.dk/*/wallpaper_1.jpg^ +||feltet.dk/*/topbanner_*.jpg^ +||feltet.dk/octo_cms/files/Feltet.dk//$image +||feltet.dk/*_300x60.gif^ +||cdn.rikstoto.no/expert/GameShop^$subdocument,third-party,domain=~tipster.no +||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$subdocument +||karfan.is/*-470x130*.jpg^ +!+ NOT_OPTIMIZED +||karfan.is/wp-content/uploads/*.gif^ +||karfan.is/*300x250.jpg^ +*/vefauglysingar/ +|blob:https://www.veier24.no/$image ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder ! 🇬🇧: Generic entries that have sources @@ -876,6 +894,8 @@ ba.no##.sportspill ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/lotteri/viking-lotto"] ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/sales/validateCouponAndStoreToSession.json"] ~norsk-tipping.no,~tipster.no##a[href*="nettavisen.no/sportspill/tipping/blir-du-mangemillionr-pa-onsdag"] +||vg.no/vgc/pool/tipster.png$image +||vgc.no/pustehullet/betting-header.png$image ! ——— Gamereactor + Viafree ——— ! 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index e1ca08a6a..eed3f5237 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 06March2020v4 +! Version: 08March2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -244,6 +244,7 @@ nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) ||heartbeat.airserve.net^$3p ||static.airserve.net^$3p ||cdnboligkanalen.azureedge.net^$3p +@@||cdnboligkanalen.azureedge.net/*width=2000^ ||tankeogteknikk.no^$3p digi.no##.native ||adservice.dk^ @@ -261,6 +262,23 @@ digi.no##.native ||samfilm.codelab.is^$3p bt.no##section[class$=-ad] ||finn.no$subdocument,domain=bt.no +||tvkampen.com/media/*/banner*$image +||tvkampen.com/media/partners/unibet-lo$image +||1819.is/infosmall/$image +||austurfrett.is/images/banners$image +||austurfrett.is/images/*augl.jpg^ +||feltet.dk/*/wallpaper_1.jpg^ +||feltet.dk/*/topbanner_*.jpg^ +||feltet.dk/octo_cms/files/Feltet.dk//$image +||feltet.dk/*_300x60.gif^ +||cdn.rikstoto.no/expert/GameShop^$subdocument,3p,domain=~tipster.no +||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$subdocument +||karfan.is/*-470x130*.jpg^ +!+ NOT_OPTIMIZED +||karfan.is/wp-content/uploads/*.gif^ +||karfan.is/*300x250.jpg^ +*/vefauglysingar/ +|blob:https://www.veier24.no/$image ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder ! 🇬🇧: Generic entries that have sources @@ -876,6 +894,8 @@ ba.no##.sportspill ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/lotteri/viking-lotto"] ~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/sales/validateCouponAndStoreToSession.json"] ~norsk-tipping.no,~tipster.no##a[href*="nettavisen.no/sportspill/tipping/blir-du-mangemillionr-pa-onsdag"] +||vg.no/vgc/pool/tipster.png$image +||vgc.no/pustehullet/betting-header.png$image ! ——— Gamereactor + Viafree ——— ! 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 971cbc093..382e0816a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 06March2020v4-Alpha +# Version: 08March2020v2-Alpha # 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 @@ -134,6 +134,23 @@ contentMarketing .auglysingar.*.is .samfilm.codelab.is .finn.no +.tvkampen.com/media/*/banner* +.tvkampen.com/media/partners/unibet-lo +.1819.is/infosmall/ +.austurfrett.is/images/banners +.austurfrett.is/images/*augl.jpg +.feltet.dk/*/wallpaper_1.jpg +.feltet.dk/*/topbanner_*.jpg +.feltet.dk/octo_cms/files/Feltet.dk// +.feltet.dk/*_300x60.gif +.cdn.rikstoto.no/expert/GameShop +.youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1 +.karfan.is/*-470x130*.jpg +# +.karfan.is/wp-content/uploads/*.gif +.karfan.is/*300x250.jpg +./vefauglysingar/ +.blob:https://www.veier24.no/ # — — — — — # 🇳🇴: Generelle oppføringer med kilder {+block{Generic entries that have sources}} @@ -283,6 +300,8 @@ contentMarketing .tipster.no/embed # https://www.nettavisen.no/ # https://www.ba.no/s/5-8-1221171 +.vg.no/vgc/pool/tipster.png +.vgc.no/pustehullet/betting-header.png # # ——— Gamereactor + Viafree ——— # 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index bd30db402..fce6ce982 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -868,7 +868,7 @@ def prepare_tpl(lines) -> str: ) line = re.sub( - r"^!.*PFBLOCKERNG.*", + r"^#.*PFBLOCKERNG.*", r"", line ) @@ -897,6 +897,24 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^\* ([a-z0-9])", + r"- \1", + line + ) + + line = re.sub( + r"^\|([a-z0-9])", + r"- \1", + line + ) + + line = re.sub( + r"(.*)check out https://www\.i-dont-care-about-cookies\.eu/", + r"\1check out https://easylist-downloads.adblockplus.org/easylist-cookie.tpl (Can also be subscribed to from https://raw.githack.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html)", + line + ) + if is_supported_tpl(line) and not line == '': text += line + '\r\n' @@ -1002,6 +1020,18 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^\*/", + r"./", + line + ) + + line = re.sub( + r"^\|([a-z0-9])", + r".\1", + line + ) + if is_supported_privoxy(line): text += line + '\r\n'