From 0430ac3da27af78ba8f13e9c5b9c3f8ed0e26141 Mon Sep 17 00:00:00 2001 From: Bail <2915289604@qq.com> Date: Mon, 23 Jan 2023 18:46:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BE=AE=E5=9E=8B=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=95=86=E5=BA=97=E9=80=82=E9=85=8D=E4=BA=86=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoConfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoConfig.py b/AutoConfig.py index 406ceb8..6624dc4 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -17,6 +17,7 @@ import json import traceback import urllib.request import requests +import updatekiller import PyQt5.QtWidgets as QtWidgets from UI.AutoConfig import * from Model import * @@ -596,4 +597,4 @@ if __name__ == "__main__": traceback.print_exc() QtWidgets.QMessageBox.critical(window, "提示", "无法连接服务器") - app.exec_() \ No newline at end of file + app.exec_() From ca6ccedb57ef6a7984ae341759edbd2395778a0e Mon Sep 17 00:00:00 2001 From: Bail <2915289604@qq.com> Date: Mon, 23 Jan 2023 19:36:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=95=86=E5=BA=97=E6=8D=A2=E6=BA=90=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=AF=B9=E9=92=A9=E4=BD=8D=E7=BD=AE=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E6=98=AF=E9=98=B2=E6=AD=A2=E4=BA=86urlSources=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoConfig.py | 6 ++++-- README.md | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AutoConfig.py b/AutoConfig.py index 6624dc4..56117ea 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -25,7 +25,7 @@ try: import PyQt5.QtWebEngineWidgets as QtWebEngineWidgets webeng = True except: - print("未安装此依赖库") + print("未安装 QtWebEngine") #这样更容易排查问题 webeng = False print("""太常引·建康中秋夜为吕叔潜赋 一轮秋影转金波，飞镜又重磨。把酒问姮娥：被白发、欺人奈何？ @@ -526,7 +526,8 @@ def ChangeSources(): sources = [ui.actionGitlink, ui.actionGitee, ui.actionGithub, ui.action_IPv6, ui.action_2, ui.action_3, ui.action] for i in range(0, len(sources)): if sources[i].isChecked(): - urlSources = urlSourcesList[i] + old_urlSources = urlSources #先备份 + urlSources = urlSourcesList[i] #然后切换尝试 # 解析云列表 try: # 获取列表 @@ -539,6 +540,7 @@ def ChangeSources(): except: traceback.print_exc() QtWidgets.QMessageBox.critical(window, "提示", "无法连接服务器") + urlSources = old_urlSources #如果源不可用则换回来 break if __name__ == "__main__": diff --git a/README.md b/README.md index bcd297e..2966ab3 100755 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ sudo apt upgrade ### 三、使用程序自带的更新程序更新 -**1、打开 UEngine 运行器然后点击“关于”=>“检查更新”，点击“更新（更新过程中会关闭所有Python应用，包括这个应用）”** +**1、打开 UEngine 运行器然后点击“关于”=>“检查更新”，点击“更新（更新过程中会关闭这个应用的所有进程）”** ![image.png](https://storage.deepin.org/thread/202205220759382269_image.png) **2、输入密码进行更新** ![image.png](https://storage.deepin.org/thread/202205220801175784_image.png) From 911cca5373e54670e0e2977a0b914d1115bb4679 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 24 Jan 2023 15:08:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Daction=E7=9A=84=E5=AF=B9?= =?UTF-8?q?=E9=92=A9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoConfig.py | 4 ++++ Model/__pycache__/__init__.cpython-37.pyc | Bin 1180 -> 1162 bytes UI/__pycache__/AutoConfig.cpython-37.pyc | Bin 3811 -> 3793 bytes 3 files changed, 4 insertions(+) diff --git a/AutoConfig.py b/AutoConfig.py index 406ceb8..b4235a4 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -42,6 +42,7 @@ urlSourcesList = [ "http://gfdgdxi.free.idcfengye.com/uengine-runner-list/auto/", # 备用源 3 "http://127.0.0.1/uengine-runner-list/auto/" # 本地测试源 ] +urlSourcesIndex = 0 urlSources = urlSourcesList[0] lists = [] @@ -522,6 +523,7 @@ def readtxt(path): def ChangeSources(): global urlSources + global urlSourcesIndex sources = [ui.actionGitlink, ui.actionGitee, ui.actionGithub, ui.action_IPv6, ui.action_2, ui.action_3, ui.action] for i in range(0, len(sources)): if sources[i].isChecked(): @@ -535,7 +537,9 @@ def ChangeSources(): for i in lists: nmodel.appendRow(QtGui.QStandardItem(i[0])) ui.searchList.setModel(nmodel) + urlSourcesIndex = i except: + [ui.actionGitlink, ui.actionGitee, ui.actionGithub, ui.action_IPv6, ui.action_2, ui.action_3, ui.action][urlSourcesIndex].setChecked(True) traceback.print_exc() QtWidgets.QMessageBox.critical(window, "提示", "无法连接服务器") break diff --git a/Model/__pycache__/__init__.cpython-37.pyc b/Model/__pycache__/__init__.cpython-37.pyc index 5c93ee687420da9a17231c4bba12edbe84f6463c..10f7abc2b75f0a49e95297ba9ff9c576598fb74d 100644 GIT binary patch delta 80 zcmbQk*~Q82#LLUY00chG=QnbzF^NX8C+FwpCg!EAWGLbUivLp8FUg%8!Q{rsy?H*9 YAR{C9ROoEJzJd@`$PZj_v2J3(j+>@PHJOFI78SDT6 diff --git a/UI/__pycache__/AutoConfig.cpython-37.pyc b/UI/__pycache__/AutoConfig.cpython-37.pyc index dfeb1e3d9b7877b146c940c805cb103116938689..cb423672afe98a21b71bbd4048c7a300942b134f 100644 GIT binary patch delta 156 zcmaDXdr_9#iI@)+6*Z2%S=BbKQ~oBJuM|YCB7n4-zBv; zyCi?}S&m06jHZ(}@QMn6lof#qa}dj9@>SkSDGM+YE`y|Iat5EH27(XQc#Fd(H$SB` QC)JJ Date: Wed, 25 Jan 2023 00:47:08 +0000 Subject: [PATCH 4/6] update README.md. Signed-off-by: Allen <2849413304@qq.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2966ab3..15fe18f 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

