From 8d3323d9ac0e147dd315106a24f24dc15eb5eec7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 22 Sep 2020 21:27:18 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFiltersABP-Inclusion.txt | 3 ++- .../NordicFiltersABP.txt | 3 ++- .../NordicFiltersAdGuard.txt | 3 ++- .../NordicFiltersBrave.txt | 2 +- .../NordicFiltersPrivacy.txt | 3 ++- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 24 +++++++++++++++++++ 8 files changed, 35 insertions(+), 7 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index bcf6bad4c..daed0acad 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 22September2020v1-Alpha +# Version: 22September2020v2-Alpha # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index c983f276c..418ee5eee 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 220920201 +! Version: 220920202 ! 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: 1 day @@ -744,6 +744,7 @@ markedsforing.dk##.banner-annonce markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce]) matematikbogen.dk##td:nth-of-type(3) matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle) +sol.no##main > noscript:first-of-type + div[class*=" "] medier24.no##.ad-toppbanner-article meremobil.dk##.a-single meremobil.dk#?##header > div:-abp-has(div[id*=gpt-ad-]) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index ba7380917..4e3f84fb7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 220920201 +! Version: 220920202 ! 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: 1 day @@ -749,6 +749,7 @@ markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce]) matematikbogen.dk##td:nth-of-type(3) matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle) matoppskrift.no#?#.text-center:not(:-abp-has(img)) +sol.no##main > noscript:first-of-type + div[class*=" "] mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) medier24.no##.ad-toppbanner-article menn.is#?#.vc_column-inner:-abp-has(.mobile-ad):not(:-abp-has(a)) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index f548f2720..604fbaa4d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 22September2020v1 +! Version: 22September2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 1 day @@ -778,6 +778,7 @@ markedsforing.dk#?#.row-second:has(div[class*=banner-annonce]) matematikbogen.dk##td:nth-of-type(3) matoppskrift.no#?##sticky:has(> .adsbygoogle) matoppskrift.no#?#.text-center:not(:has(img)) +sol.no##main > noscript:first-of-type + div[class*=" "] mbl.is##.container:style(margin-top: 0 !important) mbl.is##.main-header:style(margin-top: 0 !important) mbl.is#?#.col-sm-6.col-12:has(.augl):not(:has(.fluid)) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index fdcb72e33..16139b6e6 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 22September2020v1-Beta +! Version: 22September2020v2-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: 1 day diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index f155af56c..33337af7d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 22September2020v1 +! Version: 22September2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 1 day @@ -778,6 +778,7 @@ markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce]) matematikbogen.dk##td:nth-of-type(3) matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle) matoppskrift.no#?#.text-center:not(:-abp-has(img)) +sol.no##main > noscript:first-of-type + div[class*=" "] mbl.is##.container:style(margin-top: 0 !important) mbl.is##.main-header:style(margin-top: 0 !important) mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 175e011ec..34b938b1f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 22September2020v1-Alpha +# Version: 22September2020v2-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 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index a3f1ced48..3a972ed31 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3871,6 +3871,12 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"\|$", + r"", + line + ) + if is_supported_tpl(line): text += line + '\r\n' @@ -3977,6 +3983,12 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"\|$", + r"", + line + ) + if is_supported_privoxy(line): text += line + '\r\n' @@ -4118,6 +4130,12 @@ def prepare_hosts(lines) -> str: line ) + line = re.sub( + r"\|$", + r"", + line + ) + if is_supported_hosts(line): text += line + '\r\n' @@ -4216,6 +4234,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"\|$", + r"", + line + ) + if is_supported_domains(line): text += line + '\r\n'