Merge-build: v2.9.11

Author: jasoneri

CGS.py

@@ -1,17 +1,14 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-import functools
 import traceback
 from datetime import datetime
 from multiprocessing import freeze_support
 from pathlib import Path
 
-from PyQt5.QtCore import Qt, QTimer
+from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QApplication, QMessageBox
 
-_CGS_PATCHED_QTIMER = False
-
 
 class ExceptionRouter:
     def __init__(self):
@@ -22,7 +19,6 @@ def bind_ui(self, ui):
 
     def install(self):
         sys.excepthook = self.excepthook
-        self._install_qtimer_single_shot_guard()
 
     def raise_fatal(self, exc, phase):
         trace_text = "".join(traceback.format_exception(type(exc), exc, exc.__traceback__))
@@ -114,31 +110,6 @@ def _append_fatal_log(self, phase, trace_text):
             pass
         return log_path
 
-    def _install_qtimer_single_shot_guard(self):
-        global _CGS_PATCHED_QTIMER
-        if _CGS_PATCHED_QTIMER:
-            return
-        original_single_shot = QTimer.singleShot
-
-        @functools.wraps(original_single_shot)
-        def patched_single_shot(*args, **kwargs):
-            if args and callable(args[-1]):
-                callback = args[-1]
-
-                @functools.wraps(callback)
-                def guarded_callback(*cb_args, **cb_kwargs):
-                    try:
-                        return callback(*cb_args, **cb_kwargs)
-                    except Exception:
-                        self.handle_current_exception("QTimer.singleShot")
-                        return None
-
-                args = (*args[:-1], guarded_callback)
-            return original_single_shot(*args, **kwargs)
-
-        QTimer.singleShot = patched_single_shot
-        _CGS_PATCHED_QTIMER = True
-
     @staticmethod
     def _write_stderr(message):
         if sys.stderr is None:

GUI/browser_window.py

@@ -407,4 +407,6 @@ def closeEvent(self, event):
             self.gui.BrowserWindow = None
             self.gui.previewInit = True
             self.gui.previewSecondInit = False
+            self.gui.pageFrame.setEnabled(False)
+            self.gui.pageFrame.setStyleSheet("QToolButton { background-color: rgb(127, 127, 127); }")
         super().closeEvent(event)

GUI/core/anim.py

@@ -2,19 +2,14 @@
 from typing import Callable, Literal, Optional, Sequence
 
 from PyQt5.QtCore import (
-    QObject,
-    QAbstractAnimation,
-    QPropertyAnimation,
-    QEasingCurve,
-    QParallelAnimationGroup,
-    QSequentialAnimationGroup,
-    QRect,
-    QPoint,
-    QTimer,
+    QObject, QAbstractAnimation, QPropertyAnimation, QEasingCurve,
+    QParallelAnimationGroup, QSequentialAnimationGroup, QRect, QPoint,
     pyqtProperty,
 )
 from PyQt5.QtWidgets import QGraphicsOpacityEffect
 
+from GUI.core.timer import safe_single_shot
+
 
 PopupDirection = Literal["right", "up", "down"]
 
@@ -491,4 +486,4 @@ def _start_anim():
                 widget.setWindowOpacity(1.0)
             group.start()
 
-        QTimer.singleShot(0, _start_anim)
+        safe_single_shot(0, _start_anim)

GUI/core/timer.py

@@ -0,0 +1,11 @@
+import sys
+from PyQt5.QtCore import QTimer
+
+
+def safe_single_shot(msec, callback):
+    def guarded():
+        try:
+            callback()
+        except Exception:
+            sys.excepthook(*sys.exc_info())
+    QTimer.singleShot(msec, guarded)

GUI/gui.py

@@ -8,9 +8,10 @@
 import multiprocessing.managers as m
 from PyQt5.QtGui import QKeySequence, QGuiApplication
 from PyQt5.QtCore import (
-    QThread, Qt, QCoreApplication, QUrl, QRect, QTimer,
+    QThread, Qt, QCoreApplication, QUrl, QRect,
     pyqtSignal
 )
+from GUI.core.timer import safe_single_shot
 from PyQt5.QtWidgets import QMainWindow, QCompleter, QShortcut
 from qfluentwidgets import InfoBar, InfoBarPosition
 
@@ -99,7 +100,7 @@ def setupUi(self, MainWindow):
             self.task_mgr = TaskProgressManager(self)
             self.task_mgr.init_native_panel()
             setupTheme(self)
-            QTimer.singleShot(10, self.setupUi_)
+            safe_single_shot(10, self.setupUi_)
             self.first_init = False
         else:
             self.apply_translations()
@@ -243,7 +244,7 @@ def showAggrWin(self):
         self.rvBtn.click()
         def _jump():
             self.toolWin.stackedWidget.setCurrentWidget(self.toolWin.asInterface)
-        QTimer.singleShot(10, _jump)
+        safe_single_shot(10, _jump)
 
     def set_tool_win(self):
         self.toolWin = ToolWindow(self)
@@ -410,6 +411,8 @@ def _show_preview(self):
             self.BrowserWindow.second_init()
             self.previewSecondInit = False
         self.BrowserWindow.set_ensure_handler()
+        self.pageFrame.setEnabled(True)
+        self.pageFrame.setStyleSheet("QToolButton { background-color: rgb(255, 255, 255); }")
         final_rect = self.BrowserWindow.geometry()
         PopupAnimator.show(self.BrowserWindow, final_rect, duration_ms=220, direction="right")
 
