From 73ee8d0e8f0eb928a98dfdf3b2d92ead1c3c314a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 11 Sep 2020 11:35:35 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 7 ++++--- .../NordicFiltersABP-Inclusion.txt | 9 ++++++--- .../NordicFiltersABP.txt | 9 ++++++--- .../NordicFiltersAdGuard.txt | 9 ++++++--- .../NordicFiltersBrave.txt | 7 ++++--- .../NordicFiltersPrivacy.txt | 9 ++++++--- .../NordicFiltersPrivoxy.action | 7 ++++--- .../XYZPrepareFilters.py | 18 ++++++++++++++++++ 8 files changed, 54 insertions(+), 21 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 10e9e7fa7..78272860b 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 09September2020v1-Alpha +# Version: 11September2020v1-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -37,9 +37,10 @@ msFilterList # https://portal.fo/dagur-28901/tad-figurativa-og-abstrakta-landslagid.grein/(09/05/2020) # Bet365 widget triggered for Norwegian audiences only # jyllands-posten.dk -# buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +# buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk +# retailnews.dk (11 09 2020) # n247.no -# https://www.healthtalk.no/ +# healthtalk.no # appetitt.no # — — — — — — — # 🇳🇴: Brede eller heldomenebaserte blokkeringsoppføringer diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index cc927f1af..0c533049e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 090920201 +! Version: 110920201 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 12 hours @@ -226,11 +226,14 @@ portal.fo##.ablock goal.com#?#*:-abp-has(> * > .js-betting-widget.is-country-no) ! jyllands-posten.dk ##.annonceringBox -! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk ##.rotating-junglebogen +! retailnews.dk (11/09/2020) +###junglebogen-left +###junglebogen-right ! n247.no ##.annonseheader -! https://www.healthtalk.no/ +! healthtalk.no ##.reklame-spot ! appetitt.no ###ctl00_phMain_lnkAd diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index ead3007c3..7ef13d8ae 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 090920201 +! Version: 110920201 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -229,11 +229,14 @@ portal.fo##.ablock goal.com#?#*:-abp-has(> * > .js-betting-widget.is-country-no) ! jyllands-posten.dk ##.annonceringBox -! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk ##.rotating-junglebogen +! retailnews.dk (11/09/2020) +###junglebogen-left +###junglebogen-right ! n247.no ##.annonseheader -! https://www.healthtalk.no/ +! healthtalk.no ##.reklame-spot ! appetitt.no ###ctl00_phMain_lnkAd diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index b24523f04..60dbd1f24 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 09September2020v1 +! Version: 11September2020v1 ! 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 @@ -233,11 +233,14 @@ portal.fo##.ablock goal.com##.js-betting-widget.is-country-no:upward(2) ! jyllands-posten.dk ##.annonceringBox -! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk ##.rotating-junglebogen +! retailnews.dk (11/09/2020) +###junglebogen-left +###junglebogen-right ! n247.no ##.annonseheader -! https://www.healthtalk.no/ +! healthtalk.no ##.reklame-spot ! appetitt.no ###ctl00_phMain_lnkAd diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index ac83d1bde..8cb9177a3 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 09September2020v1-Beta +! Version: 11September2020v1-Beta ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser) ! Expires: 12 hours @@ -44,9 +44,10 @@ vgtv.no##+js(golem.de.js) ! https://portal.fo/dagur-28901/tad-figurativa-og-abstrakta-landslagid.grein (09/05/2020) ! Bet365 widget triggered for Norwegian audiences only ! jyllands-posten.dk -! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk +! retailnews.dk (11/09/2020) ! n247.no -! https://www.healthtalk.no/ +! healthtalk.no ! appetitt.no ! — — — — — — — ! 🇳🇴: Brede eller heldomenebaserte blokkeringsoppføringer diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 705c9bc6b..fc52ebb8f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 09September2020v1 +! Version: 11September2020v1 ! 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 @@ -233,11 +233,14 @@ portal.fo##.ablock goal.com##.js-betting-widget.is-country-no:upward(2) ! jyllands-posten.dk ##.annonceringBox -! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk ##.rotating-junglebogen +! retailnews.dk (11/09/2020) +###junglebogen-left +###junglebogen-right ! n247.no ##.annonseheader -! https://www.healthtalk.no/ +! healthtalk.no ##.reklame-spot ! appetitt.no ###ctl00_phMain_lnkAd diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 398548b88..41f6872b9 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 09September2020v1-Alpha +# Version: 11September2020v1-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -35,9 +35,10 @@ {+block{https://portal.fo/dagur-28901/tad-figurativa-og-abstrakta-landslagid.grein (09/05/2020)}} # Bet365 widget triggered for Norwegian audiences only {+block{jyllands-posten.dk}} -# buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no +# buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no, retailnews.dk +# retailnews.dk (11/09/2020) {+block{n247.no}} -{+block{https://www.healthtalk.no/}} +{+block{healthtalk.no}} {+block{appetitt.no}} # — — — — — — — # 🇳🇴: Brede eller heldomenebaserte blokkeringsoppføringer diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index db9569629..22651e6d9 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3544,6 +3544,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"/,", + r"/$", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -3859,6 +3865,12 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^\|([a-z0-9])", + r"-d \1", + line + ) + if is_supported_tpl(line): text += line + '\r\n' @@ -4349,6 +4361,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"/(live|fun|popup)([,|]|$).*", + r"/", + line + ) + if is_supported_agh(line): text += line + '\r\n'