This commit is contained in:
tonquer 2024-01-12 22:58:22 +08:00
parent 3fdb5a6608
commit 09731421ce
5 changed files with 11 additions and 8 deletions

View File

@ -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

View File

@ -15,7 +15,9 @@ Uuid = "defaultUuid"
ProjectName = "PicACG"
ThreadNum = 10 # 线程
DownloadThreadNum = 5 # 下载线程
ResetDownloadCnt = 5 # 下载图片重试次数
ResetDownloadCnt = 3 # 下载图片重试次数
ResetDownloadCntDefault = 2 # 下载封面重试次数
ConvertThreadNum = 3 # 同时转换数量
ChatSavePath = "chat"
SavePathDir = "commies" # 下载目录
@ -77,7 +79,7 @@ ProxyUrl3 = "https://hub.fastgit.xyz/tonquer/picacg-qt/discussions/48"
Waifu2xUrl = "https://github.com/tonquer/picacg-qt/discussions/76"
Address = ["188.114.98.153", "104.21.91.145"] # 分类23 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 跳转的图片服务器

View File

@ -11,7 +11,7 @@ from tools.status import Status
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 @@ class DownloadBookHandler(object):
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)

View File

@ -56,7 +56,7 @@ class QtTaskBase:
# 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

View File

@ -73,7 +73,8 @@ class User(Singleton):
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: