From 2fba31c06ad58d12719bc65b5dee9cc3c657449a Mon Sep 17 00:00:00 2001 From: monosans Date: Tue, 21 Jun 2022 13:10:56 +0300 Subject: [PATCH] Rewrite regex --- main.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 92c3571..79217d2 100755 --- a/main.py +++ b/main.py @@ -150,11 +150,21 @@ class ProxyScraperChecker: if not self.enabled_folders: raise ValueError("all folders are disabled in the config") - 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])", # 0-65535 + regex = ( + r"(?:^|\D)?((" + + r"(?:[1-9]|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])" # 1-255 + + r"\." + + r"(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])" # 0-255 + + r"\." + + r"(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])" # 0-255 + + r"\." + + r"(?:\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])" # 0-255 + + r"):" + + ( + 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])" + ) # 0-65535 + + r")(?:\D|$)" ) self.regex = re.compile(regex)