Merge-build: v2.7.2

Author: jasoneri

ComicSpider/pipelines.py

@@ -94,11 +94,12 @@ def handle_task(spider, stats, task_obj):
         _tasks = spider.tasks[task_obj.taskid]
         _tasks.downloaded.append(task_obj)
         curr_progress = int(len(_tasks.downloaded) / _tasks.tasks_count * 100)
-        if conf.isDeduplicate and curr_progress >= 100:
+        if curr_progress >= 100:
             tasks_obj = spider.tasks[task_obj.taskid]
             if getattr(tasks_obj, 'meta_info', None):
                 tasks_obj.meta_info.fin_callback(spider.tasks_path[tasks_obj.taskid])
-            spider.sql_handler.add(task_obj.taskid)
+            if conf.isDeduplicate:
+                spider.sql_handler.add(task_obj.taskid)
         spider.Q('TasksQueue').send(task_obj, wait=True)
         stats.inc_value('image/downloaded')
 

GUI/conf_dialog.py

@@ -79,7 +79,7 @@ def retranslateUiAgain(self, Dialog):
         self.label_completer.setText(_translate("Dialog", res.GUI.Uic.confDia_labelPreset))
         self.label_6.setText(_translate("Dialog", res.GUI.Uic.confDia_labelClipDb))
         self.label_7.setText(_translate("Dialog", res.GUI.Uic.confDia_labelClipNum))
-        self.metaTypeLabel.setText(_translate("Dialog", res.GUI.Uic.confDia_metaType))
+        self.metaTypeLabel.setText(_translate("Dialog", res.GUI.Uic.confDia_dledHandle))
         self.concurr_numLabel.setText(_translate("Dialog", res.GUI.Uic.confDia_labelConcurrNum))
         # 添加cookie类型选项
         support = list(COOKIES_PLACEHOLDER.keys())
@@ -93,11 +93,11 @@ def retranslateUiAgain(self, Dialog):
         self.pypiSourceBox.setItemText(1, _translate("Dialog", "清华源"))
         self.pypiSourceBox.setItemText(2, _translate("Dialog", "阿里源"))
         self.pypiSourceBox.setItemText(3, _translate("Dialog", "华为源"))
-        self.metaTypeBox.addItem("")
-        self.metaTypeBox.addItem("")
-        self.metaTypeBox.setItemText(0, _translate("Dialog", "-"))
-        self.metaTypeBox.setItemText(1, _translate("Dialog", "ComicInfo.xml"))
-        self.metaTypeBox.setCurrentIndex(0)
+        self.dledHandleBox.addItem("")
+        self.dledHandleBox.addItem("")
+        self.dledHandleBox.setItemText(0, _translate("Dialog", "-"))
+        self.dledHandleBox.setItemText(1, _translate("Dialog", ".cbz"))
+        self.dledHandleBox.setCurrentIndex(0)
         self.cookiesBox.setCurrentText(support[0])
 
         for k, ui_key in LANG.items():
@@ -178,8 +178,9 @@ def _switch_mode():
             theme_mgr.set_dark(conf.darkTheme)
         self.darkTheme.clicked.connect(_switch_mode)
         def _regular_update():
-            self.puThread = ProjUpdateThread(self)
-            Updater(self.gui).run()
+            # self.puThread = ProjUpdateThread(self)
+            # Updater(self.gui).run()
+            self.gui.open_url_by_browser('https://doc.comicguispider.nyc.mn/changelog/history')
         self.updateBtn.clicked.connect(_regular_update)
         self.supportBtn.clicked.connect(lambda: CustomFlyout.make(
             view=SupportView(self), target=self.supportBtn, parent=self
@@ -193,8 +194,8 @@ def _tip_lang_change(idx):
                 )
         self.langBox.activated.connect(_tip_lang_change)
         def _tip_meta_change(idx):
-            match self.metaTypeBox.itemText(idx):
-                case "ComicInfo.xml":
+            match self.dledHandleBox.itemText(idx):
+                case ".cbz":
                     _meta_tip = "适配平台例如：ComicRack, Komga, kavita\n保存并内置重启后生效"
                 case _:
                     _meta_tip = ""
@@ -204,7 +205,7 @@ def _tip_meta_change(idx):
                     orient=Qt.Horizontal, isClosable=True, position=InfoBarPosition.TOP,
                     duration=5000, parent=self
                 )