@@ -450,14 +453,14 @@ def retry_all():
             self.BrowserWindow = None
             def safe_setup():
                 if hasattr(self, 'p_crawler') and self.p_crawler and self.p_crawler.is_alive():
-                    QTimer.singleShot(70, safe_setup)
+                    safe_single_shot(70, safe_setup)
                 else:
                     self.Q('InputFieldQueue').clear()
                     self.setupUi(self)
-            QTimer.singleShot(10, safe_setup)
+            safe_single_shot(10, safe_setup)
 
         self.say(font_color(f"{self.res.reboot_tip}", cls='theme-highlight', size=4))
-        QTimer.singleShot(50, retry_all)
+        safe_single_shot(50, retry_all)
         self.retrybtn.setDisabled(True)
         self.log.info('===--→ retry_schedule end\n')
 

GUI/mainwindow.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 from PyQt5 import QtCore, QtWidgets
-from PyQt5.QtCore import Qt, QTimer
+from PyQt5.QtCore import Qt
+from GUI.core.timer import safe_single_shot
 from PyQt5.QtWidgets import QStackedLayout, QWidget, QVBoxLayout, QSizePolicy
 from qfluentwidgets import (
     FluentIcon as FIF, ToolButton, ImageLabel, TransparentToolButton, ScrollArea, FlowLayout
@@ -103,7 +104,7 @@ def setup_sleep_widget(self, _img=None):
             self.sleepWidget, "sleepLabel", _img or str(ori_path.joinpath("docs/public/cgs_sleep.png")),
             init=lambda l: (l.setAlignment(Qt.AlignLeft | Qt.AlignBottom), l.setScaledContents(True)),
         )
-        QTimer.singleShot(0, self._sync_sleep_widget_geometry)
+        safe_single_shot(0, self._sync_sleep_widget_geometry)
 
     def resizeEvent(self, event):
         QtWidgets.QMainWindow.resizeEvent(self, event)

GUI/manager/__init__.py

@@ -2,7 +2,7 @@
 import contextlib
 import subprocess
 
-from PyQt5.QtCore import QTimer
+from GUI.core.timer import safe_single_shot
 from qfluentwidgets import (
     InfoBarPosition, StateToolTip
 )
@@ -135,7 +135,7 @@ def to_update(recv):
                 f"""<{ver}>""", _type="SUCCESS")
             _close_thread()
             self.gui.update_notifier.on_updated_or_dismissed()
-            QTimer.singleShot(4000, lambda: self.to_update(ver))
+            safe_single_shot(4000, lambda: self.to_update(ver))
 
         def checked(recv):
             with contextlib.suppress(RuntimeError):
@@ -175,7 +175,7 @@ def checked(recv):
     def rerun(self):
         cmd = ["cgs"]
         subprocess.Popen(cmd, cwd=exc_p, env=env)
-        QTimer.singleShot(1000, self.gui.close)
+        safe_single_shot(1000, self.gui.close)
 
     def to_update(self, ver):
         _UpdateLauncher(ver).run()

GUI/manager/ags.py

@@ -1,5 +1,6 @@
 import json
 from PyQt5.QtCore import QTimer
+from GUI.core.timer import safe_single_shot
 
 from utils.website.info import BookInfo
 from utils import conf
@@ -72,7 +73,7 @@ def delayed_mark():
                                     dled_bidxes.append(key)
                         js_code = f'''tryMarkDownload({dled_bidxes},[]);'''
                         self.gui.BrowserWindow.js_execute_by_page(self.page, js_code, lambda _: None)
-                    QTimer.singleShot(300, delayed_mark)
+                    safe_single_shot(300, delayed_mark)
                     self.gui.BrowserWindow.refreshBtn.click()
                 if self.gui.BrowserWindow.topHintBox.isChecked():
                     self.gui.BrowserWindow.topHintBox.click()

GUI/manager/async_task.py

@@ -7,7 +7,8 @@
 import traceback
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
-from PyQt5.QtCore import QObject, Qt, QThread, QTimer, pyqtSignal
+from PyQt5.QtCore import QObject, Qt, QThread, pyqtSignal
+from GUI.core.timer import safe_single_shot
 from qfluentwidgets import InfoBar, InfoBarPosition, StateToolTip
 
 
@@ -124,7 +125,7 @@ def complete(self, task_id: str, auto_hide: bool):
             return
         if auto_hide:
             tooltip.setState(True)
-            QTimer.singleShot(self.CLOSE_DELAY_MS, lambda tid=task_id: self.close(tid))
+            safe_single_shot(self.CLOSE_DELAY_MS, lambda tid=task_id: self.close(tid))
             return
         tooltip.setContent("任务已完成")
 

GUI/manager/clip.py

@@ -1,6 +1,7 @@
 import re
 import pathlib
-from PyQt5.QtCore import Qt, QTimer
+from PyQt5.QtCore import Qt
+from GUI.core.timer import safe_single_shot
 from qfluentwidgets import InfoBar, InfoBarPosition
 
 from assets import res
@@ -120,7 +121,7 @@ def delayed_mark():
                                     dled_eidxes.append(key)  
                         js_code = f'''tryMarkDownload({dled_bidxes},{dled_eidxes});'''
                         self.gui.BrowserWindow.js_execute_by_page(self.page, js_code, lambda _: None)
-                    QTimer.singleShot(300, delayed_mark)
+                    safe_single_shot(300, delayed_mark)
                     self.gui.BrowserWindow.refreshBtn.click()
                 if self.gui.BrowserWindow.topHintBox.isChecked():
                     self.gui.BrowserWindow.topHintBox.click()