Update downloader with better code

.github/workflows/main.yml

@@ -34,5 +34,5 @@ jobs:
 
         git add proxies
         git commit -m "Update proxies"
-        git push https://$GH_TOKEN@github.com/SevenworksDev/proxy-list.git
+        git push https://$GH_TOKEN@github.com/CallocGD/proxy-list.git
 

downloader

@@ -1,29 +1,53 @@
-import requests, json, os, re
+import requests
+import json
+import os
+import re
 from tqdm import tqdm
-from urllib.parse import urlparse
+
+# Modfied from aiohttp.helpers module's regexes with valid port numbers added in 
+IPV4 = re.compile(
+    r"(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\:[0-9]+"
+)
+IPV6 = re.compile(
+    r"(?:(?:(?:[A-F0-9]{1,4}:){6}|(?=(?:[A-F0-9]{0,4}:){0,6}"
+    r"(?:[0-9]{1,3}\.){3}[0-9]{1,3}$)(([0-9A-F]{1,4}:){0,5}|:)"
+    r"((:[0-9A-F]{1,4}){1,5}:|:)|::(?:[A-F0-9]{1,4}:){5})"
+    r"(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}"
+    r"(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])|(?:[A-F0-9]{1,4}:){7}"
+    r"[A-F0-9]{1,4}|(?=(?:[A-F0-9]{0,4}:){0,7}[A-F0-9]{0,4}$)"
+    r"(([0-9A-F]{1,4}:){1,7}|:)((:[0-9A-F]{1,4}){1,7}|:)|(?:[A-F0-9]{1,4}:){7}"
+    r":|:(:[A-F0-9]{1,4}){7})\:[0-9]+"
+) 
 
 os.makedirs('proxies', exist_ok=True)
 
-def download(type, lists):
+def download(type:str, lists:list[str]):
     proxies = set()
 
     for url in tqdm(lists, desc=f"Downloading {type}", unit="file"):
         response = requests.get(url)
         if response.status_code == 200:
-            proxy = response.text.strip().split('\n')
-            valid = [line.strip() for line in proxy if all(
-                char not in line for char in ['/', '<', '>', '=']
-            ) and line.strip() != '' and len(line) >= 8 and len(line) <= 24 and not re.search('[a-zA-Z]', line)]
-            proxies.update(valid)
+            for proxy in response.text.strip().split('\n'):
+                if matching := (IPV4.search(proxy) or IPV6.search(proxy)):
+                    # Remove 0s from IPS such as 050.125.125.125 it's annyoing and I don't like it - Calloc
+                    proxies.add(matching.group(0).lstrip("0"))
+
 
     output = os.path.join('proxies', f"{type}.txt")
     with open(output, 'w', encoding='utf-8') as f:
         f.write('\n'.join(proxies))
 
     return output
 
-with open('lists.json', 'r') as json_file:
-    proxylist = json.load(json_file)
 
-for type, lists in proxylist['proxies'].items():
-    output = download(type, lists)
+def main():
+    with open('lists.json', 'r') as json_file:
+        proxylist = json.load(json_file)
+
+    for type, lists in proxylist['proxies'].items():
+        download(type, lists)
+
+
+if __name__ == "__main__":
+    main()
+