UEngine 运行器 2.0.0

-

star +[![star](https://gitee.com/gfdgd-xi-org/uengine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi-org/uengine-runner/stargazers) fork ## 介绍 From 3ba968938709aa64850beff0a9fe8e59ed103c2b Mon Sep 17 00:00:00 2001 From: Allen <2849413304@qq.com> Date: Wed, 25 Jan 2023 00:48:01 +0000 Subject: [PATCH 5/6] update README.md. Signed-off-by: Allen <2849413304@qq.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15fe18f..84b4211 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

UEngine 运行器 2.0.0

-[![star](https://gitee.com/gfdgd-xi-org/uengine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi-org/uengine-runner/stargazers) +![star](https://gitee.com/gfdgd-xi-org/uengine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi-org/uengine-runner/stargazers) fork ## 介绍 From 5ae157890284a24eaae13a373b8be8aa61013fd5 Mon Sep 17 00:00:00 2001 From: Allen <2849413304@qq.com> Date: Wed, 25 Jan 2023 00:50:28 +0000 Subject: [PATCH 6/6] update README.md. Signed-off-by: Allen <2849413304@qq.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84b4211..dd460ab 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

UEngine 运行器 2.0.0

-![star](https://gitee.com/gfdgd-xi-org/uengine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi-org/uengine-runner/stargazers) +star fork ## 介绍