Skip to content

Commit

Permalink
更新依赖版本和检测版本检测代理出错
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyLiang-lzm committed Jul 23, 2022
1 parent 7284ace commit 887409a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion BiliModule/About.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def accessWeb(self):

# 检查版本更新函数
def checkLatest(self):
self.cl = checkLatest(Release_INFO[0])
self.cl = checkLatest(Release_INFO[0], indict.get('Proxy'))
self.btn_latest.setEnabled(False)
self.cl._feedback.connect(self.verShow)
self.cl.start()
Expand Down
9 changes: 7 additions & 2 deletions BiliWorker/extra.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ def ver2num(inVer):
class checkLatest(QThread):
_feedback = Signal(int)

def __init__(self, inVer):
def __init__(self, inVer, proxy=None):
super(checkLatest, self).__init__()
self.lab_version = inVer
self.Proxy = proxy

def run(self):
try:
des = request.get("https://jimmyliang-lzm.github.io/source_storage/biliDownloader_verCheck.json", timeout=5)
des = request.get(
"https://jimmyliang-lzm.github.io/source_storage/biliDownloader_verCheck.json",
timeout=5,
proxies=self.Proxy
)
res = des.json()["biliDownloader_GUI"]
latestVer = ver2num(res)
myVer = ver2num(self.lab_version)
Expand Down
2 changes: 1 addition & 1 deletion etc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os, sys

# 发布版本信息
Release_INFO = ["V1.6.20220610", "2022/06/10"]
Release_INFO = ["V1.6.20220723", "2022/07/23"]

# 保存个人信息模板初始化
indict = {
Expand Down
8 changes: 7 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
altgraph==0.17.2
certifi==2021.10.8
charset-normalizer==2.0.12
future==0.18.2
idna==3.3
Jinja2==3.1.1
MarkupSafe==2.1.1
pefile==2021.9.3
prettytable==3.2.0
pyecharts==1.9.1
pyinstaller==4.10
pyinstaller-hooks-contrib==2022.3
PySide2==5.15.2.1
requests==2.27.1
pywin32-ctypes==0.2.0
requests==2.28.1
shiboken2==5.15.2.1
simplejson==3.17.6
urllib3==1.26.9
Expand Down

0 comments on commit 887409a

Please sign in to comment.