Merge-build: v2.7.1-beta

Author: jasoneri

GUI/browser_window.py

@@ -4,6 +4,7 @@
 from PyQt5.QtCore import Qt, QUrl
 from PyQt5.QtNetwork import QNetworkCookie
 from PyQt5.QtWidgets import QMainWindow
+from PyQt5.QtWebEngineWidgets import QWebEnginePage
 from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInterceptor
 from qfluentwidgets import InfoBar, InfoBarPosition, FluentIcon as FIF, ToolTipFilter, ToolTipPosition
 from qframelesswindow.webengine import FramelessWebEngineView
@@ -31,6 +32,23 @@ def interceptRequest(self, info):
             info.setHttpHeader(b"referer", self.referer_url.encode())
 
 
+class CustomWebEnginePage(QWebEnginePage):
+    def createWindow(self, _type):
+        new_page = QWebEnginePage(self.profile(), self.parent())
+        new_page.urlChanged.connect(lambda url: self.setUrl(url) if url.isValid() else None)
+        return new_page
+
+
+class CustomFramelessWebEngineView(FramelessWebEngineView):
+    def createPage(self):
+        return CustomWebEnginePage(self.page().profile(), self)
+    
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        custom_page = self.createPage()
+        self.setPage(custom_page)
+
+
 class BrowserWindow(QMainWindow, Ui_browser):
     def __init__(self, gui, proxies: str = None):
         super(BrowserWindow, self).__init__()
@@ -40,8 +58,10 @@ def __init__(self, gui, proxies: str = None):
         if proxies:
             self.set_proxies(proxies)
         self.gui = gui
-        self.view = FramelessWebEngineView(self)
+        self.view = CustomFramelessWebEngineView(self)
         self.profile = self.view.page().profile()
