📝✨🎨修正README,优化提示,时装哈希校验设置

Zeal-L · Nov 15, 2024 · f77f254 · f77f254
1 parent 5dce5af
commit f77f254
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,6 @@
 
 ## ✨ 主要功能 / 特性
 
-- **黑科技下载未解锁章节！**
 - **提供多种可选的保存格式**
 - **支持已购被下架漫画下载**
 - **已打包成单个可执行文件，双击即用！**
@@ -73,7 +72,8 @@
       7. 否则请再次确认上述步骤，检查是否正确复制内容不含空格，还有疑问的话欢迎联系作者或提 `Issues`
   - **BiliPlus解析**
     - 利用 [biliplus](https://www.biliplus.com/) 提供的 [ComicWebReader](https://www.biliplus.com/manga/) 在线漫画平台的api来尝试获取更多的可下载章节
-    - 该网站现有 4w+ 已关联 `Bilibili` 帐号的访客，也就是说很有概率你想看的漫画已经有人购买了，所以可以尝试一下
+    - ~~该网站现有 4w+ 已关联 `Bilibili` 帐号的访客，也就是说很有概率你想看的漫画已经有人购买了，所以可以尝试一下~~
+    - 经历版本变迁，该网站可用性大不如前，你想看的漫画已经有人购买的概率没有那么高，但是仍然可以尝试一下
     - **特别提示: 毕竟是要提供 Cookie 给第三方网站托管，因此可能会有潜在的安全风险。敏感人群请不要使用自己主账号的 Cookie**
     - `BiliPlus` 的 `Cookie` 获取方法跟上述类似，在 [ComicWebReader](https://www.biliplus.com/manga/) 登入后在开发者工具中找到 `Cookie` 后，将其整个复制并粘贴到程序设置选项中的 `BiliPlus Cookie` 即可
 

diff --git a/src/Episode.py b/src/Episode.py
@@ -586,13 +586,14 @@ def _() -> None:
 
         try:
             _()
-            isValid, img_md5 = isCheckSumValid(md5, img)
-            if not isValid:
-                logger.warning(
-                    f"《{self.comic_name}》章节：{self.title} - {index} - {img_url} - 下载内容Checksum不正确! 重试中...\n"
-                    f"\t{md5} ≠ {img_md5}"
-                )
-                raise requests.HTTPError()
+            if self.mainGUI.getConfig("hash_check"):
+                isValid, img_md5 = isCheckSumValid(md5, img)
+                if not isValid:
+                    logger.warning(
+                        f"《{self.comic_name}》章节：{self.title} - {index} - {img_url} - 下载内容Checksum不正确! 重试中...\n"
+                        f"\t{md5} ≠ {img_md5}"
+                    )
+                    raise requests.HTTPError()
         except OSError as e:
             logger.error(
                 f"《{self.comic_name}》章节：{self.title} - {index} - {img_url} - {path_to_save} - 处理图片失败!\n{e}"

diff --git a/src/ui/PySide_src/mainWindow.ui b/src/ui/PySide_src/mainWindow.ui
@@ -1203,62 +1203,62 @@ li.checked::marker { content: &quot;\2612&quot;; }
             </item>
             <item>
              <property name="text">
-              <string>1700宽jpg</string>
+              <string>全尺寸jpg</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1400宽jpg</string>
+              <string>全尺寸webp</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1100宽jpg</string>
+              <string>全尺寸avif</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>800宽jpg</string>
+              <string>1700宽jpg</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1700宽webp</string>
+              <string>1400宽jpg</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1400宽webp</string>
+              <string>1100宽jpg</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1100宽webp</string>
+              <string>1700宽webp</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>800宽webp</string>
+              <string>1400宽webp</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1700宽avif</string>
+              <string>1100宽webp</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1400宽avif</string>
+              <string>1700宽avif</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>1100宽avif</string>
+              <string>1400宽avif</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>800宽avif</string>
+              <string>1100宽avif</string>
              </property>
             </item>
            </widget>

diff --git a/src/ui/PySide_src/mainWindow_ui.py b/src/ui/PySide_src/mainWindow_ui.py
@@ -1033,18 +1033,18 @@ def retranslateUi(self, MainWindow):
 
         self.label_epi_rename_rule.setText(QCoreApplication.translate("MainWindow", u"\u4e0b\u8f7d\u56fe\u7247\u683c\u5f0f\uff1a", None))
         self.comboBox_img_format.setItemText(0, QCoreApplication.translate("MainWindow", u"\u539f\u59cb\u683c\u5f0f", None))
-        self.comboBox_img_format.setItemText(1, QCoreApplication.translate("MainWindow", u"1700\u5bbdjpg", None))
-        self.comboBox_img_format.setItemText(2, QCoreApplication.translate("MainWindow", u"1400\u5bbdjpg", None))
-        self.comboBox_img_format.setItemText(3, QCoreApplication.translate("MainWindow", u"1100\u5bbdjpg", None))
-        self.comboBox_img_format.setItemText(4, QCoreApplication.translate("MainWindow", u"800\u5bbdjpg", None))
-        self.comboBox_img_format.setItemText(5, QCoreApplication.translate("MainWindow", u"1700\u5bbdwebp", None))
-        self.comboBox_img_format.setItemText(6, QCoreApplication.translate("MainWindow", u"1400\u5bbdwebp", None))
-        self.comboBox_img_format.setItemText(7, QCoreApplication.translate("MainWindow", u"1100\u5bbdwebp", None))
-        self.comboBox_img_format.setItemText(8, QCoreApplication.translate("MainWindow", u"800\u5bbdwebp", None))
-        self.comboBox_img_format.setItemText(9, QCoreApplication.translate("MainWindow", u"1700\u5bbdavif", None))
-        self.comboBox_img_format.setItemText(10, QCoreApplication.translate("MainWindow", u"1400\u5bbdavif", None))
-        self.comboBox_img_format.setItemText(11, QCoreApplication.translate("MainWindow", u"1100\u5bbdavif", None))
-        self.comboBox_img_format.setItemText(12, QCoreApplication.translate("MainWindow", u"800\u5bbdavif", None))
+        self.comboBox_img_format.setItemText(1, QCoreApplication.translate("MainWindow", u"\u5168\u5c3a\u5bf8jpg", None))
+        self.comboBox_img_format.setItemText(2, QCoreApplication.translate("MainWindow", u"\u5168\u5c3a\u5bf8webp", None))
+        self.comboBox_img_format.setItemText(3, QCoreApplication.translate("MainWindow", u"\u5168\u5c3a\u5bf8avif", None))
+        self.comboBox_img_format.setItemText(4, QCoreApplication.translate("MainWindow", u"1700\u5bbdjpg", None))
+        self.comboBox_img_format.setItemText(5, QCoreApplication.translate("MainWindow", u"1400\u5bbdjpg", None))
+        self.comboBox_img_format.setItemText(6, QCoreApplication.translate("MainWindow", u"1100\u5bbdjpg", None))
+        self.comboBox_img_format.setItemText(7, QCoreApplication.translate("MainWindow", u"1700\u5bbdwebp", None))
+        self.comboBox_img_format.setItemText(8, QCoreApplication.translate("MainWindow", u"1400\u5bbdwebp", None))
+        self.comboBox_img_format.setItemText(9, QCoreApplication.translate("MainWindow", u"1100\u5bbdwebp", None))
+        self.comboBox_img_format.setItemText(10, QCoreApplication.translate("MainWindow", u"1700\u5bbdavif", None))
+        self.comboBox_img_format.setItemText(11, QCoreApplication.translate("MainWindow", u"1400\u5bbdavif", None))
+        self.comboBox_img_format.setItemText(12, QCoreApplication.translate("MainWindow", u"1100\u5bbdavif", None))
 
         self.checkBox_hash_check.setText(QCoreApplication.translate("MainWindow", u"\u662f\u5426\u8fdb\u884c\u54c8\u5e0c\u6821\u9a8c(\u6211\u77e5\u9053\u6211\u5728\u505a\u4ec0\u4e48)", None))
         self.groupBox.setTitle(QCoreApplication.translate("MainWindow", u"\u6ce8\u610f\uff1a\u4ee5\u4e0b\u8bbe\u7f6e\u53ea\u5728\u4e0b\u6b21\u542f\u52a8\u65f6\u751f\u6548\uff01", None))

diff --git a/src/ui/SettingUI.py b/src/ui/SettingUI.py
@@ -302,6 +302,9 @@ def _() -> None:
             else:
                 self.mainGUI.lineEdit_save_path.setText(os.getcwd())
                 self.mainGUI.updateConfig("save_path", os.getcwd())
+            self.mainGUI.signal_information_box.emit(
+                "修改成功！重新解析章节后生效"
+            )
 
         self.mainGUI.pushButton_save_path.clicked.connect(_)
 
@@ -314,6 +317,9 @@ def _() -> None:
                 self.mainGUI.lineEdit_save_path.setText(os.getcwd())
                 self.mainGUI.updateConfig("save_path", os.getcwd())
             self.mainGUI.lineEdit_save_path.clearFocus()
+            self.mainGUI.signal_information_box.emit(
+                "修改成功！重新解析章节后生效"
+            )
 
         self.mainGUI.lineEdit_save_path.returnPressed.connect(_)
 
@@ -395,7 +401,7 @@ def init_saveMethod(self) -> None:
         def _(button: QRadioButton, checked: bool) -> None:
             if checked:
                 self.mainGUI.updateConfig("save_method", button.text())
-                self.mainGUI.signal_message_box.emit(
+                self.mainGUI.signal_information_box.emit(
                     "修改成功！重新解析章节后生效"
                 )
 
@@ -557,18 +563,17 @@ def init_img_format_setting(self) -> None:
         """绑定下载图片格式设置"""
         img_format_list = {
             "default": "原始格式",
+            "10000jpg": "全尺寸jpg",
+            "10000webp": "全尺寸webp",
+            "10000avif": "全尺寸avif",
             "1700jpg": "1700宽jpg",
             "1400jpg": "1400宽jpg",
             "1100jpg": "1100宽jpg",
-            "800jpg": "800宽jpg",
             "1700webp": "1700宽webp",
             "1400webp": "1400宽webp",
-            "1100webp": "1100宽webp",
-            "800webp": "800宽webp",
             "1700avif": "1700宽avif",
             "1400avif": "1400宽avif",
             "1100avif": "1100宽avif",
-            "800avif": "800宽avif",
         }
         reversed_img_format_list = {value: key for key, value in img_format_list.items()}