From 4a7fab3822ebbd21ac5d4584235ce0671dab6fe8 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Sat, 11 Apr 2020 00:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=A0=E5=85=A5=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E6=89=B9=E9=87=8F=E4=B8=BB=E5=9F=9F=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneforall/common/utils.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/oneforall/common/utils.py b/oneforall/common/utils.py index 1a142b6..1cb1c1b 100644 --- a/oneforall/common/utils.py +++ b/oneforall/common/utils.py @@ -124,19 +124,19 @@ def get_domains(target): elif isinstance(target, list): domains = target elif isinstance(target, str): - target = target.lower().strip() - domain = Domain(target).match() - if domain: - domains.append(domain) + path = Path(target) + if path.exists() and path.is_file(): + with open(target, encoding='utf-8', errors='ignore') as file: + for line in file: + line = line.lower().strip() + domain = Domain(line).match() + if domain: + domains.append(domain) else: - path = Path(target) - if path.is_file() and path.exists(): - with open(target, encoding='utf-8', errors='ignore') as file: - for line in file: - line = line.lower().strip() - domain = Domain(line).match() - if domain: - domains.append(domain) + target = target.lower().strip() + domain = Domain(target).match() + if domain: + domains.append(domain) count = len(domains) if count == 0: logger.log('FATAL', f'获取到{count}个域名')