From 53b737c145f2bd6e6722f04ddd8a1e5a75de274c Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Fri, 5 Apr 2024 06:07:08 +0200 Subject: [PATCH] Tried to close out .* endings. Could've gone better. I timed it at 2m03s. Better than what I recall was roughly 3min, but still. --- AdGuard Home Compilation List/AGHtest.py | 206 +++++++++++------------ 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 5b58663bd..f1478a960 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -55,7 +55,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\^[*$,][ac-hj-z?].*", + r".*\^[*$,][ac-hj-z?].*$", "", line ) @@ -67,13 +67,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[:@][a-z0-9?!].*", + r"^[:@][a-z0-9?!].*$", "", line ) line = re.sub( - r"^@?@?\|.*[/_#,].*", + r"^@?@?\|.*[/_#,].*$", r"", line ) @@ -85,31 +85,31 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\^\*.*", + r".*\^\*.*$", r"", line ) line = re.sub( - r".*\*\^[a-z0-9?].*", + r".*\*\^[a-z0-9?].*$", r"", line ) line = re.sub( - r".*\^&.*", + r".*\^&.*$", r"", line ) line = re.sub( - r".*\|.*/.*", + r".*\|.*/.*$", r"", line ) line = re.sub( - r".*\*[&?@].*", + r".*\*[&?@].*$", r"", line ) @@ -121,13 +121,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^([&+=?^_%,~#*]|@@/|\\.|;[a-z0-9]).*", + r"^([&+=?^_%,~#*]|@@/|\\.|;[a-z0-9]).*$", r"", line ) line = re.sub( - r"^! (AG_|Checksum:|Ref:|http|\||\[|#|!).*", + r"^! (AG_|Checksum:|Ref:|http|\||\[|#|!).*$", r"", line ) @@ -157,25 +157,25 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^://.*/.*", + r"^://.*/.*$", r"", line ) line = re.sub( - r"^/.*[a-z0-9]\\?/[a-z0-9\(].*", + r"^/.*[a-z0-9]\\?/[a-z0-9\(].*$", r"", line ) line = re.sub( - r"^/.*[a-z]\\/.*", + r"^/.*[a-z]\\/.*$", r"", line ) line = re.sub( - r"^/.*[a-z]\/.*", + r"^/.*[a-z]\/.*$", r"", line ) @@ -187,7 +187,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[a-z0-9@|].*\?.*", + r"^[a-z0-9@|].*\?.*$", r"", line ) @@ -199,7 +199,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! 20(1|2).*", + r"^! 20(1|2).*$", r"", line ) @@ -235,7 +235,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[@.].*[a-z0-9*]/.*", + r"^[@.].*[a-z0-9*]/.*$", r"", line ) @@ -247,13 +247,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".* - .*", + r".* - .*$", r"", line ) line = re.sub( - r"^![a-z0-9].*#.*", + r"^![a-z0-9].*#.*$", r"", line ) @@ -265,37 +265,37 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! ! \+.*", + r"^! ! \+.*$", r"", line ) line = re.sub( - r"^\|.*:[0-9].*", + r"^\|.*:[0-9].*$", r"", line ) line = re.sub( - r"^[a-zA-Z0-9.-].*[a-z0-9.-][/?_+=&][a-zA-Z0-9.$*-].*", + r"^[a-zA-Z0-9.-].*[a-z0-9.-][/?_+=&][a-zA-Z0-9.$*-].*$", r"", line ) line = re.sub( - r"^/.*[_=/;~@%#+,!].*", + r"^/.*[_=/;~@%#+,!].*$", r"", line ) line = re.sub( - r"^[@|:/.-].*[%&?_=].*", + r"^[@|:/.-].*[%&?_=].*$", r"", line ) line = re.sub( - r"^[|:/.-].*:.*", + r"^[|:/.-].*:.*$", r"", line ) @@ -313,13 +313,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^\..*=.*", + r"^\..*=.*$", r"", line ) line = re.sub( - r"^[a-z0-9./|-].*\^=.*", + r"^[a-z0-9./|-].*\^=.*$", r"", line ) @@ -367,19 +367,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! E[nN][dD].*", + r"^! E[nN][dD].*$", r"", line ) line = re.sub( - r"^! Expires: [0-9] .*", + r"^! Expires: [0-9] .*$", r"", line ) line = re.sub( - r"^! (Good|Bad): .*", + r"^! (Good|Bad): .*$", r"", line ) @@ -391,19 +391,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! This section contains the list of .*", + r"^! This section contains the list of .*$", r"", line ) line = re.sub( - r"^! Note, .*", + r"^! Note, .*$", r"", line ) line = re.sub( - r".*github\.com/NanoMeow.*", + r".*github\.com/NanoMeow.*$", r"", line ) @@ -451,13 +451,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! \*\*\* .*hide.*", + r"^! \*\*\* .*hide.*$", r"", line ) line = re.sub( - r"^! Smart ?JSON.*", + r"^! Smart ?JSON.*$", r"", line ) @@ -469,7 +469,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! \*\*\* easylistspanish:easylistspanish(_adult/adult_thirdparty|/easylistspanish_allowlist_|_adult/adult_allowlist).*", + r"^! \*\*\* easylistspanish:easylistspanish(_adult/adult_thirdparty|/easylistspanish_allowlist_|_adult/adult_allowlist).*$", r"", line ) @@ -481,19 +481,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! \*\*\* easylist:easylist_adult/adult_allowlist.*", + r"^! \*\*\* easylist:easylist_adult/adult_allowlist.*$", r"", line ) line = re.sub( - r"^! \*\*\* easylistgermany:easylistgermany/(easylistgermany_allowlist|easylistgermany_specific_block_popup\.).*", + r"^! \*\*\* easylistgermany:easylistgermany/(easylistgermany_allowlist|easylistgermany_specific_block_popup\.).*$", r"", line ) line = re.sub( - r"! \*\*\* antiadblockfilters.*(czech|dutch|finnish|hebrew|indonesian|latvian|romanian|slovak).*", + r"! \*\*\* antiadblockfilters.*(czech|dutch|finnish|hebrew|indonesian|latvian|romanian|slovak).*$", r"", line ) @@ -523,19 +523,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^!.* property.*", + r"^!.* property.*$", r"", line ) line = re.sub( - r"^!.*([Éé]lément|CSS|General hid|JS).*", + r"^!.*([Éé]lément|CSS|General hid|JS).*$", r"", line ) line = re.sub( - r".*#\$\?#.*", + r".*#\$\?#.*$", r"", line ) @@ -548,13 +548,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^\|.*[a-zA-Z0-9]\|[|a-zA-Z0-9].*", + r"^\|.*[a-zA-Z0-9]\|[|a-zA-Z0-9].*$", r"", line ) line = re.sub( - r".*Reek's Anti-Adblock Killer.*", + r".*Reek's Anti-Adblock Killer.*$", r"", line ) @@ -585,19 +585,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\$\[.*", + r".*\$\[.*$", r"", line ) line = re.sub( - r"^[a-zA-Z0-9:/|].*\$\$.*", + r"^[a-zA-Z0-9:/|].*\$\$.*$", r"", line ) line = re.sub( - r"^[0-9].*[: ].*", + r"^[0-9].*[: ].*$", r"", line ) @@ -633,7 +633,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^![!#].*", + r"^![!#].*$", "", line ) @@ -688,7 +688,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r".*\^[*$,].*", + r".*\^[*$,].*$", "", line ) @@ -700,7 +700,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^([&+-.=?^_%:*/@]|\\.).*", + r"^([&+-.=?^_%:*/@]|\\.).*$", "", line ) @@ -712,25 +712,25 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^\|[a-z0-9].*", + r"^\|[a-z0-9].*$", "", line ) line = re.sub( - r"^;[a-z0-9].*", + r"^;[a-z0-9].*$", "", line ) line = re.sub( - r"^@[a-z0-9].*", + r"^@[a-z0-9].*$", r"", line ) line = re.sub( - r"@?@?\|\|.*[a-zа-яみ].*", + r"@?@?\|\|.*[a-zа-яみ].*$", r"", line ) @@ -742,13 +742,13 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^![a-z #].*", + r"^![a-z #].*$", r"", line ) line = re.sub( - r"^!-.*", + r"^!-.*$", r"", line ) @@ -778,7 +778,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^@@.*[a-z].*", + r"^@@.*[a-z].*$", r"", line ) @@ -790,7 +790,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"# Version: (.*)-.*", + r"# Version: (.*)-.*$", r"! Version: \1-PreAlpha", line ) @@ -814,25 +814,25 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^://.*/.*", + r"^://.*/.*$", r"", line ) line = re.sub( - r".*104\\\.154\\\.\..*", + r".*104\\\.154\\\.\..*$", r"", line ) line = re.sub( - r"^/\^[h.].*", + r"^/\^[h.].*$", r"", line ) line = re.sub( - r"^/\\.*", + r"^/\\.*$", r"", line ) @@ -844,13 +844,13 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^![a-zA-Z!*].*", + r"^![a-zA-Z!*].*$", r"", line ) line = re.sub( - r"^[A-Za-z].*", + r"^[A-Za-z].*$", r"", line ) @@ -862,19 +862,19 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^#[a-z0-9.#].*", + r"^#[a-z0-9.#].*$", "", line ) line = re.sub( - r".*dmcdn\..*", + r".*dmcdn\..*$", r"", line ) line = re.sub( - r"^[a-z.#%$[].*", + r"^[a-z.#%$[].*$", r"", line ) @@ -886,7 +886,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^[a-zA-Z0-9].*[#$|a-z].*", + r"^[a-zA-Z0-9].*[#$|a-z].*$", r"", line ) @@ -1075,7 +1075,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\^[*$,][ac-hj-z?].*", + r".*\^[*$,][ac-hj-z?].*$", "", line ) @@ -1093,7 +1093,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[&+=?^_%].*", + r"^[&+=?^_%].*$", "", line ) @@ -1105,61 +1105,61 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[0-9].*", + r"^[0-9].*$", "", line ) line = re.sub( - r"^!#.*", + r"^!#.*$", "", line ) line = re.sub( - r"^\|[a-z0-9].*", + r"^\|[a-z0-9].*$", "", line ) line = re.sub( - r"^;[a-z0-9].*", + r"^;[a-z0-9].*$", "", line ) line = re.sub( - r"^Amasty_.*", + r"^Amasty_.*$", "", line ) line = re.sub( - r"^\*.*", + r"^\*.*$", "", line ) line = re.sub( - r"^\\.*", + r"^\\.*$", "", line ) line = re.sub( - r"^:[a-z0-9?!].*", + r"^:[a-z0-9?!].*$", "", line ) line = re.sub( - r"^@[a-z0-9].*", + r"^@[a-z0-9].*$", "", line ) line = re.sub( - r"@?@?\|\|.*/.*", + r"@?@?\|\|.*/.*$", r"", line ) @@ -1177,31 +1177,31 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\^\*.*", + r".*\^\*.*$", r"", line ) line = re.sub( - r".*\*\^[a-z0-9?].*", + r".*\*\^[a-z0-9?].*$", r"", line ) line = re.sub( - r".*\^&.*", + r".*\^&.*$", r"", line ) line = re.sub( - r".*\|.*/.*", + r".*\|.*/.*$", r"", line ) line = re.sub( - r".*\*[&?@].*", + r".*\*[&?@].*$", r"", line ) @@ -1213,19 +1213,19 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^@@/.*", + r"^@@/.*$", r"", line ) line = re.sub( - r"^[,=^?~].*", + r"^[,=^?~].*$", r"", line ) line = re.sub( - r"^! \|.*", + r"^! \|.*$", r"", line ) @@ -1267,43 +1267,43 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! http.*", + r"^! http.*$", r"", line ) line = re.sub( - r"^://.*/.*", + r"^://.*/.*$", r"", line ) line = re.sub( - r".*104\\\.154\\\.\..*", + r".*104\\\.154\\\.\..*$", r"", line ) line = re.sub( - r"^/.*[a-z0-9]\\?/[a-z0-9\(].*", + r"^/.*[a-z0-9]\\?/[a-z0-9\(].*$", r"", line ) line = re.sub( - r"\|\|.*_.*", + r"\|\|.*_.*$", r"", line ) line = re.sub( - r"^/.*[a-z]\\/.*", + r"^/.*[a-z]\\/.*$", r"", line ) line = re.sub( - r"^/.*[a-z]\/.*", + r"^/.*[a-z]\/.*$", r"", line ) @@ -1315,13 +1315,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[a-z0-9@|].*\?.*", + r"^[a-z0-9@|].*\?.*$", r"", line ) line = re.sub( - r"^! Checksum:.*", + r"^! Checksum:.*$", r"", line ) @@ -1333,13 +1333,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^! 20(1|2).*", + r"^! 20(1|2).*$", r"", line ) line = re.sub( - r"^! Ref:.*", + r"^! Ref:.*$", r"", line ) @@ -1381,13 +1381,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^[a-z0-9.-].*[a-z0-9.-][/?_+=&][a-z0-9.$-].*", + r"^[a-z0-9.-].*[a-z0-9.-][/?_+=&][a-z0-9.$-].*$", r"", line ) line = re.sub( - r"^/.*[_?=/;~@%#+,].*", + r"^/.*[_?=/;~@%#+,].*$", r"", line ) @@ -1405,7 +1405,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*dmcdn\..*", + r".*dmcdn\..*$", r"", line ) @@ -1429,7 +1429,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^%.*", + r"^%.*$", r"", line )