mirror of
https://github.com/shmilylty/OneForAll.git
synced 2026-08-26 04:47:48 +08:00
改进域名获取
This commit is contained in:
+12
-2
@@ -116,7 +116,11 @@ def read_target_file(target):
|
|||||||
with open(target, encoding='utf-8', errors='ignore') as file:
|
with open(target, encoding='utf-8', errors='ignore') as file:
|
||||||
for line in file:
|
for line in file:
|
||||||
domain = match_main_domain(line)
|
domain = match_main_domain(line)
|
||||||
if domain:
|
if not domain:
|
||||||
|
continue
|
||||||
|
domain = get_main_domain(domain)
|
||||||
|
if not domain:
|
||||||
|
continue
|
||||||
domains.add(domain)
|
domains.add(domain)
|
||||||
return domains
|
return domains
|
||||||
|
|
||||||
@@ -125,7 +129,11 @@ def get_from_target(target):
|
|||||||
domains = set()
|
domains = set()
|
||||||
if isinstance(target, str):
|
if isinstance(target, str):
|
||||||
domain = match_main_domain(target)
|
domain = match_main_domain(target)
|
||||||
if domain:
|
if not domain:
|
||||||
|
return domains
|
||||||
|
domain = get_main_domain(domain)
|
||||||
|
if not domain:
|
||||||
|
return domains
|
||||||
domains.add(domain)
|
domains.add(domain)
|
||||||
return domains
|
return domains
|
||||||
|
|
||||||
@@ -618,6 +626,8 @@ def check_version(local):
|
|||||||
|
|
||||||
|
|
||||||
def get_main_domain(domain):
|
def get_main_domain(domain):
|
||||||
|
if not isinstance(domain, str):
|
||||||
|
return None
|
||||||
return Domain(domain).registered()
|
return Domain(domain).registered()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user