From 5a1029170aaa6604af723e24eb90218f67d95ed8 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Thu, 16 Mar 2023 17:37:20 +0100
Subject: [PATCH] Add files via upload

---
 .../XYZPrepareFilters.py                      | 76 ++++++++++++++++---
 1 file changed, 65 insertions(+), 11 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 6f4f6d59b..4d0a56ab0 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -4385,6 +4385,12 @@ def prepare_ag(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^\|\|amazonaws\.com(\^)?($|\$[ac-z,-]{1,}$).*", 
+           r"", 
+           line
+        )
+
         text += line + '\r\n'
 
     return text
@@ -4430,7 +4436,7 @@ def prepare_abp(lines) -> str:
 
         line = re.sub(
            "Dandelion Sprout's Anti-Malware List", 
-           "Dandelion Sprout's Anti-Malware List (for AdBlock and Adblock Plus)", 
+           "Dandelion Sprout's Anti-Malware List (for Adblock Plus and AdBlock)", 
            line
         )
 
@@ -4496,61 +4502,67 @@ def prepare_abp(lines) -> str:
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", 
-           r"\1#?#*:-abp-has(> \2)", 
+           r"\1#?#*:has(> \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(2\)", 
-           r"\1#?#*:-abp-has(> * > \2)", 
+           r"\1#?#*:has(> * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(3\)", 
-           r"\1#?#*:-abp-has(> * > * > \2)", 
+           r"\1#?#*:has(> * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(4\)", 
-           r"\1#?#*:-abp-has(> * > * >  * > \2)", 
+           r"\1#?#*:has(> * > * >  * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(5\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(6\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(7\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(8\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > * > * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(9\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > * > * > * > * > \2)", 
            line
         )
 
         line = re.sub(
            r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(10\)", 
-           r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > * > * > \2)", 
+           r"\1#?#*:has(> * > * > * > * > * > * > * > * > * > \2)", 
+           line
+        )
+
+        line = re.sub(
+           r".*[,$]badfilter$", 
+           r"", 
            line
         )
 
@@ -4638,6 +4650,12 @@ def prepare_abp(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^\|\|amazonaws\.com(\^)?($|\$).*", 
+           r"", 
+           line
+        )
+
         if is_supported_abp(line):
             text += line + '\r\n'
 
@@ -5179,6 +5197,12 @@ def prepare_privoxy(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^\|\|amazonaws\.com(\^)?($|\$[ac-z]).*", 
+           r"", 
+           line
+        )
+
         if is_supported_privoxy(line):
          text += line + '\r\n'
 
@@ -5374,6 +5398,12 @@ def prepare_hosts(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r" amazonaws\.com( .*|$)", 
+           r"", 
+           line
+        )
+
         if is_supported_hosts(line):
          text += line + '\r\n'
 
@@ -5526,6 +5556,12 @@ def prepare_domains(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^amazonaws\.com$", 
+           r"", 
+           line
+        )
+
         if is_supported_domains(line):
          text += line + '\r\n'
 
@@ -5824,6 +5860,24 @@ def prepare_agh(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^\|\|amazonaws\.com(\^)?($|\$[ac-z].*$)", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r".*\^,.*", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r"^\|\|.*\^[a-z].*", 
+           r"", 
+           line
+        )
+
         if is_supported_agh(line):
             text += line + '\r\n'