river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-10-28 03:35:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加平台适配

Browse Source
This commit is contained in:
JrD
2020-09-18 11:50:42 +08:00
parent f01f642aaf
commit bdf329713c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils.py
+9 -5
View File
@@ -733,7 +733,7 @@ def sort_by_subdomain(data):
def ping(host, path): def ping(host, path):
param = '-n' if platform.system().lower() == 'windows' else '-c' param = '-n' if platform.system().lower() == 'windows' else '-c'
command = ['ping', param, '3', host] command = ['ping', param, '5', host]
with open(path, "w") as f: with open(path, "w") as f:
return subprocess.call(command, stdout=f, stderr=f) return subprocess.call(command, stdout=f, stderr=f)
@@ -743,12 +743,16 @@ def ping_avg_time(nameserver):
temp_path = settings.temp_save_dir.joinpath('ping') temp_path = settings.temp_save_dir.joinpath('ping')
ping(nameserver, path=temp_path) ping(nameserver, path=temp_path)
with open(temp_path, 'r') as f: with open(temp_path, 'r') as f:
text = f.readlines()[-1] text = f.read()
if '100.0% packet loss' in text: if '100.0% packet loss' in text or '100% 丢失' in text:
logger.log('ALERT', f'100.0% packet loss, ping {nameserver} failed.') logger.log('ALERT', f'100.0% packet loss, ping {nameserver} failed.')
return None return None
elif 'round-trip' in text: elif platform.system() in ('Darwin', 'Linux'):
avg_time = re.findall(r'\d+\.\d+', text)[1] avg_time = re.findall(r'\d+\.\d+', f.readlines()[-1])[1]
logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.')
return avg_time
elif platform.system() == 'Windows':
avg_time = re.findall(r'(?:Average|平均).+(\d.)ms', text)[0]
logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.') logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.')
return avg_time return avg_time
else: else: