🎨 优化BiliPlus解析和下载体验

Zeal-L · Mar 31, 2024 · af92f4e · af92f4e
1 parent d98945b
commit af92f4e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 77 deletions.
diff --git a/src/BiliPlus.py b/src/BiliPlus.py
@@ -141,20 +141,17 @@ def _(url: str) -> str:
                     ep.available = True
 
             if len(ep_available) == 0:
-                self.mainGUI.signal_message_box.emit(
-                    "BiliPlus无此漫画的缓存记录\n"
-                    "请在BiliPlus的该漫画详情页面使用功能“获取未缓存索引”后重试\n\n"
-                    "Ciallo～(∠・ω< )⌒★\n"
-                    "您的主动分享能温暖每一个漫画人\n"
-                    "请在BiliPlus漫画主页进入功能“查看已购漫画”展示你的实力!"
-                )
+                msg = "BiliPlus无此漫画的缓存记录\n\n" \
+                      "请在BiliPlus的该漫画详情页面使用功能“获取未缓存索引”后重试\n\n"
+            elif unlock_times != 0:
+                msg = f"BiliPlus为本漫画额外解锁{unlock_times}个章节\n\n"
             else:
-                self.mainGUI.signal_information_box.emit(
-                    f"BiliPlus为本漫画额外解锁{unlock_times}个章节\n\n"
-                    "Ciallo～(∠・ω< )⌒★\n"
-                    "你的主动分享能温暖每一个漫画人\n"
-                    "请在BiliPlus漫画主页进入功能“查看已购漫画”展示你的实力!"
-                )
+                msg = "BiliPlus未能为此漫画解锁更多章节\n\n"
+            self.mainGUI.signal_information_box.emit(
+                f"{msg}Ciallo～(∠・ω< )⌒★\n"
+                "您的主动分享能温暖每一个漫画人\n"
+                "请在BiliPlus漫画主页进入功能“查看已购漫画”展示你的实力!"
+            )
         except requests.RequestException as e:
             msg = f"漫画id:{self.comic_id} 处理BiliPlus解锁章节数据多次后失败!"
             logger.error(msg)

diff --git a/src/ui/MangaUI.py b/src/ui/MangaUI.py
@@ -123,7 +123,7 @@ def _() -> None:
             self.present_comic_id = comic_id
             self.resolveEnable("resolving")
             comic = Comic(self.present_comic_id, self.mainGUI)
-            self.updateComicInfoEvent(comic, "bilibili")
+            self.updateComicInfoEvent(comic, "done")
 
         self.mainGUI.lineEdit_manga_search_id.returnPressed.connect(_)
         self.mainGUI.pushButton_manga_search_id.clicked.connect(_)
@@ -138,7 +138,7 @@ def _(item: QListWidgetItem) -> None:
             self.present_comic_id = self.search_info[index]["id"]
             self.resolveEnable("resolving")
             comic = Comic(self.present_comic_id, self.mainGUI)
-            self.updateComicInfoEvent(comic, "bilibili")
+            self.updateComicInfoEvent(comic, "done")
 
         self.mainGUI.listWidget_manga_search.itemDoubleClicked.connect(_)
 
@@ -375,7 +375,7 @@ def updateComicInfoEvent(self, comic: Comic, resolve_type: str, _event: QEvent =
 
         Args:
             comic (Comic): 漫画类实例
-            resolve_type (str): 更新的解析类型
+            resolve_type (str): 更新的进度类型
         """
 
         if self.mainGUI.label_resolve_status.text() == "":
@@ -392,7 +392,7 @@ def getComicInfo(self, comic: Comic, resolve_type: str) -> None:
 
         Args:
             comic (Comic): 获取的漫画实例
-            resolve_type (str): 更新的解析类型
+            resolve_type (str): 更新的进度类型
 
         """
 
@@ -785,7 +785,7 @@ def _() -> None:
                 return
             self.resolveEnable("resolving")
             comic = Comic(self.present_comic_id, self.mainGUI)
-            self.updateComicInfoEvent(comic, "bilibili")
+            self.updateComicInfoEvent(comic, "done")
 
         self.mainGUI.pushButton_resolve_detail.clicked.connect(_)
 
@@ -802,7 +802,7 @@ def _() -> None:
                 return
             self.resolveEnable("resolving")
             comic = BiliPlusComic(self.present_comic_id, self.mainGUI)
-            self.updateComicInfoEvent(comic, "biliplus")
+            self.updateComicInfoEvent(comic, "done")
 
         self.mainGUI.pushButton_biliplus_resolve_detail.clicked.connect(_)
 
@@ -869,7 +869,6 @@ def _() -> None:
             self.mainGUI.tabWidget_download_list.setCurrentIndex(0)
 
         self.mainGUI.pushButton_chp_detail_download_selected.clicked.connect(_)
-        self.mainGUI.pushButton_biliplus_detail_download_selected.clicked.connect(_)
 
     ###########################################################
 
@@ -883,17 +882,12 @@ def resolveEnable(self, resolve_type: str) -> None:
             self.mainGUI.pushButton_resolve_detail.setEnabled(False)
             self.mainGUI.pushButton_biliplus_resolve_detail.setEnabled(False)
             self.mainGUI.pushButton_chp_detail_download_selected.setEnabled(False)
-            self.mainGUI.pushButton_biliplus_detail_download_selected.setEnabled(False)
         else:
             self.mainGUI.pushButton_resolve_detail.setEnabled(True)
             self.mainGUI.pushButton_biliplus_resolve_detail.setEnabled(True)
 
-        if resolve_type == "bilibili":
+        if resolve_type == "done":
             self.mainGUI.pushButton_chp_detail_download_selected.setEnabled(True)
-            self.mainGUI.pushButton_biliplus_detail_download_selected.setEnabled(False)
-        elif resolve_type == "biliplus":
-            self.mainGUI.pushButton_chp_detail_download_selected.setEnabled(False)
-            self.mainGUI.pushButton_biliplus_detail_download_selected.setEnabled(True)
 
     ############################################################
 

diff --git a/src/ui/PySide_src/mainWindow.ui b/src/ui/PySide_src/mainWindow.ui
@@ -462,36 +462,6 @@
                   </property>
                  </widget>
                 </item>
-                <item>
-                 <widget class="QLabel" name="label_biliplus_empty">
-                  <property name="text">
-                   <string/>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="Line" name="line_11">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="pushButton_biliplus_detail_download_selected">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>130</width>
-                    <height>25</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>下载BiliPlus选中章节</string>
-                  </property>
-                 </widget>
-                </item>
                </layout>
               </item>
              </layout>

diff --git a/src/ui/PySide_src/mainWindow_ui.py b/src/ui/PySide_src/mainWindow_ui.py
@@ -333,25 +333,6 @@ def setupUi(self, MainWindow):
 
         self.h_Layout_biliplus_detail.addWidget(self.label_resolve_status)
 
-        self.label_biliplus_empty = QLabel(self.widget_biliplus_detail)
-        self.label_biliplus_empty.setObjectName(u"label_biliplus_empty")
-
-        self.h_Layout_biliplus_detail.addWidget(self.label_biliplus_empty)
-
-        self.line_11 = QFrame(self.widget_biliplus_detail)
-        self.line_11.setObjectName(u"line_11")
-        self.line_11.setFrameShape(QFrame.VLine)
-        self.line_11.setFrameShadow(QFrame.Sunken)
-
-        self.h_Layout_biliplus_detail.addWidget(self.line_11)
-
-        self.pushButton_biliplus_detail_download_selected = QPushButton(self.widget_biliplus_detail)
-        self.pushButton_biliplus_detail_download_selected.setObjectName(u"pushButton_biliplus_detail_download_selected")
-        self.pushButton_biliplus_detail_download_selected.setEnabled(False)
-        self.pushButton_biliplus_detail_download_selected.setMaximumSize(QSize(130, 25))
-
-        self.h_Layout_biliplus_detail.addWidget(self.pushButton_biliplus_detail_download_selected)
-
 
         self.h_Layout_widget_biliplus_detail.addLayout(self.h_Layout_biliplus_detail)
 
@@ -922,8 +903,6 @@ def retranslateUi(self, MainWindow):
         self.pushButton_resolve_detail.setText(QCoreApplication.translate("MainWindow", u"B\u7ad9\u89e3\u6790", None))
         self.pushButton_biliplus_resolve_detail.setText(QCoreApplication.translate("MainWindow", u"BiliPlus\u89e3\u6790", None))
         self.label_resolve_status.setText("")
-        self.label_biliplus_empty.setText("")
-        self.pushButton_biliplus_detail_download_selected.setText(QCoreApplication.translate("MainWindow", u"\u4e0b\u8f7dBiliPlus\u9009\u4e2d\u7ae0\u8282", None))
         self.textBrowser_tutorial.setHtml(QCoreApplication.translate("MainWindow", u"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"