From 8a671f849729ff89a1809a4c1f5c994327afe0ea Mon Sep 17 00:00:00 2001 From: ellermister Date: Sun, 17 Nov 2019 15:03:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Updated=20shadowsocksr-speed.py=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=8A=82=E7=82=B9=E9=93=BE=E6=8E=A5=E6=B7=B7=E8=A7=A3?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=81=E8=AE=BE=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 6 ++++++ ParseSsr.py | 1 + shadowsocksr-speed-python2.py | 0 shadowsocksr-speed.py | 9 +++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 shadowsocksr-speed-python2.py diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ParseSsr.py b/ParseSsr.py index 9741d1b..add3284 100644 --- a/ParseSsr.py +++ b/ParseSsr.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 -*- import base64 #python /home/nu11/.config/electron-ssr/shadowsocksr/shadowsocks/local.py -s hk2.pyjiaoyi.cf -p 10384 -k EoWjVthG -m chacha20-ietf -O auth_aes128_md5 -o http_simple -g download.windowsupdate.com -b 0.0.0.0 -l 1080 diff --git a/shadowsocksr-speed-python2.py b/shadowsocksr-speed-python2.py new file mode 100644 index 0000000..e69de29 diff --git a/shadowsocksr-speed.py b/shadowsocksr-speed.py index 002a451..10b274c 100644 --- a/shadowsocksr-speed.py +++ b/shadowsocksr-speed.py @@ -1,3 +1,4 @@ +#coding:utf-8 import urllib.request import base64 # import shadowsocksr.shadowsocks @@ -262,6 +263,8 @@ def connect_ssr(ssr): os.system(cmd + " -d start") print(ssr['remarks']+"/"+ssr['server']) + print (test_option) + if test_option['ping']: ping_len="7" if isIP(result['host']) else "8" cmd="ping -c 5 %s |grep 'time=' | awk '{print $%s}' |cut -b 6-"% (result['host'],ping_len) @@ -300,18 +303,20 @@ def connect_ssr(ssr): result['youtube']=youtube print("youtube_test,speed:",youtube) result['state']="Success" + os.system(cmd + " -d stop") return result except Exception as e: print (e) + os.system(cmd + " -d stop") return result url=input("url:") ssr_config=[] speed_result=[] headers = {'User-Agent':'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0'} -f=urllib.request.Request(url,headers=headers) - +f=urllib.request.Request(url,headers=headers) +# ssr_subscribe = urllib.request.urlopen(f).read().decode('utf-8') #获取ssr订阅链接中数据 ssr_subscribe_decode = ParseSsr.base64_decode(ssr_subscribe) ssr_subscribe_decode=ssr_subscribe_decode.replace('\r','') From 415947534dfee30b3bf852cd415ea0fd6940153d Mon Sep 17 00:00:00 2001 From: ellermister Date: Sun, 17 Nov 2019 15:04:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shadowsocksr-speed-python2.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 shadowsocksr-speed-python2.py diff --git a/shadowsocksr-speed-python2.py b/shadowsocksr-speed-python2.py deleted file mode 100644 index e69de29..0000000