Merge-build: v2.4.1

Author: jasoneri

GUI/mainwindow.py

@@ -5,7 +5,7 @@
 from GUI.uic.ui_mainwindow import Ui_MainWindow
 from GUI.uic.qfluent.components import TextBrowserWithBg
 from assets import res as ori_res
-
+from variables import VER
 
 res = ori_res.GUI.Uic
 
@@ -14,7 +14,7 @@ class MitmMainWindow(Ui_MainWindow):
     def setupUi(self, _mainWindow):
         _translate = QtCore.QCoreApplication.translate
         super(MitmMainWindow, self).setupUi(_mainWindow)
-        _mainWindow.setWindowTitle(_translate("MainWindow", "ComicGUISpider v2.4.1-beta"))
+        _mainWindow.setWindowTitle(_translate("MainWindow", f"ComicGUISpider {VER}"))
         self.retrybtn.setDisabled(True)
         self.clipBtn.setDisabled(1)
         self.searchinput.setClearButtonEnabled(1)

GUI/manager/__init__.py

@@ -151,6 +151,6 @@ def checked(recv):
         self.conf_dia.puThread.start()
 
     def after_update(self):
-        cmd = [uv_exc, "tool","run","--from","comicguispider","cgs"]
+        cmd = ["cgs"]
         subprocess.Popen(cmd, cwd=exc_p, env=env)
         QTimer.singleShot(1000, self.gui.close)

GUI/manager/preprocess.py

@@ -8,7 +8,7 @@
 from qfluentwidgets import InfoBar, InfoBarPosition, setTheme
 
 from assets import res
-from variables import PYPI_SOURCE
+from variables import PYPI_SOURCE, VER
 from utils import conf, ori_path, exc_p, uv_exc, env
 from utils.website import EHentaiKits, Cache
 from GUI.browser_window import BrowserWindow
@@ -243,7 +243,7 @@ def emit_progress(msg):
 
                 if missing_packages:
                     # 使用pyproject.toml安装脚本依赖
