From dd7935b69c9b847a857140a147ec10f170c8ed40 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Wed, 8 Apr 2020 21:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=9F=E5=90=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneforall/common/utils.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/oneforall/common/utils.py b/oneforall/common/utils.py index b13d003..2170df8 100644 --- a/oneforall/common/utils.py +++ b/oneforall/common/utils.py @@ -124,15 +124,19 @@ def get_domains(target): elif isinstance(target, list): domains = target elif isinstance(target, str): - path = Path(target) - if path.is_file(): - with open(target, encoding='utf-8', errors='ignore') as file: - for line in file: - domain = Domain(line.strip()).match() - if domain: - domains.append(domain) - elif Domain(target).match(): - domains = [target] + target = target.lower().strip() + domain = Domain(target).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) count = len(domains) if count == 0: logger.log('FATAL', f'获取到{count}个域名')