Hotfix for several other list versions

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

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" }
+]}
 
 

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)

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

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
         )