修复cdn地址未保存，修复看已下载图片问题

tonquer · Jun 14, 2023 · e458846 · e458846
1 parent 711da2b
commit e458846
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/config/config.py b/src/config/config.py
@@ -42,11 +42,11 @@
 UpdateUrl3Api = "https://api.fastgit.xyz/repos/tonquer/JMComic-qt/releases"
 UpdateUrl3Back = "https://hub.fastgit.xyz/tonquer/JMComic-qt"
 
-UpdateVersion = "v1.1.0"
-RealVersion = "v1.1.0"
-VersionTime = "2023-6-11"
+UpdateVersion = "v1.1.1"
+RealVersion = "v1.1.1"
+VersionTime = "2023-6-14"
 
-Waifu2xVersion = "1.1.5"
+Waifu2xVersion = "1.1.6"
 LoginUserName = ""
 
 

diff --git a/src/view/read/read_view.py b/src/view/read/read_view.py
@@ -815,7 +815,6 @@ def InitDownload(self):
             if not bookInfo or not downInfo:
                 QtOwner().ShowError(Str.GetStr(Str.FileError))
             else:
-                assert isinstance(bookInfo, Book)
                 assert isinstance(downInfo, DownloadEpsItem)
                 raw = {"st": Status.Ok, "maxPic": downInfo.picCnt, "title": downInfo.epsTitle}
                 self.StartLoadPicUrlBack(raw, "")
@@ -829,7 +828,7 @@ def AddDownload(self, i):
             self.AddDownloadBook(self.bookId, self.epsId, i,
                                  downloadCallBack=self.UpdateProcessBar,
                                  completeCallBack=self.CompleteDownloadPic,
-                                 backParam=i, loadPath=loadPath)
+                                 backParam=i)
         else:
             self.AddDownloadBookCache(loadPath, completeCallBack=self.CompleteDownloadPic, backParam=i)
         if i not in self.pictureData:

diff --git a/src/view/user/login_proxy_widget.py b/src/view/user/login_proxy_widget.py
@@ -103,6 +103,8 @@ def SaveSetting(self):
         Setting.ProxySelectIndex.SetValue(self.radioApiGroup.checkedId())
         Setting.ProxyImgSelectIndex.SetValue(self.radioImgGroup.checkedId())
         Setting.IsLoginProxy.SetValue(int(self.loginProxy.isChecked()))
+        Setting.PreferCDNIPImg.SetValue(self.cdn_img_ip.text())
+        Setting.PreferCDNIP.SetValue(self.cdn_api_ip.text())
         # Setting.DohAddress.SetValue(self.dohEdit.text())
         # Setting.IsOpenDoh.SetValue(int(self.dohBox.isChecked()))
         self.UpdateServer()