-        self.metaTypeBox.activated.connect(_tip_meta_change)
+        self.dledHandleBox.activated.connect(_tip_meta_change)
         self.cookiesBox.currentTextChanged.connect(self._on_cookie_type_changed)
         def _tip_on(is_checked: bool, tip_content=None):
             if is_checked:
@@ -236,7 +237,7 @@ def show_self(self):  # can't naming `show`. If done, just run code once
         self.logLevelComboBox.setCurrentIndex(self.logLevelComboBox.findText(getattr(conf, "log_level")))
         self.pypiSourceBox.setCurrentIndex(getattr(conf, "pypi_source"))
         self.langBox.setCurrentIndex(self.langBox.findData(getattr(conf, "lang")))
-        self.metaTypeBox.setCurrentIndex(self.metaTypeBox.findText(getattr(conf, "meta_type")))
+        self.dledHandleBox.setCurrentIndex(self.dledHandleBox.findText(getattr(conf, "downloaded_handle")))
         # 仅当 初次confdia ui创建 & conf值设入ui后，才绑定槽函数
         if self._init_flag:
             self.bind_logic()
@@ -278,7 +279,7 @@ def save_conf(self):
             "sv_path": sv_path,
             "log_level": getattr(self, "logLevelComboBox").currentText(),
             "lang": getattr(self, "langBox").currentData(),
-            "meta_type": getattr(self, "metaTypeBox").currentText(),
+            "downloaded_handle": getattr(self, "dledHandleBox").currentText(),
             "concurr_num": getattr(self, "concurr_numEdit").value(),
             "isDeduplicate": getattr(self, "isDeduplicate").isChecked(),
             "addUuid": getattr(self, "addUuid").isChecked(),

GUI/gui.py

@@ -382,8 +382,13 @@ def retry_all():
                 self.log.error(str(traceback.format_exc()))
             self.log = conf.cLog(name="GUI")
             self.BrowserWindow = None
-            self.Q('InputFieldQueue').clear()
-            QTimer.singleShot(10, lambda : self.setupUi(self))
+            def safe_setup():
+                if hasattr(self, 'p_crawler') and self.p_crawler and self.p_crawler.is_alive():
+                    QTimer.singleShot(70, safe_setup)
+                else:
+                    self.Q('InputFieldQueue').clear()
+                    self.setupUi(self)
+            QTimer.singleShot(10, safe_setup)
 
         self.say(font_color(f"{self.res.reboot_tip}", cls='theme-highlight', size=4))
         QTimer.singleShot(50, retry_all)

GUI/manager/__init__.py

@@ -1,5 +1,6 @@
 import os
-import shlex
+import json
+from pathlib import Path
 import subprocess
 import typing as t
 
@@ -43,7 +44,7 @@ def init(self):
     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"):
+        if self.gui.tf and not getattr(self.gui.tf, "tasks_progress_panel_flag"):
             if not self._init_lock:
                 self._init_lock = True
                 self.gui.BrowserWindow.init_tasks_progress_panel(
@@ -116,12 +117,11 @@ def to_update(recv):
             except Exception:
                 pass
             ver = recv.update_info.get("tag_name")
-            log = str(conf.log_path.joinpath("update.log"))
-            CustomInfoBar.show("", self.res.to_update % log, 
+            CustomInfoBar.show("", self.res.to_update, 
                 self.gui.textBrowser, self.proj.update_info.get("html_url"), 
                 f"""<{ver}>""", _type="SUCCESS")
             _close_thread()
-            QTimer.singleShot(6000, lambda: self.to_update(ver, log))
+            QTimer.singleShot(4000, lambda: self.to_update(ver))
 
         def checked(recv):
             try:
@@ -164,13 +164,24 @@ def rerun(self):
         subprocess.Popen(cmd, cwd=exc_p, env=env)
         QTimer.singleShot(1000, self.gui.close)
 
-    def to_update(self, ver, log):
-        python_version_arg = "'<3.14'"
-        cmd = f"{uv_exc} tool install ComicGUISpider=={ver} --force --index-url {PYPI_SOURCE[conf.pypi_source]} --python {python_version_arg}"
+    def to_update(self, ver):
+        uv_env = {key: os.environ[key] for key in ('UV_TOOL_DIR', 'UV_TOOL_BIN_DIR') if key in os.environ}
+        tool_dir = Path(uv_env['UV_TOOL_DIR'])
         if os.name == "nt":
-            subprocess.Popen(["cmd", "/c", "start", "", "powershell", "-NoProfile", "-Command",
-                            f"{cmd} 2>&1 | Tee-Object -FilePath {shlex.quote(log)} ; Read-Host 'Press Enter to close'"])
+            python_exc = tool_dir / "comicguispider" / "Scripts" / "python.exe"
         else:
-            full = f"""{cmd} 2>&1 | tee -a {shlex.quote(log)} ; echo 'done'; read -n1 -s -r -p 'Press any key to close...'"""
-            subprocess.Popen(["setsid", "sh", "-c", full], start_new_session=True)
+            python_exc = tool_dir / "comicguispider" / "bin" / "python"
+        with ori_path.joinpath("assets/update.txt").open("r", encoding="utf-8") as f:
+            template = f.read()
+        updater_script = template.replace(r"{uv_env_dict}", json.dumps(uv_env, ensure_ascii=False))
+        script_path = tool_dir.joinpath("cgs_update.py")
+        with open(script_path, "w", encoding="utf-8") as f:
+            f.write(updater_script)
+        args = [str(python_exc), str(script_path),
+            '--uv-exc', uv_exc, '--version', ver,
+            '--index-url', PYPI_SOURCE[conf.pypi_source]]
+        if os.name == "nt":
+            subprocess.Popen(args, creationflags=subprocess.CREATE_NEW_CONSOLE, env=env)
+        else:
+            subprocess.Popen(args, start_new_session=True, env=env)
         self.gui.close()

GUI/script/kemono.py

@@ -452,8 +452,6 @@ def run_kemono(self):
             self.say("input empty")
             return
 
-        self.say(font_color("""<br>🔔留意 Motrix 有任务开始即可<br>任务提示done后运行键会恢复，可继续接下一轮任务<br>""", 
-                            cls='theme-highlight'))
         self.backend_thread = KemonoBackendThread(backend_kw, self)
         self.backend_thread.output_signal.connect(self.say)
         self.backend_thread.finished_signal.connect(self._on_kemono_finished)
@@ -533,6 +531,6 @@ def run(self):
                 self.print(cleaned_line)
         exit_code = process.wait()
         if exit_code == 0:
-            self.print(font_color("✅ done!", cls='theme-success'))
+            self.print(font_color("✅ done! 运行键已恢复，可继续接下一轮任务 ヾ(￣▽￣ )~~", cls='theme-success'))
         self.interface.runBtn.setEnabled(True)
         self.finished_signal.emit(exit_code)

GUI/uic/conf_dia.py

@@ -105,9 +105,9 @@ def setupUi(self, Dialog):
         self.metaTypeLabel = StrongBodyLabel(Dialog)
         self.metaTypeLabel.setObjectName("metaTypeLabel")
         self.horizontalLayout_proxies.addWidget(self.metaTypeLabel)
-        self.metaTypeBox = ComboBox(Dialog)
-        self.metaTypeBox.setObjectName("metaTypeBox")
-        self.horizontalLayout_proxies.addWidget(self.metaTypeBox)
+        self.dledHandleBox = ComboBox(Dialog)
+        self.dledHandleBox.setObjectName("dledHandleBox")
+        self.horizontalLayout_proxies.addWidget(self.dledHandleBox)
         self.dialogVLayout.addLayout(self.horizontalLayout_proxies)
         self.horizontalLayout_label_completer = QtWidgets.QHBoxLayout()
         self.horizontalLayout_label_completer.setObjectName("horizontalLayout_label_completer")
@@ -208,7 +208,7 @@ def setupUi(self, Dialog):
         self.gridLayout_2.addLayout(self.dialogVLayout, 0, 0, 1, 1)
 
         self.retranslateUi(Dialog)
-        self.metaTypeBox.setCurrentIndex(-1)
+        self.dledHandleBox.setCurrentIndex(-1)
         self.cancelBtn.clicked.connect(Dialog.reject) # type: ignore
         self.acceptBtn.clicked.connect(Dialog.accept) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(Dialog)

GUI/uic/qfluent/components/cust.py

@@ -163,25 +163,23 @@ def __init__(self, conf_dia=None):
 
         self.promoteLayout = QtWidgets.QHBoxLayout()
         self.promoteBtn = HyperlinkButton(FluentIcon.LINK, self.res.confDia_promote_url, self.res.confDia_promote_title)
-        self.contentLabel = BodyLabel(self.res.confDia_promote_content) 
         self.promoteLayout.addWidget(self.promoteBtn)
-        self.promoteLayout.addWidget(self.contentLabel)
         self.promoteLayout.addItem(QtWidgets.QSpacerItem(10, 10, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
 
         self.contentLabel = BodyLabel(res.GUI.Uic.confDia_support_content) 
-        self.picLayout = QtWidgets.QHBoxLayout()
-        self.aliPayLabel = ImageLabel(":/_support/alipay.png")
-        self.aliPayLabel.scaledToWidth(int(self.width * 0.4))
-        self.aliPayLabel.setBorderRadius(8, 8, 8, 8)
-        self.picLayout.addWidget(self.aliPayLabel)
-        vLine = QtWidgets.QFrame(self)
-        vLine.setFrameShape(QtWidgets.QFrame.VLine)
-        vLine.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.picLayout.addWidget(vLine)
-        self.wePayLabel = ImageLabel(":/_support/wepay.png")
-        self.wePayLabel.scaledToWidth(int(self.width * 0.4))
-        self.wePayLabel.setBorderRadius(8, 8, 8, 8)
-        self.picLayout.addWidget(self.wePayLabel)
+        # self.picLayout = QtWidgets.QHBoxLayout()
+        # self.aliPayLabel = ImageLabel(":/_support/alipay.png")
+        # self.aliPayLabel.scaledToWidth(int(self.width * 0.4))
+        # self.aliPayLabel.setBorderRadius(8, 8, 8, 8)
+        # self.picLayout.addWidget(self.aliPayLabel)
+        # vLine = QtWidgets.QFrame(self)
+        # vLine.setFrameShape(QtWidgets.QFrame.VLine)
+        # vLine.setFrameShadow(QtWidgets.QFrame.Sunken)
+        # self.picLayout.addWidget(vLine)
+        # self.wePayLabel = ImageLabel(":/_support/wepay.png")
+        # self.wePayLabel.scaledToWidth(int(self.width * 0.4))
+        # self.wePayLabel.setBorderRadius(8, 8, 8, 8)
+        # self.picLayout.addWidget(self.wePayLabel)
 
         self.layout.addLayout(self.titleLayout)
         self.hLine = QtWidgets.QFrame(self)
@@ -190,7 +188,7 @@ def __init__(self, conf_dia=None):
         self.layout.addWidget(self.hLine)
         self.layout.addLayout(self.promoteLayout)
         self.layout.addWidget(self.contentLabel)
-        self.layout.addLayout(self.picLayout)
+        # self.layout.addLayout(self.picLayout)
         self.setFixedWidth(self.width)
         self.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
 

README.md

@@ -29,16 +29,16 @@
 
 - 如上动图演示的多种使用方式，方便的内置重启，多开同时操作不同网站等
 - 开预览后随便点点就能下载，预览窗口充当于微型浏览器
-- 通过加减号，`0 全选`，`-3 选倒数三个` 等输入规则，方便指定选择
-- 基于翻页保留，体验如同塞进购物车
-- 预设，去重，加标识符等自定义设置
+- 丰富多样的输入规则，方便指定选择
+- 无感翻页保留选择，已下载记录等提示
+- 预设，去重，加标识符等各种自定义设置
 
 **更多移步查阅 [🎸功能文档](https://doc.comicguispider.nyc.mn/feat/)**
 
 ## 📑介绍
 
-都下载了，不点一下吗 👉 ⭐ [![stars](https://img.shields.io/github/stars/jasoneri/ComicGUISpider
-)](https://github.com/jasoneri/ComicGUISpider/stargazers)    
+👍 什么玩意啊，最好再召集多点人把star降到 0 吧 👍 本来就是没人说的话我自用出错才修，还得谢谢用这方法把我恶心了 👍  
+ok的，`v2.7.2` 以后不发版只用 源码/tag 更新筛人了，更了什么修复什么也只会在软件内配置窗口更新按钮里写  
 
 | 网站                                    | 适用区域 |    补充说明    | 状态<br>(UTC+8) |
 |:--------------------------------------|:----:|:----------:|:----:|
@@ -63,18 +63,17 @@
 
 #### 🎁 Features
 
-✅ 新增 `元数据记录` 功能，例如 `.czb` 的 `ComicInfo.xml`，具体看 [`配置 > 元数据类型`](https://doc.comicguispider.nyc.mn/config/#%E4%BB%A3%E7%90%86-proxies)  
 ✅ 简化处理发布页域名相关流程  
-✨ `rvTool > 显示记录` 记录窗口新增 `搜索选中行` 按钮  
-✨ 匹配记录提示，菜单操作增强
-
-<img src="https://img.comicguispider.nyc.mn/file/1765701939059_feat-2.7.1-beta.2.png" alt="tag" width="400">
+✅ `rvTool > 显示记录` 记录窗口新增 `搜索选中行` 按钮  
+✅ 匹配记录提示，菜单操作增强 > [📷screenshot](https://img.comicguispider.nyc.mn/file/1765701939059_feat-2.7.1-beta.2.png)
+✨ `元数据记录` 改成 `后处理`，下载完成的后处理，具体看 [`配置 > 后处理`](https://doc.comicguispider.nyc.mn/config/#%E4%BB%A3%E7%90%86-proxies)  
+✨ `kemono` 过滤规则 修复&增强 > [看📏过滤规则示例](https://doc.comicguispider.nyc.mn/feat/script.html#%F0%9F%9A%80-%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B) （注意字段更改及时更新本地过滤规则）  
 
 #### 🐞 Fix
 
 ✅ 修复代理状态时拷贝流程仍然出错，具体看 [`faq > 拷贝访问相关`](https://doc.comicguispider.nyc.mn/faq/#_2-%E7%88%AC%E8%99%AB)  
-✨ 修复 jm 域名获取（保底简化处理流程保留）  
-✨ 子进度条修复，大部分转用内置浏览器  
+✅ 修复 jm 域名获取（保底简化处理流程保留）, 子进度条修复  
+✨ 修复 kb 缓存失败重启卡死；报错 'tasks_progress_panel_flag'; 章节的 `.cbz`;  
 
 > 可参考 [更新方法](https://jasoneri.github.io//ComicGUISpider/deploy/quick-start.html#_4-%E6%9B%B4%E6%96%B0) 进行更新  
 
@@ -113,11 +112,10 @@
 由 [Weblate](https://hosted.weblate.org/engage/comicguispider/) 托管实现多语言的翻译  
 
 <a href="https://hosted.weblate.org/engage/comicguispider/">
-<img src="https://hosted.weblate.org/widget/comicguispider/287x66-grey.png" alt="翻译状态" />
+<img src="https://hosted.weblate.org/widget/comicguispider/287x66-grey.png" alt="翻译状态" height="66" style="vertical-align: middle;" />
 </a>
-
-<a href="https://afdian.com/a/jsoneri">
-  <img src="https://img.comicguispider.nyc.mn/file/1765002001925_CGS-aifadian.png" alt="在爱发电支持我">
+<a href="https://ko-fi.com/jsoneri">
+  <img src="https://img.comicguispider.nyc.mn/file/1766128193347_sponsor_kofi.gif" alt="ko-fi" height="66" style="vertical-align: middle;">
 </a>
 
 ## 🔇免责声明

assets/res/locale/en_US.yml

@@ -112,7 +112,7 @@ GUI:
     confDia_labelPreset: "Preset"
     confDia_labelClipDb: "ClipDB"
     confDia_labelClipNum: "ClipEntries"
-    confDia_metaType: "metaType"
+    confDia_dledHandle: "dledHandle"
     confDia_labelConcurrNum: "ConcurrNum"
     confDia_cookies_placeholder: "Refer to the animated guide in the configuration documentation for cookie acquisition methods\nIncluding fields:\n"
     confDia_svPathWarning: "set Save Path failed, read rule by right-button"
@@ -122,7 +122,6 @@ GUI:
     confDia_updateDialog_dev: "New dev version available"
     confDia_supportBtn: "Support"
     confDia_promote_title: "Recommended VPN"
-    confDia_promote_content: "need VPN?"
     confDia_promote_url: "https://hxlm.io/#/register?code=sZWBMyum"
     confDia_support_content: "Donations will use to buy domain etc.."
     confDia_tip_deduplicate_on: "Dedup mode, take effect after save and reboot"
@@ -180,4 +179,4 @@ Updater:
   ver_check_fail: "Version check failed - retry or check releases"
   update_ensure: "Confirm Update"
   doing: "Involves code and dependency updates, Wait a moment.."
-  to_update: "🚧 Close main process and open new terminal for update, restart then look at version to determine whether update is success or not\nIf necessary, you can take screenshot of log path: [%s]"
+  to_update: "🚧 Close main process for update, restart then look at version to determine whether update is success or not"