-                    cmd = [uv_exc, "tool", "install", "--force", "ComicGUISpider[script]"]
+                    cmd = [uv_exc, "tool", "install", "--force", f"ComicGUISpider[script]=={VER}"]
                     cmd.extend(["--index-url", PYPI_SOURCE[conf.pypi_source]])
                     process = subprocess.Popen(
                         cmd, cwd=exc_p, env=env,
@@ -294,14 +294,14 @@ def emit_progress(msg):
                     if progress_callback:
                         progress_callback(msg)
 
-                from GUI.script.kemono import KemonoAuthor
+                from utils.script.image.kemono import  KemonoAuthor, headers, Api
                 cache = Cache("kemono_data.pkl")
                 @cache.with_expiry(240, write_in=True)
                 def download_kemono_data():
                     emit_progress("正在更新缓存数据...")
-                    url = "https://kemono.cr/api/v1/creators"
+                    url = Api.creators_txt
                     try:
-                        with data_cli.stream("GET", url, follow_redirects=True, timeout=60) as resp:
+                        with data_cli.stream("GET", url, headers=headers, follow_redirects=True, timeout=60) as resp:
                             resp.raise_for_status()
                             content = b""
                             for chunk in resp.iter_bytes():

README.md

@@ -65,7 +65,7 @@
 
 ✅ kemono 域名更换  
 ✅ 修复 domainTool 的 jm 域名检测  
-✅ ✨更新修复 kemomo 预处理中的数据下载
+✅ ✨修复 kemomo 的 api 变更相关
 
 > 配置窗口左下设有`检查更新`按钮，请根据提示进行更新操作  
 

deploy/update.py

@@ -1,9 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 """code update"""
-import os
-import json
-import shutil
 import pathlib
 import platform
 import subprocess
@@ -14,7 +11,7 @@
 from packaging.version import parse
 
 from assets import res as ori_res
-from variables import PYPI_SOURCE
+from variables import PYPI_SOURCE, VER
 from utils import conf, exc_p, uv_exc, env
 
 
@@ -98,72 +95,6 @@ def download_src_code(self, _url=None, zip_name="src.zip"):
         return zip_file
 
 
-class BackupManager:
-    def __init__(self):
-        self.backup_dir = temp_p.joinpath("backup")
-        if self.backup_dir.exists():
-                shutil.rmtree(self.backup_dir, ignore_errors=True)
-        self.ignore_patterns = [self.backup_dir.name, '*.pyc', '__pycache__', 'log', '*.db']
-
-    def _safe_operation(self, operation: callable, error_msg: str, *args, **kwargs) -> bool:
-        try:
-            operation(*args, **kwargs)
-            return True
-        except Exception as e:
-            updater_logger.warning(f"BackupWarning: {error_msg}: {e}")
-            return False
-
-    def _safe_remove(self, _path, is_dir=False):
-        return self._safe_operation(shutil.rmtree if is_dir else os.remove, f"BackupDeleteError: {_path}", _path)
-
-    def _safe_move(self, _src, _dst):
-        return self._safe_operation(shutil.move, f"BackupMoveError: {_src} -> {_dst}", _src, _dst)
-    
-    def _check_file_access(self, _path):
-        try:
-            if _path.is_file():
-                with open(_path, 'a', encoding='utf-8'): pass
-            return True
-        except (IOError, OSError):
-            return False
-
-    def create_backup(self):
-        if self.backup_dir.exists() and not self._safe_remove(self.backup_dir, is_dir=True):
-            raise RuntimeError("BackupCleanError: fail clean old backup")
-        try:
-            shutil.copytree(existed_proj_p.absolute(), self.backup_dir, ignore=shutil.ignore_patterns(*self.ignore_patterns))
-        except Exception as e:
-            self.cleanup()
-            raise e
-
-    def restore_backup(self):
-        if not self.backup_dir.exists():
-            raise FileNotFoundError("BackupNotFoundError: backup directory not found")
-        self._check_destination_access()
-        _failed_items = set()
-        for _item in self.backup_dir.iterdir():
-            _src = self.backup_dir / _item.name
-            _dst = existed_proj_p / _item.name
-            if _dst.exists() and not self._safe_remove(_dst, is_dir=_dst.is_dir()):
-                _failed_items.add(_item.name)
-            if not self._safe_move(_src, existed_proj_p):
-                _failed_items.add(_item.name)
-        if _failed_items:
-            raise RuntimeError(f"BackupRestoreError: [{', '.join(_failed_items)}]")
-        self.cleanup()
-
-    def _check_destination_access(self):
-        _inaccessible_files = [_dst for _item in self.backup_dir.iterdir() 
-                             if (_dst := existed_proj_p / _item.name).exists() 
-                             and not self._check_file_access(_dst)]
-        if _inaccessible_files:
-            raise RuntimeError(f"BackupAccessError: [{', '.join(_inaccessible_files)}]")
-
-    def cleanup(self):
-        if self.backup_dir.exists():
-            self._safe_remove(self.backup_dir, is_dir=True)
-
-
 class Proj:
     proj = "CGS"
     github_author = "jasoneri"
@@ -174,7 +105,6 @@ class Proj:
     ver = ""
     first_flag = False
     local_ver = None
-    local_ver_file = existed_proj_p.joinpath('version.json')
     changed_files = []
     update_flag = "local"
     update_info = {}
@@ -190,13 +120,7 @@ def print(self, *args, **kwargs):
         print(*args, **kwargs)
 
     def check_existed_version(self):
-        if not self.local_ver_file.exists():
-            self.first_flag = True
-        else:
-            with open(self.local_ver_file, 'r', encoding='utf-8') as f:
-                version_info = json.load(f)
-                return version_info.get('current', 'v0.0.0')
-        return 'v0.0.0'
+        return VER
 
     def check(self):
         self.local_ver = local_ver = self.check_existed_version()
@@ -214,10 +138,8 @@ def check(self):
 
     def local_update(self, ver=None):
         self.ver = ver or self.update_info.get('tag_name') or self.local_ver
-        backuper = BackupManager()
-        backuper.create_backup()
         try:
-            cmd = [uv_exc,"tool","upgrade","ComicGUISpider"]
+            cmd = [uv_exc,"tool","upgrade",f"ComicGUISpider=={self.ver}"]
             cmd.extend(["--index-url", PYPI_SOURCE[conf.pypi_source]])
             self.print("[uv cmd]" + " ".join(cmd))
             process = subprocess.Popen(
@@ -246,9 +168,3 @@ def local_update(self, ver=None):
                 self.print("[!uv upgrade done!]")
         except Exception as e:
             raise e
-        else:
-            self.update_end()
-
-    def update_end(self):
-        with open(self.local_ver_file, 'w', encoding='utf-8') as f:
-            json.dump({"current": self.ver}, f, ensure_ascii=False, indent=4)

docs/_github/release_notes.md

@@ -1,6 +1,7 @@
 
 > [!Warning]  
-> 由于绿色包内部执行已更改为 `uv tool`，旧版本绿色包需删掉后使用新版本，无论win还是mac
+> 由于绿色包内部执行已更改为 `uv tool`，`v2.4.0`之前旧版绿色包需删掉后使用新版本，无论win还是mac；  
+> 使用内置更新升级失败的话查看 [更新失败指引](https://jasoneri.github.io/ComicGUISpider/faq/#%E6%9B%B4%E6%96%B0%E5%A4%B1%E8%B4%A5%E5%90%8E%E7%A8%8B%E5%BA%8F%E6%97%A0%E6%B3%95%E6%89%93%E5%BC%80)  
 
 ## 🎁 Feat
 
@@ -12,4 +13,4 @@
 
 ✅ kemono 域名更换  
 ✅ 修复 domainTool 的 jm 域名检测  
-✅ ✨更新修复 kemomo 预处理中的数据下载
+✅ ✨修复 kemomo 的 api 变更相关

docs/faq/index.md

@@ -61,7 +61,7 @@
 
 ::: tip 两种方式可选  
 
-- 下载📦绿色包 重新安装/更新  
+- 删干净原目录/换一个解压目录 并重新解压📦绿色包，然后重新初始化部署/更新  
 - 干脆直接使用 [uv tool方式部署安装](/deploy/quick-start#1-下载--部署)
 :::
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ComicGUISpider"
-version = "2.4.1-beta"
+version = "2.4.1"
 description = "GUI Comic Downloader"
 readme = "README.md"
 requires-python = ">=3.12"

utils/redViewer_tools.py

@@ -5,8 +5,6 @@
 import shutil
 from dataclasses import dataclass
 
-from tqdm import tqdm
-
 from assets import res
 from utils import conf
 
@@ -19,7 +17,7 @@ def combine_then_mv(root_dir, target_dir, order_book=None) -> list:
     target_p = pathlib.Path(target_dir)
     done = []
     for order_dir in filter(lambda x: x.is_dir() and x.name not in expect_dir, p.iterdir()):
-        for ordered_section in tqdm(order_dir.iterdir()):
+        for ordered_section in order_dir.iterdir():
             ___ = target_p.joinpath(f"{order_dir.name}_{ordered_section.name}")
             if ___.exists():
                 shutil.rmtree(___)
@@ -32,7 +30,7 @@ def combine_then_mv(root_dir, target_dir, order_book=None) -> list:
 def restore(ori):
     p = pathlib.Path(ori)
     book_p = None
-    for i in tqdm(p.iterdir()):
+    for i in p.iterdir():
         book, section = i.name.split('_')
         if not p.parent.joinpath(book).exists():
             book_p = p.parent.joinpath(book)

utils/script/image/expander.py

@@ -34,7 +34,8 @@ def __init__(self, title_filters: Optional[Dict[str, str]] = None):
 
     def base_process(self, posts):
         if self.has_normal:
-            posts = list(filter(lambda p: not bool(self._normal_pattern.search(p['title'])), posts))
+            posts = list(filter(lambda p: not bool(self._normal_pattern.search(
+                p.get('title', p.get('content', '')))), posts))
         for post in posts:
             if post.get("title"):
                 post['title'] = self._sanitize_re.sub('-', post['title'])