From f4ee54b97cf6a1a95dd2923301322b7f137d077c Mon Sep 17 00:00:00 2001
From: Imre Eilertsen <imreeil42@gmail.com>
Date: Sat, 5 Oct 2024 02:04:55 +0200
Subject: [PATCH] Add files via upload

---
 .../XYZPrepareFilters.py                      | 92 +++++++++++--------
 1 file changed, 52 insertions(+), 40 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index c69aa78b6..148dfe6eb 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -4688,7 +4688,7 @@ UNSUPPORTED_ABP = ['$important', ',important' '$redirect=', ',redirect=',
     ':style', '##+js', '.*#' , ':xpath', ':matches-css', 'dk,no##', 'version.bind', 'pizzaseo.com', 'gamecopyworld', '$app', '$dnstype']
 UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$', '/^', 'version.bind', 'pizzaseo.com', 'gamecopyworld', ':  ', 'duckdns.org', '$dnstype']
 UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#', '/^', 'gamecopyworld', '://', '$dnstype']
-UNSUPPORTED_HOSTS = ['##', '#@#', '#?#', '@@', '[Adblock Plus 3.', '*', '/^', '://', 'duckdns.org']
+UNSUPPORTED_HOSTS = ['##', '#@#', '#?#', '@@', '[Adblock Plus 3.', '*', '/^', 'duckdns.org']
 UNSUPPORTED_AGH = ['$redirect=', ',redirect=',
     '##', '.*#' , '#?#', 'gamecopyworld', 'version.bind', 'hostname.bind', '|id.server|', '$app']
 
@@ -4751,6 +4751,12 @@ def prepare_ag(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^\*\$all,ipaddress=(.*)$",
+           r"!+ PLATFORM(windows, mac, android)\n\1$network",
+           line
+        )
+
         line = re.sub(
            r"([$,])1p",
            r"\1~third-party",
@@ -4950,24 +4956,6 @@ def prepare_ag(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"^(\|\|?|://|/)((\d{1,3}\.){3})(\$.*|$)",
-           r"\2*$network",
-           line
-        )
-
-        line = re.sub(
-           r"(^/\^\d{1,3}\\\..*(\\d\{1,3}|\d\]\))\$/$)",
-           r"\1$network",
-           line
-        )
-
-        line = re.sub(
-           r"(^/\^\d{1,3}\\\..*(\\d\{1,3}|\d\]\))\$/$)",
-           r"\1$network",
-           line
-        )
-
         line = re.sub(
            r"^([|:/].*([a-z}]|\)))\$/",
            r"\1\\$/",
@@ -4986,12 +4974,6 @@ def prepare_ag(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"^.*[,$]ipaddress.*$",
-           r"",
-           line
-        )
-
         line = re.sub(
            r"^[a-zA-Z0-9*,:;^$=?!+&%#@_-]{1,5}$",
            r"",
@@ -6194,18 +6176,6 @@ def prepare_hosts(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"(# (Version|Last[ -]?[Mm]odified):.*)",
-           r"\1\n# Users of Pi-Hole FTL 5.22 and later are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.",
-           line
-        )
-
-        line = re.sub(
-           r"(Description: .*)$",
-           r"\1\n!#if !env_mv3",
-           line
-        )
-
         line = re.sub(
            r"(mobsters .*)$",
            r"\1\n!#endif",
@@ -6224,6 +6194,36 @@ def prepare_hosts(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^!!.*$",
+           r"",
+           line
+        )
+
+        line = re.sub(
+           r"^[a-zA-Z0-9*,:;^$=?!+&%#@/_-]{1,5}$",
+           r"",
+           line
+        )
+
+        line = re.sub(
+           r"^(.*Description: .*)$",
+           r"\1\n# Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.\n!#if !env_mv3",
+           line
+        )
+
+        line = re.sub(
+           r"^://([a-z0-9].*)$",
+           r"127.0.0.1 \1",
+           line
+        )
+
+        line = re.sub(
+           r"^127\.0\.0\.1 .*/.*$",
+           r"",
+           line
+        )
+
         if is_supported_hosts(line):
          text += line + '\n'
 
@@ -6420,7 +6420,7 @@ def prepare_domains(lines) -> str:
 
         line = re.sub(
            r"(# Description.*$)",
-           r"\1\n# Note: The very limited syntax available to raw domains lists, considering it's, well, raw, means that outright anti-MV3 measures (which'd as of February 2024 only affect Minus, a project whose name is unworthy of the uBO label; AdGuard browser extensions has no relevant support for raw domains either way) cannot be done. However, at some 20,000 entries, Team Chromium's shameful leaders aren't liking this list anyway.",
+           r"\1\n# Note: The very limited syntax available to raw domains lists, considering it's, well, raw, means that outright anti-MV3 measures (which'd as of February 2024 only affect Minus, a project whose name is unworthy of the uBO label; AdGuard browser extensions has no relevant support for raw domains either way) cannot be done. However, at some 20,000 entries, Team Chromium's shameful leaders aren't liking this list anyway.\n# Note 2: Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.",
            line
         )
 
@@ -6437,7 +6437,19 @@ def prepare_domains(lines) -> str:
         )
 
         line = re.sub(
-           r"^[a-zA-Z0-9*,:;^$=?!+&%#@_-]{1,5}$",
+           r"^[a-zA-Z0-9*,:;^$=?!+&%#@/_-]{1,5}$",
+           r"",
+           line
+        )
+
+        line = re.sub(
+           r"^://([a-z0-9].*)$",
+           r"\1",
+           line
+        )
+
+        line = re.sub(
+           r"^[a-z0-9].*/.*$",
            r"",
            line
         )
@@ -6880,7 +6892,7 @@ def prepare_agh(lines) -> str:
         )
 
         line = re.sub(
-           r"^[a-zA-Z0-9*,:;^$=?!+&%#@_-]{1,5}$",
+           r"^[a-zA-Z0-9*,:;^$=?!+&%#@/_-]{1,5}$",
            r"",
            line
         )