From cb278d5d6bf5282b947c222dba2633b89ee23c71 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 20 Nov 2019 12:14:52 +0100 Subject: [PATCH] Hotfix for several other list versions --- .../DandelionSproutsNorskeFiltre.tpl | 1 + .../LittleSnitchNorwegianList.lsrules | 5 +- .../NordicFiltersABP.txt | 1 + .../NordicFiltersDnsmasq.conf | 6 +- .../XYZPrepareFilters.py | 62 ++++++++++++------- 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 2e8cd2bce..df7b218cc 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,3 +1,4 @@ +msFilterList # Version: 20November2019v1-Beta # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 1fd147f16..4f48bfed2 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -31,7 +31,7 @@ { "action": "deny", "process": "any", "remote-hosts": "bloggannonser.no" }, { "action": "deny", "process": "any", "remote-hosts": "bncentertainment.com" }, { "action": "deny", "process": "any", "remote-hosts": "boligkanalen-maestro-new.azurewebsites.net" }, -{ "action": "deny", "process": "any", "remote-hosts": "bondiblue.co.uk +{ "action": "deny", "process": "any", "remote-hosts": "bondiblue.co.uk" }, { "action": "deny", "process": "any", "remote-hosts": "bostongrnhsflowers.com" }, { "action": "deny", "process": "any", "remote-hosts": "brandstudio.inventory.schibsted.io" }, { "action": "deny", "process": "any", "remote-hosts": "breakoutstory24.com" }, @@ -199,6 +199,7 @@ { "action": "deny", "process": "any", "remote-hosts": "webclick.no" }, { "action": "deny", "process": "any", "remote-hosts": "webhotell.enivest.no" }, { "action": "deny", "process": "any", "remote-hosts": "widget.tippebannere.no" }, -{ "action": "deny", "process": "any", "remote-hosts": "wo.tc" }, +{ "action": "deny", "process": "any", "remote-hosts": "wo.tc" } +]} diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 398fef7d4..29b8143ca 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,3 +1,4 @@ +[Adblock Plus 3.4] ! Version: 201120191 ! 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) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index edd97014b..ded297bd3 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -28,9 +28,9 @@ address=/billigskos.com/127.0.0.1 address=/bloggannonser.no/127.0.0.1 address=/bncentertainment.com/127.0.0.1 address=/boligkanalen-maestro-new.azurewebsites.net/127.0.0.1 -address=/bondiblue.co.uk +address=/bondiblue.co.uk/127.0.0.1 address=/bostongrnhsflowers.com/127.0.0.1 -address=/brandstudio.inventory.schibsted.io +address=/brandstudio.inventory.schibsted.io/127.0.0.1 address=/breakoutstory24.com/127.0.0.1 address=/brightertrade.com/127.0.0.1 address=/caperforaciones.com/127.0.0.1 @@ -71,7 +71,7 @@ address=/forum1.no/127.0.0.1 address=/fotballsko-salg.com/127.0.0.1 address=/fotballskotilbud.com/127.0.0.1 address=/gantoslo.com/127.0.0.1 -address=/getheretecblogz.me +address=/getheretecblogz.me/127.0.0.1 address=/godeskonettbutikk.com/127.0.0.1 address=/godsfillingstation.org/127.0.0.1 address=/gokkw.com/127.0.0.1 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 9b99fd216..8b2e2874e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -390,6 +390,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"(! Version: .*)", + r"[Adblock Plus 3.4]\n\1", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -417,8 +423,8 @@ def prepare_tpl(lines) -> str: ) line = re.sub( - r"\[Adblock Plus .*\]", - "msFilterList", + r"(# Version: .*)", + r"msFilterList\n\1", line ) @@ -1057,18 +1063,6 @@ def prepare_ls(lines) -> str: line ) - line = re.sub( - r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.fo$)|(?<=\.gl$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)|(?<=\.io$)|(?<=\.me$)", - "\" },", - line - ) - - line = re.sub( - r"\.co$", - ".co\" },", - line - ) - line = re.sub( r"{ \"action\": \"deny\", \"process\": \"any\", \"remote-hosts\": \"$", "", @@ -1087,6 +1081,36 @@ def prepare_ls(lines) -> str: line ) + line = re.sub( + r"(.*\..*[a-z]$)", + r"\1\" },", + line + ) + + line = re.sub( + "(.*\..*[a-z])\\\"", + r"\1\\", + line + ) + + line = re.sub( + "\\\"\"", + "\"", + line + ) + + line = re.sub( + r"([a-z])\\", + r"\1", + line + ) + + line = re.sub( + r"(\"wo.tc\" }),", + r"\1\n]}", + line + ) + if is_supported_ls(line): text += line + '\r\n' @@ -1114,14 +1138,8 @@ def prepare_dnsmasq(lines) -> str: ) line = re.sub( - r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.fo$)|(?<=\.gl$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)", - "/127.0.0.1", - line - ) - - line = re.sub( - r"\.co$", - ".co/127.0.0.1", + r"(.*\..*[a-z]$)", + r"\1/127.0.0.1", line )