From 3352fdcdddfa97bfbb3ee120c230f5a234342b7b Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Tue, 4 Nov 2025 17:52:18 +0100 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP-Inclusion.txt | 5 +- .../XYZPrepareFilters.py | 48 ++++++++++++++----- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 4ca07d2d4..86ac239b0 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -6938,7 +6938,7 @@ dn.se##.bad--insider-tall ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days -! Last modified: %timestamp% +! Last modified: Tue, 04 Nov 2025 14:57:36 +0200 ! Finnish section's homepage: https://github.com/finnish-easylist-addition/finnish-easylist-addition ! License: https://unlicense.org/ ! Raportoi mainoksenestoon liittyvistä ongelmista tai estämättömistä mainoksista täällä / Please report adblocking related issues or unblocked ads at: @@ -7433,6 +7433,9 @@ jaakiekonmmkisat.com,jalkapallonmmkisat.com,ruuhkavuodet.fi##div[class|="g g"] jaatama.fi##.box--transparent:has(.advert) jaatama.fi,maastohiihto.com,retkilehti.fi,riistalehti.fi##.advert jahtimedia.fi##.latest-post-link:has(.mainos) +jarviseudunsanomat.fi##.jss-etusivu-boksi +jarviseudunsanomat.fi##.jss-etusivun-ylaosa +jarviseudunsanomat.fi##.jss-keskella-artikkelia jatkoaika.com###cmorelink jatkoaika.com##.inline-txtad jatkoaika.com##div[class="block block-block"] diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 3b51c4b26..5b4a0020a 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -5460,7 +5460,13 @@ def prepare_tpl(lines) -> str: line = re.sub( r"^.*dnstype.*$", - r"", + "", + line + ) + + line = re.sub( + r"^.*[$,]csp.*$", + "", line ) @@ -5917,9 +5923,15 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^.*[$,]csp.*$", + "", + line + ) + line = re.sub( r"^.*dnstype.*$", - r"", + "", line ) @@ -6088,6 +6100,12 @@ def prepare_hosts(lines) -> str: line ) + line = re.sub( + r"^.*[$,]csp.*$", + "", + line + ) + line = re.sub( r"^!!? ", r"# ", @@ -6366,6 +6384,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^.*[$,]csp.*$", + "", + line + ) + line = re.sub( r"^!!? ", r"# ", @@ -7779,13 +7803,13 @@ def prepare_domains(lines) -> str: ) line = re.sub( - r"^# Title: .*$", + r"^.*Title:.*$", r"# Title: Dandelion Sprout's and other adblocker lists' IPs", line ) line = re.sub( - r"^# Description: .*$", + r"^\s?# Description: .*$", r"# Description: This IP set combines IP and CIDR addresses from plentiful of major adblocker lists. It contains heavily altered content from Dandelion Sprout's Anti-Malware List, Dandelion Sprout's Nordic Filters, EasyList, uBlock Filters, uBlock Filters - Badware Risks, AdGuard Base Filter, AdGuard French Filter, EasyList Germany, ABP Anti-Circumvention Filters, RU AdList, Liste AR, and EasyList Spanish.\n# For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english", line ) @@ -7848,6 +7872,12 @@ def prepare_p2p(lines) -> str: line ) + line = re.sub( + r"^.*Title:.* version\)$", + r"# Title: Dandelion Sprout's and other adblocker lists' IPs (P2P)", + line + ) + line = re.sub( r"^# (Translated title|Source|Note|Platform notes):.*$", r"", @@ -7855,7 +7885,7 @@ def prepare_p2p(lines) -> str: ) line = re.sub( - r"^# Title: 📔.*$", + r"^.*Title: 📔.*$", r"", line ) @@ -7885,13 +7915,7 @@ def prepare_p2p(lines) -> str: ) line = re.sub( - r"^# Title: .*$", - r"# Title: Dandelion Sprout's and other adblocker lists' IPs (P2P)", - line - ) - - line = re.sub( - r"^# Description: .*$", + r"^\s?# Description: .*$", r"# Description: This IP set combines IP and CIDR addresses from plentiful of major adblocker lists. It contains heavily altered content from Dandelion Sprout's Anti-Malware List, Dandelion Sprout's Nordic Filters, EasyList, uBlock Filters, uBlock Filters - Badware Risks, AdGuard Base Filter, AdGuard French Filter, EasyList Germany, ABP Anti-Circumvention Filters, RU AdList, Liste AR, and EasyList Spanish.\n# For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english", line )