diff --git a/ProxyCat-CN/ProxyCat-V1.8.py b/ProxyCat-CN/ProxyCat-V1.8.py index e2db7f7..5f86371 100644 --- a/ProxyCat-CN/ProxyCat-V1.8.py +++ b/ProxyCat-CN/ProxyCat-V1.8.py @@ -68,7 +68,17 @@ def load_proxies(file_path: str = 'ip.txt') -> List[str]: def is_valid_proxy(proxy: str) -> bool: pattern = re.compile( - r'^((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d):([1-9]|[1-9]\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$|^([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}:( [1-9]|[1-9]\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$' + r'^(http|https|socks5)://' + r'(' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)' + r'|' + r'([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}' + r')' + r':' + r'(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]\d{4}|\d{1,4})$' ) return bool(pattern.match(proxy)) @@ -643,4 +653,4 @@ if __name__ == '__main__': try: asyncio.run(main()) except KeyboardInterrupt: - logging.info("程序被用户中断") \ No newline at end of file + logging.info("程序被用户中断") diff --git a/ProxyCat-EN/ProxyCat-V1.8.py b/ProxyCat-EN/ProxyCat-V1.8.py index 89bb579..3bb7fa2 100644 --- a/ProxyCat-EN/ProxyCat-V1.8.py +++ b/ProxyCat-EN/ProxyCat-V1.8.py @@ -68,7 +68,17 @@ def load_proxies(file_path: str = 'ip.txt') -> List[str]: def is_valid_proxy(proxy: str) -> bool: pattern = re.compile( - r'^((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d):([1-9]|[1-9]\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$|^([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}:( [1-9]|[1-9]\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$' + r'^(http|https|socks5)://' + r'(' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.' + r'(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)' + r'|' + r'([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}' + r')' + r':' + r'(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]\d{4}|\d{1,4})$' ) return bool(pattern.match(proxy)) @@ -643,4 +653,4 @@ if __name__ == '__main__': try: asyncio.run(main()) except KeyboardInterrupt: - logging.info("Program interrupted by user") \ No newline at end of file + logging.info("Program interrupted by user") diff --git a/ProxyCat-EN/README-EN.md b/ProxyCat-EN/README-EN.md index 49e74f5..f85947a 100644 --- a/ProxyCat-EN/README-EN.md +++ b/ProxyCat-EN/README-EN.md @@ -293,8 +293,6 @@ After actual testing, when the proxy address server has sufficient performance, If you have good ideas or encounter bugs during use, please contact the author through the following methods to provide feedback! -WeChat Public Account: **Honma Shironeko of Sakura Dormitory** - ## Acknowledgements No particular order is given. Thanks to the mentors who provided help for this project.