Merge-build: v2.7.1

Author: jasoneri

ComicSpider/settings.py

@@ -33,6 +33,12 @@
 # Configure a delay for requests for the same website (default: 0)
 # See https://docs.scrapy.org/en/latest/topics/settings.html#download-delay
 # See also autothrottle settings and docs
+AUTOTHROTTLE_ENABLED = True
+AUTOTHROTTLE_START_DELAY = 1  # 初始延迟1秒
+AUTOTHROTTLE_MAX_DELAY = 20   # 最大延迟60秒
+AUTOTHROTTLE_TARGET_CONCURRENCY = 5.0  # 目标并发数
+# AUTOTHROTTLE_DEBUG = True  # 开启调试查看调整过程
+
 DOWNLOAD_DELAY = 0.5
 # The download delay setting will honor only one of:
 #CONCURRENT_REQUESTS_PER_DOMAIN = 16

ComicSpider/spiders/basecomicspider.py

@@ -65,7 +65,7 @@ def frame_book_print(self, rets, fm=None, url=None, extra=None, make_preview=Fal
             # 向gui传送rets并赋值需要比exp_txt(crawl_only的flag) 和 PreviewBookInfoEnd 早才行
             if make_preview:
                 self(f"[PreviewBookInfoEnd]{url}")
-            self(f"""<hr><p class="theme-text">{''.join(self.exp_txt)}
+            self(f"""<hr><p class="theme-text">{''.join(self.exp_txt)}<br>
                 {font_color(extra, cls='theme-tip')}</p><br>""")
             self("[ShowKeepBooks]")  # 由于 keep_books 现放在 gui 上，所以最后用 flag 形式触发
         else:
@@ -80,7 +80,7 @@ def frame_section_print(self, rets, fm, print_limit=5, extra=None):
             batch = formatted_items[i:i + print_limit]
             self(", ".join(batch))
         self(rets)
-        self(f"""<hr><p class="theme-text">{''.join(self.exp_txt)}{font_color(extra, cls='theme-highlight')}</p><br>""")
+        self(f"""<hr><p class="theme-text">{''.join(self.exp_txt)}<br>{font_color(extra, cls='theme-highlight')}</p>""")
         return rets
 
 

GUI/browser_window.py

@@ -49,6 +49,62 @@ def __init__(self, parent=None):
         self.setPage(custom_page)
 
 
+class ZoomManager:
+    _default = 1.0
+    _step = 0.05
+    _min = 0.25
+    _max = 5.0
+    
+    def __init__(self, browser):
+        self.browser = browser
+        self.view = browser.view
+        self._current = self._default
+        self.browser.zoomInBtn.clicked.connect(self._on_zoom_in_clicked)
+        self.browser.zoomOutBtn.clicked.connect(self._on_zoom_out_clicked)
+        self.view.loadFinished.connect(self._on_load_finished)
+    
+    @property
+    def current(self):
+        return self._current
+    
+    @property
+    def can_zoom_in(self):
+        return self._current < self._max - 1e-6
+    
+    @property
+    def can_zoom_out(self):
+        return self._current > self._min + 1e-6
+    
+    def set_zoom(self, factor: float):
+        factor = round(max(self._min, min(self._max, factor)), 2)
+        self._current = factor
+        try:
+            self.view.setZoomFactor(factor)
+        except Exception:
+            self.view.page().setZoomFactor(factor)
+    
+    def reset(self):
+        self.set_zoom(self._default)
+    
+    def _on_load_finished(self, ok: bool):
+        if ok:
+            self.set_zoom(self._current)
+
+    def _on_zoom_in_clicked(self):
+        if self.can_zoom_in:
+            self.set_zoom(self._current + self._step)
+        self._update_zoom_buttons()
+    
+    def _on_zoom_out_clicked(self):
+        if self.can_zoom_out:
+            self.set_zoom(self._current - self._step)
+        self._update_zoom_buttons()
+    
+    def _update_zoom_buttons(self):
+        self.browser.zoomInBtn.setEnabled(self.can_zoom_in)
+        self.browser.zoomOutBtn.setEnabled(self.can_zoom_out)
+
+
 class BrowserWindow(QMainWindow, Ui_browser):
     def __init__(self, gui, proxies: str = None):
         super(BrowserWindow, self).__init__()
@@ -68,6 +124,7 @@ def __init__(self, gui, proxies: str = None):
         self.load_home()
         self.output = []
         self.setupUi(self)
+        self.zoom_mgr = ZoomManager(self)
 
     def set_env_mode(self):
         index = self.gui.chooseBox.currentIndex()
@@ -128,6 +185,8 @@ def set_btn(self):
         self.refreshBtn.setIcon(FIF.SYNC)
         self.copyBtn.setIcon(FIF.COPY)
         self.ensureBtn.setIcon(FIF.DOWNLOAD)
+        self.zoomInBtn.setIcon(FIF.ZOOM_IN)
+        self.zoomOutBtn.setIcon(FIF.ZOOM_OUT)
         # logic
         self.homeBtn.clicked.connect(self.load_home)
         self.backBtn.clicked.connect(self.view.back)

GUI/gui.py

@@ -30,6 +30,7 @@
     GuiQueuesManger, refresh_state, crawl_what,
     PreviewHtml, TmpFormatHtml
 )
+from utils.redViewer_tools import show_max
 from utils.website import spider_utils_map, InfoMinix
 from utils.sql import SqlUtils
 
@@ -54,6 +55,7 @@ class SpiderGUI(QMainWindow, MitmMainWindow):
     web_is_r18 = False
     spiderUtils = None
     sut = None
+    bsm: dict = None  # books show max
 
     p_crawler: Process = None
     p_qm: Process = None
@@ -131,16 +133,20 @@ def finish_setup(self):
         self.previewInit = True
         self.previewSecondInit = False
         self.BrowserWindow = None
+        self.bsm = None
 
         def chooseBox_changed_handle(index):
             if index not in SPIDERS.keys() and index != 0:
                 self.retrybtn.setEnabled(True)
                 self.preprocess_mgr.handle_choosebox_changed(index)
                 return
             self.spiderUtils = spider_utils_map[index]
+            rmt_s2c = True
             if index in SPECIAL_WEBSITES_IDXES:
                 self.web_is_r18 = True
                 self.sut = self.spiderUtils(conf)
+                rmt_s2c = False
+            FluentMonkeyPatch.rbutton_menu_textBrowser(self.textBrowser, index, rmt_s2c)
             self.searchinput.setStatusTip(QCoreApplication.translate("MainWindow", STATUS_TIP[index]))
             self.searchinput.setEnabled(True)
             FluentMonkeyPatch.rbutton_menu_lineEdit(self.searchinput)
@@ -587,7 +593,7 @@ def hook_exception(self, exc_type, exc_value, exc_traceback):
         self.say(font_color(rf"<br>{self.res.global_err_hook} <br>[{conf.log_path}\GUI.log]<br>", cls='theme-err', size=5))
 
     def do_publish(self):
-        with open(ori_path.joinpath('assets/pubilsh_helper.html')) as f:
+        with open(ori_path.joinpath('assets/pubilsh_helper.html'), encoding='utf-8') as f:
             format_text = f.read()
             html = format_text.replace("{bs_theme}", bs_theme()) \
                     .replace("{publish_url}", self.spiderUtils.publish_url)
@@ -601,6 +607,7 @@ def do_publish(self):
         self.BrowserWindow.show()
 
     def tpd(self, texts):
+        """transfer publish-page domians"""
         self.BrowserWindow.domain_v = DomainToolView(self)
         CustomFlyout.make(
             view=self.BrowserWindow.domain_v, target=self.BrowserWindow, parent=self.BrowserWindow
@@ -617,3 +624,12 @@ def open_url_by_browser(self, url):
             self.BrowserWindow.setGeometry(rect)
         self.BrowserWindow.view.load(QUrl(url))
         self.BrowserWindow.show()
+
+    def show_max(self):
+        self.bsm = self.bsm or show_max()
+        bc_name = self.book_choose[0].name
+        bookShow = self.bsm.get(bc_name) or self.bsm.get(self.searchinput.text().strip())
+        if bookShow:
+            self.say(font_color(bookShow.show, cls='theme-tip', size=4), ignore_http=True)
+
+# ---

GUI/thread/__init__.py

@@ -142,6 +142,9 @@ def run(self):
                         self.gui.show_keep_books()
                     elif '[httpok]' in _:
                         self.print_signal.emit('[httpok]' + _.replace('[httpok]', ''))
+                    elif _.endswith(f"{res.SPIDER.SayToGui.frame_section_print_extra}</font></p>"):
+                        self.print_signal.emit(_)
+                        self.gui.show_max()
                     else:
                         self.print_signal.emit(_)
                     self.msleep(2)

GUI/tools/domain.py

@@ -54,7 +54,7 @@ def handle(self, text):
             with open(t_f, 'w', encoding='utf-8') as f:
                 f.write(_domain)
             prefix_tip = tools_res.doamin_success_tip % (_domain, t_f)
-            sc = 6
+            sc = 4
             InfoBar.success(
                 title='', content=f"{prefix_tip}{tools_res.reboot_tip % str(sc)}",
                 orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.TOP,

GUI/tools/rv_tool.py

@@ -179,7 +179,8 @@ def deploy(self):
         _.show()
 
     def show_max(self):
-        self.table_fv = CustomFlyout.make(TableFlyoutView(show_max(), self), self.sv_path_card, self)
+        self.toolWin.gui.bsm = self.toolWin.gui.bsm or show_max()
+        self.table_fv = CustomFlyout.make(TableFlyoutView(self.toolWin.gui.bsm, self), self.sv_path_card, self)
 
     def combine_then_mv(self):
         done = combine_then_mv(conf.sv_path, conf.sv_path.joinpath("web"))

GUI/uic/browser.py

@@ -95,6 +95,24 @@ def setupUi(self, browser):
         self.addressEdit.setMinimumSize(QtCore.QSize(500, 0))
         self.addressEdit.setObjectName("addressEdit")
         self.horizontalLayout_2.addWidget(self.addressEdit)
+        self.zoomInBtn = TransparentToolButton(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.zoomInBtn.sizePolicy().hasHeightForWidth())
+        self.zoomInBtn.setSizePolicy(sizePolicy)
+        self.zoomInBtn.setMaximumSize(QtCore.QSize(25, 16777215))
+        self.zoomInBtn.setObjectName("zoomInBtn")
+        self.horizontalLayout_2.addWidget(self.zoomInBtn)
+        self.zoomOutBtn = TransparentToolButton(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.zoomOutBtn.sizePolicy().hasHeightForWidth())
+        self.zoomOutBtn.setSizePolicy(sizePolicy)
+        self.zoomOutBtn.setMaximumSize(QtCore.QSize(25, 16777215))
+        self.zoomOutBtn.setObjectName("zoomOutBtn")
+        self.horizontalLayout_2.addWidget(self.zoomOutBtn)
         spacerItem = QtWidgets.QSpacerItem(632, 15, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_2.addItem(spacerItem)
         self.copyBtn = TransparentToolButton(self.groupBox)

GUI/uic/qfluent/__init__.py

@@ -4,7 +4,7 @@
     Action, RoundMenu, FluentIcon, PushButton, Flyout, FlyoutAnimationType
 )
 from assets import res as ori_res
-
+from utils import extract_eps_range, conf
 from .components import *
 
 __all__ = [
@@ -100,6 +100,38 @@ def _showNumberKeypad():
             event.accept()
         line_edit.contextMenuEvent = types.MethodType(new_context_menu, line_edit)
 
+    @staticmethod
+    def rbutton_menu_textBrowser(textBrowser, cb_idx, s2c=False):
+        """cb_idx: chooseBox index
+        s2c: send to chooseinput"""
+        def custom_context_menu(self, event):
+            cursor = self.textCursor()
+            selected_text = cursor.selectedText()
+            fluent_menu = RoundMenu(parent=self)
+            copy_action = Action(FluentIcon.COPY, text=self.tr("COPY"), triggered=self.copy)
+            select_all_action = Action(self.tr("Select all"), triggered=self.selectAll)
+            fluent_menu.addAction(copy_action)
+            fluent_menu.addAction(select_all_action)
+            if selected_text:
+                fluent_menu.addSeparator()
+                if s2c and textBrowser.gui.next_btn.text() != ori_res.GUI.Uic.next_btnDefaultText:
+                    custom_action = Action(FIF.PENCIL_INK, "解析选中项发至序号输入框", 
+                        triggered=lambda: send_to_chooseinput(selected_text))
+                    fluent_menu.addAction(custom_action)
+                custom_action = Action(text="将选中文本加进预设", 
+                    triggered=lambda: set_to_completer(selected_text))
+                fluent_menu.addAction(custom_action)
+            fluent_menu.exec(event.globalPos())
+            event.accept()
+        def send_to_chooseinput(text):
+            out_text = extract_eps_range(text)
+            textBrowser.gui.chooseinput.setText(out_text)
+        def set_to_completer(text):
+            conf.completer[cb_idx].insert(0, text)
+            conf.update()
+            textBrowser.gui.set_completer()
+        textBrowser.contextMenuEvent = types.MethodType(custom_context_menu, textBrowser)
+
     @staticmethod
     def rbutton_menu_WebEngine(browserWindow):
         def custom_context_menu(self, event):

GUI/uic/qfluent/components/cust.py

@@ -212,6 +212,7 @@ class TableFlyoutView(FlyoutViewBase):
     def __init__(self, data, parent=None):
         super().__init__(parent)
         self.rvInterface = parent
+        self.gui = parent.toolWin.gui
         p_width = parent.width()
         p_height = parent.height()
         self.width = int(p_width * 0.8)
@@ -231,10 +232,10 @@ def __init__(self, data, parent=None):
         self.closeBtn.clicked.connect(self.closed)
         self.delBtn = PrimaryPushButton(FluentIcon.DELETE, "删除选中记录", self)
         self.delBtn.clicked.connect(self.delete_selected_record)
-        self.sendBtn = PrimaryPushButton(FluentIcon.SEND, "发送选中记录至输入框", self)
-        self.sendBtn.clicked.connect(self.send_selected_record)
+        self.searchBtn = PrimaryPushButton(FluentIcon.SEARCH, "搜索选中记录", self)
+        self.searchBtn.clicked.connect(self.send_selected_record)
         second_row.addWidget(self.delBtn)
-        second_row.addWidget(self.sendBtn)
+        second_row.addWidget(self.searchBtn)
         second_row.addItem(spacerItem)
         second_row.addWidget(self.closeBtn)
 
@@ -243,7 +244,7 @@ def __init__(self, data, parent=None):
         # 必须设置视图尺寸
         self.setFixedSize(self.width, self.height)
 
-    def set_table(self, data: t.List[BookShow]):
+    def set_table(self, data: t.Dict[str, BookShow]):
         self.tableView = TableView(self)
         self.tableView.setBorderRadius(15)
         self.tableView.setWordWrap(False)
@@ -254,14 +255,16 @@ def set_table(self, data: t.List[BookShow]):
         # 设置数据模型
         model = QStandardItemModel()
         model.setHorizontalHeaderLabels(["漫画", "已阅最新章节", "已下载最新章节"])
-        for book in data:
+        for book in data.values():
             row = [
                 QStandardItem(book.name),
                 QStandardItem(book.show_max),
                 QStandardItem(book.dl_max)
             ]
             model.appendRow(row)
         self.tableView.setModel(model)
+        self.tableView.setSortingEnabled(True)
+        self.tableView.horizontalHeader().setSortIndicatorShown(True)
         self.tableView.horizontalHeader().setStretchLastSection(True)
         # 调整列宽
         self.tableView.setColumnWidth(0, int(tb_width * 0.5))
@@ -291,21 +294,29 @@ def send_selected_record(self):
         selection_model = self.tableView.selectionModel()
         if not selection_model.hasSelection():
             InfoBar.warning(
-                title='', content='请先选择要发送的记录',
-                orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.BOTTOM_LEFT,
-                duration=5000, parent=self.rvInterface
+                title='', content='请先选择行',
+                orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.BOTTOM_RIGHT,
+                duration=5000, parent=self.rvInterface.table_fv
+            )
+            return
+        elif self.gui.chooseBox.currentIndex() == 0:
+            InfoBar.warning(
+                title='', content='请先选择搜索源',
+                orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.BOTTOM_RIGHT,
+                duration=5000, parent=self.rvInterface.table_fv
             )
             return
         selected_indexes = selection_model.selectedRows()
         row = selected_indexes[0].row()
         model = self.tableView.model()
         book_name = model.item(row, 0).text()
         def do():
-            self.rvInterface.toolWin.gui.searchinput.setText(book_name)
+            self.gui.searchinput.setText(book_name)
+            self.gui.next_btn.click()
             InfoBar.info(
-                title='', content=f'「{book_name}」已发至输入框',
+                title='', content=f'「{book_name}」已发至输入框进行搜索中',
                 orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.BOTTOM,
-                duration=2000, parent=self.rvInterface.toolWin.gui.textBrowser
+                duration=2000, parent=self.gui.textBrowser
             )
         QTimer.singleShot(10, do)
         self.rvInterface.table_fv.close()