update

tonquer · Jan 12, 2024 · 0973142 · 0973142
1 parent 3fdb5a6
commit 0973142
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,11 +3,12 @@
 # https://github.com/tonquer/picacg-qt
 ######################################################################################
 # Version: v1.4.8
-# 2024/1/10
+# 2024/1/12
 # 1) 优化下载图片新增超时自动重试
 # 2) 下载右键菜单新增添加到本地漫画中
 # 3) 下载新增更新所有New章节
-# 3) 分流新增IPV6, 修复CDN分流填入IPV6时部分封面无法加载
+# 4) 分流新增IPV6, 修复CDN分流填入IPV6时部分封面无法加载
+# 5) 修复勾选无代理时，部分封面下载仍然走代理的问题
 
 
 # Version: v1.4.7

diff --git a/src/config/config.py b/src/config/config.py
@@ -15,7 +15,9 @@
 ProjectName = "PicACG"
 ThreadNum = 10                 # 线程
 DownloadThreadNum = 5          # 下载线程
-ResetDownloadCnt = 5           # 下载图片重试次数
+ResetDownloadCnt = 3           # 下载图片重试次数
+ResetDownloadCntDefault = 2           # 下载封面重试次数
+
 ConvertThreadNum = 3           # 同时转换数量
 ChatSavePath = "chat"
 SavePathDir = "commies"        # 下载目录
@@ -77,7 +79,7 @@
 Waifu2xUrl = "https://github.com/tonquer/picacg-qt/discussions/76"
 
 Address = ["188.114.98.153", "104.21.91.145"]  # 分类2，3 Ip列表
-AddressIpv6 = ["2606:4700:d:28:dbf4:26f3:c265:73bc", "2606:4700:130:690d:f740:eaca:ca6c:5e3"]
+AddressIpv6 = ["2606:4700:d:28:dbf4:26f3:c265:73bc", "2a06:98c1:3120:ca71:be2c:c721:d2b5:5dbf"]
 
 ImageServer2 = 's3.picacomic.com'          # 分流2 使用的图片服务器
 ImageServer2Jump = 'img.picacomic.com'          # 分流2 跳转的图片服务器

diff --git a/src/server/user_handler.py b/src/server/user_handler.py
@@ -11,7 +11,7 @@
 from tools.tool import ToolUtil
 from tools.user import User
 from . import req
-from .server import handler
+from .server import handler, Server
 
 @handler(req.InitReq)
 class InitHandler(object):
@@ -245,7 +245,6 @@ def __call__(self, backData):
 
                 except Exception as es:
                     Log.Error(es)
-                    from src.server.server import Server
                     if backData.req.resetCnt > 0:
                         backData.req.isReset = True
                         Server().ReDownload(backData)

diff --git a/src/task/qt_task.py b/src/task/qt_task.py
@@ -56,7 +56,7 @@ def AddSqlTask(self, table, data, taskType, callBack=None, backParam=None):
     # downloadCallBack(data, laveFileSize)
     # downloadCompleteBack(data, st)
     # downloadCompleteBack(data, st, backParam)
-    def AddDownloadTask(self, url, path, downloadCallBack=None, completeCallBack=None, downloadStCallBack=None, backParam=None, loadPath="", cachePath="", savePath="",  cleanFlag="", isReload=False, resetCnt=1):
+    def AddDownloadTask(self, url, path, downloadCallBack=None, completeCallBack=None, downloadStCallBack=None, backParam=None, loadPath="", cachePath="", savePath="",  cleanFlag="", isReload=False, resetCnt=config.ResetDownloadCntDefault):
         from task.task_download import TaskDownload
         if not cleanFlag:
             cleanFlag = self.__taskFlagId

diff --git a/src/tools/user.py b/src/tools/user.py
@@ -73,7 +73,8 @@ def InitBack(self, backData):
                 if Setting.ProxySelectIndex.value == 3:
                     imageServer = config.ImageServer3
                     address = config.Address[1]
-                    self.server.UpdateDns(address, imageServer)
+                    if not Setting.PreIpv6.value:
+                        self.server.UpdateDns(address, imageServer)
                 self.initRes = backData.res
                 return Status.Ok
             else: