Improve regex

2022-02-13 16:02:37 +03:00
parent 5c05e69764
commit a1d45cd1ac
1 changed files with 5 additions and 6 deletions
@@ -104,14 +104,13 @@ class ProxyScraperChecker:
        if not self.folders:
            raise ValueError("all folders are disabled in the config")

-        octet = r"(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])"
-        port = (
+        regex = r"(?:^|\D)(({0}\.{1}\.{1}\.{1}):{2})(?:\D|$)".format(
+            r"(?:[1-9]|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])",  # 1-255
+            r"(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])",  # 0-255
            r"(?:\d|[1-9]\d{1,3}|[1-5]\d{4}|6[0-4]\d{3}"
-            + r"|65[0-4]\d{2}|655[0-2]\d|6553[0-5])"
-        )
-        self.regex = re.compile(
-            rf"(?:^|\D)(({octet}\.{octet}\.{octet}\.{octet}):{port})(?:\D|$)"
+            + r"|65[0-4]\d{2}|655[0-2]\d|6553[0-5])",  # 0-65535
        )
+        self.regex = re.compile(regex)

        self.sort_by_speed = sort_by_speed
        self.timeout = timeout