+        self.profile.setHttpUserAgent(
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36")
         self.profile.setUrlRequestInterceptor(self.interceptor)
         self.home_url = QUrl.fromLocalFile(self.gui.tf)
         self.set_env_mode()
@@ -65,7 +85,7 @@ def set_env_mode(self):
             self.set_cookies("ehentai")
         elif index == 6:  # hitomi
             self.set_referer_nterceptor(self.gui.spiderUtils.index)
-    
+
     def _set_dev_tools(self):
         from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEngineSettings
         settings = self.view.settings()
@@ -222,8 +242,12 @@ def refresh_tf(html):
         self.js_execute("get_curr_hml();", refresh_tf)
 
     # ---子任务模块
-    def init_tasks_progress_panel(self):
-        self.js_execute("initTaskPanel();", lambda _: self.gui.tf.set_tasks_progress_panel())
+    def init_tasks_progress_panel(self, callback=None):
+        def on_init_complete(_):
+            self.gui.tf.set_tasks_progress_panel()
+            if callback:
+                callback()
+        self.js_execute("initTaskPanel();", on_init_complete)
 
     def add_task(self, tasks_obj):
         _js_code = f"""addTask('{tasks_obj.taskid}', `{tasks_obj.display_title}`, `{tasks_obj.tasks_count}`, `{tasks_obj.title_url}`);"""

GUI/conf_dialog.py

@@ -9,8 +9,7 @@
 import yaml
 from PyQt5 import QtCore
 from PyQt5.QtWidgets import QDialog, QSizePolicy, QFileDialog, QCompleter, QApplication
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtCore import QUrl, Qt
+from PyQt5.QtCore import Qt
 from qfluentwidgets import (
     FluentIcon as FIF, PushButton, PrimaryPushButton, TransparentPushButton, 
     PushSettingCard, InfoBarPosition, TransparentToggleToolButton, InfoBar, ComboBox
@@ -169,7 +168,7 @@ def refresh_size_for_expand(self, _):
 
     def bind_logic(self):
         def _open_docs():
-            QDesktopServices.openUrl(QUrl('https://doc.comicguispider.nyc.mn/'))
+            self.gui.open_url_by_browser('https://doc.comicguispider.nyc.mn/')
         self.descBtn.clicked.connect(_open_docs)
         def _switch_mode():
             if self.darkTheme.isChecked():
@@ -183,7 +182,7 @@ def _regular_update():
             Updater(self.gui).run()
         self.updateBtn.clicked.connect(_regular_update)
         self.supportBtn.clicked.connect(lambda: CustomFlyout.make(
-            view=SupportView(Proj.url, self), target=self.supportBtn, parent=self
+            view=SupportView(self), target=self.supportBtn, parent=self
         ))
         def _tip_lang_change(idx):
             if self.langBox.itemData(idx) != conf.lang:
@@ -196,7 +195,7 @@ def _tip_lang_change(idx):
         def _tip_meta_change(idx):
             match self.metaTypeBox.itemText(idx):
                 case "ComicInfo.xml":
-                    _meta_tip = "适配平台例如：ComicRack, Komga, kavita"
+                    _meta_tip = "适配平台例如：ComicRack, Komga, kavita\n保存并内置重启后生效"
                 case _:
                     _meta_tip = ""
             if _meta_tip:

GUI/gui.py

@@ -6,7 +6,7 @@
 from multiprocessing import Process
 import multiprocessing.managers as m
 from PyQt5.QtGui import QKeySequence, QGuiApplication
-from PyQt5.QtCore import QThread, Qt, QCoreApplication, QRect, QTimer
+from PyQt5.QtCore import QThread, Qt, QCoreApplication, QUrl, QRect, QTimer
 from PyQt5.QtWidgets import QMainWindow, QCompleter, QShortcut
 
 from GUI.uic.qfluent import (
@@ -112,7 +112,6 @@ def finish_setup(self):
         self.keep_books = []
         self.eps = []
         self.conf_dia = ConfDialog(self)
-        self.textBrowser.setOpenExternalLinks(True)
         self.textBrowser.append(TextUtils.description())
         self.progressBar.setStyleSheet(r'QProgressBar {text-align: center; border-color: #0000ff;}'
                                        r'QProgressBar::chunk {background-color: #0cc7ff; width: 3px;}')
@@ -329,14 +328,15 @@ def preprocess_preview(self, url_str):
         self.preview.duel_contents()
         self.tf = self.preview.created_temp_html
 
-    def set_preview(self):
+    def set_preview(self, rect=None):
         self.BrowserWindow = BrowserWindowCls(self)
         preview_y = self.y() + self.funcGroupBox.y() - self.BrowserWindow.height() - 28
-        self.BrowserWindow.setGeometry(QRect(
+        rect = rect or QRect(
             self.x() + self.funcGroupBox.x(),
             preview_y if preview_y > 0 else 200,
             self.BrowserWindow.width(), self.BrowserWindow.height()
-        ))
+        )
+        self.BrowserWindow.setGeometry(rect)
         # button group
         self.previewBtn.setEnabled(True)
         self.previewBtn.setFocus()
@@ -606,3 +606,14 @@ def tpd(self, texts):
             view=self.BrowserWindow.domain_v, target=self.BrowserWindow, parent=self.BrowserWindow
         )
         self.BrowserWindow.domain_v.handle(texts)
+
+    def open_url_by_browser(self, url):
+        screen_height = QGuiApplication.primaryScreen().availableGeometry().height()
+        rect = QRect(self.x(), int(screen_height*0.05), 
+            self.width(), int(screen_height*0.9))
+        if not getattr(self, 'BrowserWindow'):
+            self.set_preview(rect)
+        else:
+            self.BrowserWindow.setGeometry(rect)
+        self.BrowserWindow.view.load(QUrl(url))
+        self.BrowserWindow.show()

GUI/mainwindow.py

@@ -50,7 +50,7 @@ def _repaint_textBrowser(self):
         if getattr(self, 'textBrowser', None):
             self.textBrowser.setParent(None)
             self.textBrowser.deleteLater()
-        self.textBrowser = TextBrowserWithBg(self.centralwidget)
+        self.textBrowser = TextBrowserWithBg(self)
         self.textBrowser.setMinimumSize(QtCore.QSize(200, 350))
         self.textBrowser.setObjectName("textBrowser")
         self.funcLayout.insertWidget(0, self.textBrowser)

GUI/manager/__init__.py

@@ -29,6 +29,8 @@ def __init__(self, gui):
         self._tasks = {}
         self.init_flag = True
         self.sql_handler = SqlUtils()
+        self._init_lock = False
+        self._pending_tasks = []
 
     def init(self):
         # 就是为了设定任务细化面板 包的饺子
@@ -42,15 +44,27 @@ def handle(self, task: t.Union[TasksObj, TaskObj]):
         if not getattr(self.gui, "BrowserWindow"):
             self.init()
         if not getattr(self.gui.tf, "tasks_progress_panel_flag"):
-            self.gui.BrowserWindow.init_tasks_progress_panel()
+            if not self._init_lock:
+                self._init_lock = True
+                self.gui.BrowserWindow.init_tasks_progress_panel(
+                    callback=self._process_pending_tasks
+                )
+            if isinstance(task, TasksObj):
+                self._pending_tasks.append(task)
+            return
         if isinstance(task, TasksObj):
             self.add_task(task)
         elif isinstance(task, TaskObj):
             if task.taskid not in self._tasks:
-                print(f"{task.taskid}: {task.page}")  # TODO[5](2025-10-29): 未解，但不怎么影响
+                print(f"{task.taskid}: {task.page}")
             else:
                 self.update_progress(task)  
 
+    def _process_pending_tasks(self):
+        for task in self._pending_tasks:
+            self.add_task(task)
+        self._pending_tasks.clear()
+
     def add_task(self, tasks_obj):
         self._tasks[tasks_obj.taskid] = tasks_obj
         self.gui.BrowserWindow.add_task(tasks_obj)

GUI/manager/preprocess.py

@@ -63,7 +63,7 @@ def on_success(_):
 
         def on_error(_):
             self.gui.disable_start()
-            self.gui.say("<br>❌ 解密获取失败，点击 rV按钮 > statusTool > 更新拷贝")
+            self.gui.say("<br>❌ 解密获取失败，内置重启再试下")
 
         self.task_manager.execute_simple_task(
             task_func=manga_copy_task,

GUI/tools/status.py

@@ -65,24 +65,6 @@ def __init__(self, gui):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(self.loop)
 
-    async def _fetch_aggr_status(self):
-        try:
-            resp_body = await fetch(Api.cloudflare_status(aggr=True),
-                                    dict(proxy=f"http://{conf.proxies[0]}") if conf.proxies else {})
-            resp_json = json.loads(resp_body)
-            return resp_json
-        except Exception as e:
-            return None
-
-    def fetch_all_status(self):
-        try:
-            resp_json = self.loop.run_until_complete(self._fetch_aggr_status())
-            if not resp_json:
-                return []
-            return [{"web": web, **info} for web, info in resp_json.items()]
-        except Exception as e:
-            return []
-
     async def _update_file(self, local_f, url):
         def to_md5(body: bytes):
             return hashlib.md5(body).hexdigest()
@@ -131,11 +113,6 @@ def init_ui(self):
         desc_label = StrongBodyLabel(tools_res.status_desc)
         first_row.addWidget(desc_label)
 
-        self.second_row = QHBoxLayout()
-        linkBtn = HyperlinkButton(FIF.LINK, "https://doc.comicguispider.nyc.mn/", "CGS")
-        self.second_row.insertWidget(1, linkBtn)
-        self.second_row.addStretch()
-
         third_row = QHBoxLayout()
         self.copy2Btn = PrimaryPushButton(FIF.UPDATE, "Update 拷贝", self)
         self.copy2Btn.clicked.connect(self.update_copy2_files)
@@ -144,14 +121,9 @@ def init_ui(self):
         third_row.addWidget(self.copy2Btn)
         third_row.addWidget(self.hitomiBtn)
 
-        for row in (first_row, self.second_row, third_row):
+        for row in (first_row, third_row):
             self.main_layout.addLayout(row)
 
-    def showEvent(self, event):
-        super().showEvent(event)
-        if len(self.gui.webs_status) < len(StatusToolService.webs):
-            self.fetch_status()
-
     def hideEvent(self, event):
         super().hideEvent(event)
         self.task_manager.cancel_all_tasks()
@@ -160,22 +132,6 @@ def closeEvent(self, event):
         super().closeEvent(event)
         self.task_manager.cleanup()
 
-    def fetch_status(self):
-        def on_success(results):
-            self.handle_status_results(results)
-
-        def on_error(error):
-            self.handle_status_results([])
-
-        # 使用异步任务管理器执行状态获取
-        self.task_manager.execute_simple_task(
-            task_func=self.service.fetch_all_status,
-            success_callback=on_success,
-            error_callback=on_error,
-            tooltip_title=tools_res.status_fetching, tooltip_parent=self,
-            task_id="fetch_status"
-        )
-
     def handle_status_results(self, resps_json):
         for resp_json in resps_json:
             level = InfoLevel.SUCCESS if resp_json['message']=="pass" else InfoLevel.ERROR

GUI/uic/qfluent/components/cust.py

@@ -145,19 +145,17 @@ class SupportView(FlyoutViewBase):
     closed = pyqtSignal()  # 添加closed信号
     res = res.GUI.Uic
 
-    def __init__(self, proj_url, conf_dia=None):
+    def __init__(self, conf_dia=None):
         super(SupportView, self).__init__(conf_dia)
         self.conf_dia = conf_dia
         self.width = int(conf_dia.width() * 0.8)
         self.layout = VBoxLayout(self)
         self.titleLayout = QtWidgets.QHBoxLayout()
-        self.githubBtn = HyperlinkButton(FluentIcon.GITHUB, proj_url, "Github")
         self.qqGroupBtn = HyperlinkButton(CustomIcon.QQ, "https://qm.qq.com/q/T2SONVQmiW", "QQ")
         self.discordBtn = HyperlinkButton(CustomIcon.DISCORD, "https://discord.gg/znD4p2fpSE", "Discord")
         spacerItem = QtWidgets.QSpacerItem(10, 10, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.closeBtn = TransparentToolButton(FluentIcon.CLOSE, self)
         self.closeBtn.clicked.connect(self.closed)
-        self.titleLayout.addWidget(self.githubBtn)
         self.titleLayout.addWidget(self.qqGroupBtn)
         self.titleLayout.addWidget(self.discordBtn)
         self.titleLayout.addItem(spacerItem)

GUI/uic/qfluent/components/text_componet.py

@@ -1,12 +1,13 @@
 from PyQt5.QtCore import QTimer, QSize
-from PyQt5.QtGui import QPixmap
+from PyQt5.QtGui import QPixmap, QDesktopServices
 from qfluentwidgets import ImageLabel, TextBrowser, TextEdit
 
 
 class TextBrowserWithBg(TextBrowser):
     def __init__(self, parent=None):
         super().__init__(parent)
         self.image_label = None
+        self.gui = parent
         self.setStyleSheet("""
             QTextBrowser {
                 background-color: transparent;
@@ -51,6 +52,14 @@ def resizeEvent(self, event):
         if self.image_label:
             QTimer.singleShot(0, self.position_image)
 
+    def setSource(self, url):
+        if url.isEmpty():
+            return
+        if self.gui.chooseBox.currentIndex() == 2:
+            QDesktopServices.openUrl(url)
+        else:
+            self.gui.open_url_by_browser(url.toString())
+
 
 class TextEditWithBg(TextEdit):
     def __init__(self, parent=None):

README.md

@@ -54,12 +54,6 @@
 
 ---
 
-**🔉要提问时不管群里问还是 issue，都看一遍 [提问须知](https://github.com/tangx/Stop-Ask-Questions-The-Stupid-Ways?tab=readme-ov-file)** （相关链接 [文档](
-https://doc.comicguispider.nyc.mn/faq) / [issue](
-https://github.com/jasoneri/ComicGUISpider/issues?q=is%3Aissue%20state%3Aclosed)）
-
----
-
 ## 📢更新
 
 ✨ 软件内外更新了 CGS 猫娘图（ ~~施法: 你是一只贫穷，只能捡路边法棍吃的猫娘~~ ）  
@@ -80,6 +74,16 @@ https://github.com/jasoneri/ComicGUISpider/issues?q=is%3Aissue%20state%3Aclosed)
 ✅ 配置窗口做了调整  
 ✅ 修复代理状态时拷贝流程仍然出错，具体看 [`faq > 拷贝访问相关`](https://doc.comicguispider.nyc.mn/faq/#_2-%E7%88%AC%E8%99%AB)  
 
+
+<details>
+<summary> <code>🧪v2.7.1-beta</code> 开发版特性👈看就点</summary>
+
+#### 🐞 Fix
+
++ 子进度条修复，大部分转用内置浏览器
+
+</details>
+
 > 可参考 [更新方法](https://jasoneri.github.io//ComicGUISpider/deploy/quick-start.html#_4-%E6%9B%B4%E6%96%B0) 进行更新  
 
 > [🕑更新历史](docs/changelog/history.md) / [📝开发板](https://github.com/jasoneri/ComicGUISpider/projects?query=is%3Aopen)