diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index f2c8ee26d..ef797119e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -6765,7 +6765,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^(&|\?).*$", + r"^(&|\?|=).*$", r"", line ) @@ -6825,12 +6825,6 @@ def prepare_agh(lines) -> str: # line #) - line = re.sub( - r"^[:/|].*=$", - r"", - line - ) - #line = re.sub( # r"(denyallow=.*),", # r"\1|", @@ -7017,6 +7011,42 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^[^!/@].*\?.*", + "", + line + ) + + line = re.sub( + r"^[^!/@].*[a-zA-Z0-9]/[a-zA-Z0-9-].*$", + "", + line + ) + + line = re.sub( + r"^(.*)\$domain=~(.*)$", + r"\1$denyallow=\2", + line + ) + + line = re.sub( + r"^/[^^].*([^/][$?][a-z0-9=~]{0,}$)", + "", + line + ) + + line = re.sub( + r"^/[^^][^/]{1,}(\[|\])[^/]{1,}$", + "", + line + ) + + line = re.sub( + r"^[^!].*\?[a-z0-9-]{1,}=.*$", + "", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\n'