kmoe-manga-downloader 1.2.4b0__tar.gz → 1.2.6__tar.gz

kmoe_manga_downloader-1.2.6/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,81 @@
+name: Bug 报告
+description: 提交一个 Bug 帮助我们改进
+labels: ['bug']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您提交 Bug！
+        请确保已阅读相关文档，并按照模版提供信息，否则 issue 可能会被关闭。
+
+  - type: input
+    id: app-version
+    attributes:
+      label: 应用版本
+      description: 请提供您使用的应用版本号，可以通过 `kmdr --version` 获取。
+    validations:
+      required: true
+  
+  - type: textarea
+    id: actual-command
+    attributes:
+      label: 实际执行的命令
+      description: 请提供您实际执行的命令。
+      placeholder: kmdr download -l <book_url> -v <volume_selected>
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-expected
+    attributes:
+      label: 预期是什么？
+      description: 您期望发生什么？
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual-happened
+    attributes:
+      label: 实际发生了什么？
+      description: 实际发生了什么，可以附带截图等说明问题。
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 应用输出信息
+      description: 请在此处粘贴任何相关的日志、报错信息或堆栈跟踪。
+      render: shell
+    validations:
+      required: true
+  
+  - type: textarea
+    id: debug-logs
+    attributes:
+      label: 调试输出信息
+      description: |
+        如果问题可以复现，请启用调试模式（添加 `--verbose` 参数）并粘贴调试日志。
+        如 `kmdr --verbose status`。
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: 其他上下文信息
+      description: |
+        请提供任何其他有助于理解问题的上下文信息，例如操作系统、使用的 shell 等。
+      placeholder: "OS: ..., Shell: ..."
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: 这不是重复的 issue
+      options:
+        - label: 我已经搜索了现有 issue，以确保该错误尚未被报告。
+          required: true

kmoe_manga_downloader-1.2.6/.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,55 @@
+name: 功能请求
+description: 建议一个新功能或改进
+labels: ['enhancement']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您抽出宝贵时间提出功能请求！
+        请详细描述您的想法，以便我们更好地理解它。
+
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: 您的功能请求是否与某个问题/痛点相关？
+      description: 请详细描述您遇到的问题或痛点。
+      placeholder: "当我...时，我希望能..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution-description
+    attributes:
+      label: 您希望的解决方案是什么？
+      description: |
+        请清晰简洁地描述您希望发生什么。
+        如果是 CLI 相关的，可以提供理想中的命令用法。
+      placeholder: |
+        我希望 `kmdr download` 增加一个 `--format epub` 标志...
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: 您是否考虑过其他替代方案？
+      description: 请描述您可能考虑过的任何替代解决方案或功能，以及为什么提议的方案更好。
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: 额外信息
+      description: 在这里添加任何其他关于功能请求的信息，例如伪代码、流程图、截图或外部链接。
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: 确认
+      options:
+        - label: 我已经搜索了现有 issue，以确保这个功能尚未被提议。
+          required: true

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/.github/workflows/unit-test.yml

@@ -3,6 +3,9 @@ name: Unit Tests
 on:
   push:
     branches: [ main ]
+    paths:
+      - 'src/**'
+      - 'tests/**'
 
 jobs:
   test:

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kmoe-manga-downloader
-Version: 1.2.4b0
+Version: 1.2.6
 Summary: A CLI-downloader for site @kox.moe.
 Author-email: Chris Zheng <chrisis58@outlook.com>
 License: MIT License

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.2.4b0'
-__version_tuple__ = version_tuple = (1, 2, 4, 'b0')
+__version__ = version = '1.2.6'
+__version_tuple__ = version_tuple = (1, 2, 6)
 
-__commit_id__ = commit_id = 'g4623b0002'
+__commit_id__ = commit_id = 'ge80e6fa7b'

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/bases.py

@@ -9,6 +9,7 @@ from .error import LoginError
 from .registry import Registry
 from .structure import VolInfo, BookInfo
 from .utils import construct_callback, async_retry
+from .protocol import AsyncCtxManager
 
 from .context import TerminalContext, SessionContext, UserProfileContext, ConfigContext
 
@@ -26,7 +27,7 @@ class SessionManager(SessionContext, ConfigContext, TerminalContext):
         super().__init__(*args, **kwargs)
 
     @abstractmethod
-    async def session(self) -> ClientSession: ...
+    async def session(self) -> AsyncCtxManager[ClientSession]: ...
 
 class Authenticator(SessionContext, ConfigContext, UserProfileContext, TerminalContext):
 
@@ -44,7 +45,6 @@ class Authenticator(SessionContext, ConfigContext, UserProfileContext, TerminalC
             except LoginError as e:
                 info(f"[yellow]详细信息：{e}[/yellow]")
                 info("[red]认证失败。请检查您的登录凭据或会话 cookie。[/red]")
-                exit(1)
 
     @abstractmethod
     async def _authenticate(self) -> bool: ...
@@ -84,7 +84,7 @@ class Downloader(SessionContext, UserProfileContext, TerminalContext):
     async def download(self, book: BookInfo, volumes: list[VolInfo]):
         if not volumes:
             info("没有可下载的卷。", style="blue")
-            exit(0)
+            return
 
         try:
             with self._progress:
@@ -97,11 +97,10 @@ class Downloader(SessionContext, UserProfileContext, TerminalContext):
                 for exc in exceptions:
                     info(f"[red]- {exc}[/red]")
                     exception(exc)
-                exit(1)
 
-        except KeyboardInterrupt:
-            info("\n操作已取消（KeyboardInterrupt）")
-            exit(130)
+        except asyncio.CancelledError:
+            await asyncio.sleep(0.01)
+            raise
 
     @abstractmethod
     async def _download(self, book: BookInfo, volume: VolInfo): ...

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/console.py

@@ -10,8 +10,6 @@ import io
 from rich.console import Console
 from rich.traceback import Traceback
 
-from kmdr.core.defaults import is_verbose
-
 _console_config = dict[str, Any](
     log_time_format="[%Y-%m-%d %H:%M:%S]",
 )
@@ -24,6 +22,12 @@ except io.UnsupportedOperation:
 
 _console = Console(**_console_config)
 
+_is_verbose = False
+
+def _update_verbose_setting(value: bool):
+    global _is_verbose
+    _is_verbose = value
+
 def info(*args, **kwargs):
     """
     在终端中输出信息
@@ -41,7 +45,7 @@ def debug(*args, **kwargs):
     
     `info` 的条件版本，仅当启用详细模式时才会输出。
     """
-    if is_verbose():
+    if _is_verbose:
         if _console.is_interactive:
             _console.print("[dim]DEBUG:[/]", *args, **kwargs)
         else:
@@ -57,7 +61,7 @@ def log(*args, debug=False, **kwargs):
         # 如果是交互式终端，则不记录日志
         return
 
-    if debug and is_verbose():
+    if debug and _is_verbose:
         # 仅在调试模式和启用详细模式时记录调试日志
         _console.log("DEBUG:", *args, **kwargs, _stack_offset=2)
     else:

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/context.py

@@ -18,7 +18,7 @@ class TerminalContext:
     def _progress(self) -> Progress:
         global _lazy_progress
         if _lazy_progress is None:
-            _lazy_progress = Progress(*progress_definition, console=self._console)
+            _lazy_progress = Progress(*progress_definition, console=self._console, refresh_per_second=4)
         return _lazy_progress
 
 class UserProfileContext:

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/defaults.py

@@ -5,6 +5,7 @@ import json
 from typing import Optional, Any
 import argparse
 from contextvars import ContextVar
+
 from rich.console import Console
 from rich.progress import (
     Progress,
@@ -18,6 +19,7 @@ from rich.progress import (
 from .utils import singleton
 from .structure import Config
 from .constants import BASE_URL
+from .console import _update_verbose_setting
 
 HEADERS = {
     'User-Agent': 'kmdr/1.0 (https://github.com/chrisis58/kmoe-manga-downloader)'
@@ -68,6 +70,7 @@ def argument_parser():
     download_parser.add_argument('-r', '--retry', type=int, help='网络请求失败时的重试次数', required=False)
     download_parser.add_argument('-c', '--callback', type=str, help='每个卷下载完成后执行的回调脚本，例如: `echo {v.name} downloaded!`', required=False)
     download_parser.add_argument('-m', '--method', type=int, help='下载方法，对应网站上的不同下载方式', required=False, choices=[1, 2], default=1)
+    download_parser.add_argument('--vip', action='store_true', help='尝试使用 VIP 链接进行下载（下载速度可能不及 CDN 方式）')
 
     login_parser = subparsers.add_parser('login', help='登录到 Kmoe')
     login_parser.add_argument('-u', '--username', type=str, help='用户名', required=True)
@@ -95,7 +98,6 @@ def parse_args():
 
     if args.command is None:
         parser.print_help()
-        exit(1)
 
     return args
 
@@ -241,11 +243,6 @@ def combine_args(dest: argparse.Namespace) -> argparse.Namespace:
 
 base_url_var = ContextVar('base_url', default=Configurer().base_url)
 
-_verbose = False
-
-def is_verbose() -> bool:
-    return _verbose
-
 def post_init(args) -> None:
-    global _verbose
-    _verbose = getattr(args, 'verbose', False)
+    _verbose = getattr(args, 'verbose', False)
+    _update_verbose_setting(_verbose)

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/error.py

@@ -7,6 +7,9 @@ class KmdrError(RuntimeError):
 
         self._solution = "" if solution is None else "\n[bold cyan]推荐解决方法:[/bold cyan] \n" + "\n".join(f"[cyan]>>> {sol}[/cyan]" for sol in solution)
 
+    def __str__(self):
+        return f"{self.message}\n{self._solution}"
+
 class InitializationError(KmdrError):
     def __init__(self, message, solution: Optional[list[str]] = None):
         super().__init__(message, solution)
@@ -36,6 +39,18 @@ class RedirectError(KmdrError):
     def __str__(self):
         return f"{self.message} 新的地址: {self.new_base_url}"
 
+class ValidationError(KmdrError):
+    def __init__(self, message, field: str):
+        super().__init__(message)
+        self.field = field
+
+    def __str__(self):
+        return f"{self.message} (字段: {self.field})"
+
+class EmptyResultError(KmdrError):
+    def __init__(self, message):
+        super().__init__(message)
+
 class ResponseError(KmdrError):
     def __init__(self, message, status_code: int):
         super().__init__(message)

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/protocol.py

@@ -8,3 +8,7 @@ class Supplier(Protocol[S]):
 
 class Consumer(Protocol[T]):
     def __call__(self, value: T) -> None: ...
+
+class AsyncCtxManager(Protocol[S]):
+    async def __aenter__(self) -> S: ...
+    async def __aexit__(self, exc_type, exc_value, traceback) -> None: ...

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/registry.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass, field
 from argparse import Namespace
 
 from .defaults import combine_args
+from .console import debug
 
 T = TypeVar('T')
 
@@ -76,6 +77,7 @@ class Registry(Generic[T]):
     def get(self, condition: Namespace) -> T:
         if self._combine_args:
             condition = combine_args(condition)
+            debug("合并默认参数后，条件为:", condition)
         return self._get(condition)
     
     def _get(self, condition: Namespace) -> T:

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/session.py

@@ -1,6 +1,9 @@
 from typing import Optional
 from urllib.parse import urlsplit, urljoin
+from typing import Type
+from types import TracebackType
 
+import asyncio
 from aiohttp import ClientSession
 
 from .constants import BASE_URL, API_ROUTE
@@ -10,6 +13,7 @@ from .defaults import HEADERS
 from .error import InitializationError, RedirectError
 from .protocol import Supplier
 from .console import *
+from .protocol import AsyncCtxManager
 
 
 
@@ -38,11 +42,11 @@ class KmdrSessionManager(SessionManager):
             self._sorter.incr(primary_base_url, 10)
         debug("镜像地址优先级排序:", self._sorter)
 
-    async def session(self) -> ClientSession:
+    async def session(self) -> AsyncCtxManager[ClientSession]:
         try:
             if self._session is not None and not self._session.closed:
                 # 幂等性检查：如果 session 已经存在且未关闭，直接返回
-                return self._session
+                return SessionCtxManager(self._session)
         except LookupError:
             # session_var 尚未设置
             pass
@@ -62,7 +66,7 @@ class KmdrSessionManager(SessionManager):
                 headers=HEADERS,
             )
 
-            return self._session
+            return SessionCtxManager(self._session)
     
     async def validate_url(self, session: ClientSession, url_supplier: Supplier[str]) -> bool:
         try:
@@ -118,3 +122,22 @@ class KmdrSessionManager(SessionManager):
 
             raise InitializationError(f"所有镜像均不可用，请检查您的网络连接或使用其他镜像。\n详情参考：https://github.com/chrisis58/kmoe-manga-downloader/blob/main/mirror/mirrors.json")
 
+class SessionCtxManager:
+    def __init__(self, session: ClientSession):
+        self._session = session
+
+    async def __aenter__(self) -> ClientSession:
+        await self._session.__aenter__()
+        return self._session
+
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType]
+    ):
+        await self._session.__aexit__(exc_type, exc_value, traceback)
+
+        if exc_type in (KeyboardInterrupt, asyncio.CancelledError):
+            debug("任务被取消，正在清理资源")
+            await asyncio.sleep(0.01)

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/core/utils.py

@@ -1,6 +1,7 @@
 import functools
 from typing import Optional, Callable, TypeVar, Hashable, Generic
 import asyncio
+from asyncio.proactor_events import _ProactorBasePipeTransport
 
 import aiohttp
 
@@ -9,6 +10,7 @@ import subprocess
 from .structure import BookInfo, VolInfo
 from .error import RedirectError
 from .protocol import Consumer
+from .console import debug
 
 
 def singleton(cls):
@@ -68,7 +70,7 @@ def async_retry(
                 except RedirectError as e:
                     if base_url_setter:
                         base_url_setter(e.new_base_url)
-                        print(f"检测到重定向，已自动更新 base url 为: {e.new_base_url}。立即重试...")
+                        debug("检测到重定向，已自动更新 base url 为", e.new_base_url)
                         continue
                     else:
                         raise
@@ -124,4 +126,24 @@ class PrioritySorter(Generic[H]):
 
     def sort(self) -> list[H]:
         """返回根据优先级排序后的元素列表，优先级高的元素排在前面"""
-        return [k for k, v in sorted(self._items.items(), key=lambda item: item[1], reverse=True)]
+        return [k for k, v in sorted(self._items.items(), key=lambda item: item[1], reverse=True)]
+    
+def _silence_event_loop_closed(func):
+    """
+    用于静默处理 'Event loop is closed' 异常的装饰器。
+    该异常在某些情况下（如 Windows 平台使用 Proactor 事件循环）会在对象销毁时抛出，
+    导致程序输出不必要的错误信息。此装饰器捕获该异常并忽略它。
+    
+    @see https://github.com/aio-libs/aiohttp/issues/4324
+    """
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        try:
+            return func(self, *args, **kwargs)
+        except RuntimeError as e:
+            if str(e) != 'Event loop is closed':
+                raise
+ 
+    return wrapper
+
+_ProactorBasePipeTransport.__del__ = _silence_event_loop_closed(_ProactorBasePipeTransport.__del__)

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/main.py

@@ -1,9 +1,8 @@
-from kmdr import __version__
-
 from typing import Callable
 from argparse import Namespace
 import asyncio
 
+from kmdr import __version__
 from kmdr.core import *
 from kmdr.module import *
 
@@ -51,17 +50,14 @@ def entry_point():
         parser = argument_parser()
         args = parser.parse_args()
 
-        main_coro = main(args, lambda: parser.print_help())
+        main_coro = main(args, parser.print_help)
         asyncio.run(main_coro)
     except KmdrError as e:
         info(f"[red]错误: {e}[/red]")
-        exit(1)
     except KeyboardInterrupt:
         info("\n操作已取消（KeyboardInterrupt）", style="yellow")
-        exit(130)
     except Exception as e:
         exception(e)
-        exit(1)
     finally:
         log('[Lifecycle:End] 运行结束，kmdr 已退出')
     

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/configurer/BaseUrlUpdator.py

@@ -12,6 +12,6 @@ class BaseUrlUpdator(Configurer):
             self._configurer.set_base_url(self._base_url)
         except KeyError as e:
             info(f"[red]{e.args[0]}[/red]")
-            exit(1)
+            return
 
         info(f"已设置基础 URL: {self._base_url}")

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/configurer/ConfigClearer.py

@@ -12,6 +12,6 @@ class ConfigClearer(Configurer):
             self._configurer.clear(self._clear)
         except KeyError as e:
             info(f"[red]{e.args[0]}[/red]")
-            exit(1)
+            return
 
-        info(f"Cleared configuration: {self._clear}")
+        info(f"[green]已清除: {self._clear}[/green]")

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/configurer/option_validate.py

@@ -3,6 +3,7 @@ from functools import wraps
 import os
 
 from kmdr.core.console import info
+from kmdr.core.error import ValidationError
 
 __OPTIONS_VALIDATOR = {}
 
@@ -20,18 +21,19 @@ def validate(key: str, value: str) -> Optional[object]:
         info(f"[red]不支持的配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
         return None
 
-def check_key(key: str, exit_if_invalid: bool = True) -> None:
+def check_key(key: str, raise_if_invalid: bool = True) -> None:
     """
     供外部调用的验证函数，用于检查配置项的键名是否有效。
     如果键名无效，函数会打印错误信息并退出程序。
 
     :param key: 配置项的键名
-    :param exit_if_invalid: 如果键名无效，是否退出程序
+    :param raise_if_invalid: 如果键名无效，是否抛出异常
     """
     if key not in __OPTIONS_VALIDATOR:
-        info(f"[red]未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
-        if exit_if_invalid:
-            exit(1)
+        if raise_if_invalid:
+            raise ValidationError(f"未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}", field=key)
+        else:
+            info(f"[red]未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
 
 def register_validator(arg_name):
     """

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/downloader/DirectDownloader.py

@@ -11,8 +11,9 @@ from .download_utils import download_file_multipart, readable_safe_filename
     }
 )
 class DirectDownloader(Downloader):
-    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, *args, **kwargs):
+    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, *args, **kwargs):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
+        self._use_vip = vip
 
     async def _download(self, book: BookInfo, volume: VolInfo):
         sub_dir = readable_safe_filename(book.name)
@@ -33,5 +34,5 @@ class DirectDownloader(Downloader):
         return API_ROUTE.DOWNLOAD.format(
             book_id=book.id,
             volume_id=volume.id,
-            is_vip=self._profile.is_vip
+            is_vip=self._profile.is_vip if self._use_vip else 0
         )

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/downloader/ReferViaDownloader.py

@@ -1,11 +1,13 @@
 from functools import partial
 
 import json
+import aiohttp
 from async_lru import alru_cache
 
 from kmdr.core import Downloader, VolInfo, DOWNLOADER, BookInfo
 from kmdr.core.constants import API_ROUTE
 from kmdr.core.error import ResponseError
+from kmdr.core.utils import async_retry
 from kmdr.core.console import debug
 
 from .download_utils import download_file_multipart, readable_safe_filename
@@ -13,9 +15,9 @@ from .download_utils import download_file_multipart, readable_safe_filename
 
 @DOWNLOADER.register(order=10)
 class ReferViaDownloader(Downloader):
-    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, *args, **kwargs):
+    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, *args, **kwargs):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
-
+        self._use_vip = vip
 
     async def _download(self, book: BookInfo, volume: VolInfo):
         sub_dir = readable_safe_filename(book.name)
@@ -36,13 +38,14 @@ class ReferViaDownloader(Downloader):
         )
 
     @alru_cache(maxsize=128)
+    @async_retry()
     async def fetch_download_url(self, book_id: str, volume_id: str) -> str:
 
         async with self._session.get(
             API_ROUTE.GETDOWNURL.format(
                 book_id=book_id,
                 volume_id=volume_id,
-                is_vip=self._profile.is_vip
+                is_vip=self._profile.is_vip if self._use_vip else 0
             )
         ) as response:
             response.raise_for_status()
@@ -50,6 +53,15 @@ class ReferViaDownloader(Downloader):
             data = json.loads(data)
             debug("获取下载链接响应数据:", data)
             if (code := data.get('code')) != 200:
-                raise ResponseError(f"Failed to fetch download URL: {data.get('msg', 'Unknown error')}", code)
+
+                if code in {401, 403, 404}:
+                    raise ResponseError("无法获取下载链接" + data.get('msg', 'Unknown error'), code)
+
+                raise aiohttp.ClientResponseError(
+                    response.request_info,
+                    history=response.history,
+                    status=code,
+                    message=data.get('msg', 'Unknown error')
+                )
 
             return data['url']

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/downloader/download_utils.py

@@ -14,12 +14,25 @@ from aiohttp.client_exceptions import ClientPayloadError
 
 from kmdr.core.console import info, log, debug
 from kmdr.core.error import ResponseError
+from kmdr.core.utils import async_retry
 
 from .misc import STATUS, StateManager
 
 BLOCK_SIZE_REDUCTION_FACTOR = 0.75
 MIN_BLOCK_SIZE = 2048
 
+_HEAD_SEMAPHORE_VALUE = 3
+_HEAD_SEMAPHORE: Optional[asyncio.Semaphore] = None
+"""定义的用于 HEAD 请求的信号量，限制并发数量以避免触发服务器限流。"""
+
+def _get_head_request_semaphore() -> asyncio.Semaphore:
+    """惰性初始化 HEAD 请求信号量。"""
+    global _HEAD_SEMAPHORE
+    
+    if _HEAD_SEMAPHORE is None:
+        _HEAD_SEMAPHORE = asyncio.Semaphore(_HEAD_SEMAPHORE_VALUE)
+    return _HEAD_SEMAPHORE
+
 
 @deprecated("本函数可能不会积极维护，请改用 'download_file_multipart'")
 async def download_file(
@@ -171,17 +184,10 @@ async def download_file_multipart(
     try:
         current_url = await fetch_url(url)
 
-        async with semaphore:
+        async with _get_head_request_semaphore():
             # 获取文件信息，请求以获取文件大小
-            # 复用 semaphore 以控制并发，避免过多并发请求触发服务器限流
-            async with session.head(current_url, headers=headers, allow_redirects=True) as response:
-                # 注意：这个请求完成后，服务器就会记录这次下载，并消耗对应的流量配额，详细的规则请参考网站说明：
-                #   注 1 : 訂閱連載中的漫畫，有更新時自動推送的卷(冊)，暫不計算在使用額度中，不扣減使用額度。
-                #   注 2 : 對同一卷(冊)書在 12 小時內重複*下載*，不會重複扣減額度。但重復推送是會扣減的。
-                response.raise_for_status()
-                if 'Content-Length' not in response.headers:
-                    raise ResponseError("无法从服务器获取文件大小，请检查网络连接或稍后重试。", status_code=response.status)
-                total_size = int(response.headers['Content-Length'])
+            # 控制并发，避免过多并发请求触发服务器限流
+            total_size = await _fetch_content_length(session, current_url, headers=headers)
 
         chunk_size = chunk_size_mb * 1024 * 1024
         num_chunks = math.ceil(total_size / chunk_size)
@@ -241,6 +247,41 @@ async def download_file_multipart(
             if task_id is not None and state_manager is not None:
                 await state_manager.request_status_update(part_id=StateManager.PARENT_ID, status=STATUS.FAILED)
 
+@async_retry()
+async def _fetch_content_length(
+        session: aiohttp.ClientSession,
+        url: str,
+        headers: Optional[dict] = None,
+) -> int:
+    """
+    获取文件的内容长度（字节数）
+
+    :note: 这个请求完成后，服务器就会记录这次下载，并消耗对应的流量配额，详细的规则请参考网站说明：
+    - 注 1 : 訂閱連載中的漫畫，有更新時自動推送的卷(冊)，暫不計算在使用額度中，不扣減使用額度。
+    - 注 2 : 對同一卷(冊)書在 12 小時內重複*下載*，不會重複扣減額度。但重復推送是會扣減的。
+
+    :param session: aiohttp.ClientSession 对象
+    :param url: 文件 URL
+    :param headers: 请求头
+    :return: 文件大小（字节数）
+    """
+    if headers is None:
+        headers = {}
+
+    async with session.head(url, headers=headers, allow_redirects=True) as response:
+        response.raise_for_status()
+        if 'Content-Length' in response.headers:
+            return int(response.headers['Content-Length'])
+
+    async with session.get(url, headers=headers, allow_redirects=True) as response:
+        # 普通下载链接可能不支持 HEAD 请求，尝试使用 GET 请求获取文件大小
+        # see: https://github.com/chrisis58/kmoe-manga-downloader/issues/25
+        debug("HEAD 请求未返回 Content-Length，尝试使用 GET 请求获取文件大小")
+        response.raise_for_status()
+        if 'Content-Length' not in response.headers:
+            raise ResponseError("无法从服务器获取文件大小，请检查网络连接或稍后重试。", status_code=response.status)
+        return int(response.headers['Content-Length'])
+
 async def _download_part(
         session: aiohttp.ClientSession,
         semaphore: asyncio.Semaphore,
@@ -283,6 +324,7 @@ async def _download_part(
                             if chunk:
                                 await f.write(chunk)
                                 state_manager.advance(len(chunk))
+                await state_manager.pop_part(part_id=start)
                 log("分片", os.path.basename(part_path), "下载完成。")
             return
     
@@ -294,8 +336,8 @@ async def _download_part(
         except Exception as e:
             if attempts_left > 0:
                 debug("分片", os.path.basename(part_path), "下载出错:", e, "，正在重试... 剩余重试次数:", attempts_left)
-                await asyncio.sleep(3)
                 await state_manager.request_status_update(part_id=start, status=STATUS.WAITING)
+                await asyncio.sleep(3)
             else:
                 # console.print(f"[red]分片 {os.path.basename(part_path)} 下载失败: {e}[/red]")
                 debug("分片", os.path.basename(part_path), "下载失败:", e)
@@ -355,19 +397,22 @@ def safe_filename(name: str) -> str:
     """
     return re.sub(r'[\\/:*?"<>|]', '_', name)
 
-async def fetch_url(url: Union[str, Callable[[], str], Callable[[], Awaitable[str]]], retry_times: int = 3) -> str:
-    while retry_times >= 0:
-        try:
-            if callable(url):
-                result = url()
-                if asyncio.iscoroutine(result) or isinstance(result, Awaitable):
-                    return await result
-                return result
-            elif isinstance(url, str):
-                return url
-        except Exception as e:
-            retry_times -= 1
-            if retry_times < 0:
-                raise e
-            await asyncio.sleep(2)
-    raise RuntimeError("Max retries exceeded")
+async def fetch_url(url: Union[str, Callable[[], str], Callable[[], Awaitable[str]]]) -> str:
+    """
+    获取下载链接的包装函数，支持直接传入字符串或异步/同步的 Supplier 函数。
+
+    :note: 不包含重试机制，调用方需自行处理。
+    :param url: 下载链接或其 Supplier
+    :return: 下载链接
+    """
+
+    if callable(url):
+        result = url()
+        if asyncio.iscoroutine(result) or isinstance(result, Awaitable):
+            # 如果 url() 是一个异步函数，等待它
+            return await result
+        # 如果 url() 是一个同步函数，直接返回
+        return result
+    elif isinstance(url, str):
+        # 如果 url 只是个字符串，直接返回
+        return url

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/downloader/misc.py

@@ -3,6 +3,8 @@ import asyncio
 
 from rich.progress import Progress, TaskID
 
+from kmdr.core.console import debug
+
 
 class STATUS(Enum):
     WAITING='[blue]等待中[/blue]'
@@ -56,9 +58,20 @@ class StateManager:
         highest_status = max(self._part_states.values())
         if highest_status != self._current_status:
             self._current_status = highest_status
-            self._progress.update(self._task_id, status=highest_status.value, refresh=True)
+            self._progress.update(self._task_id, status=highest_status.value)
+
+    async def pop_part(self, part_id: int):
+        """
+        下载完成后移除分片状态记录，不再参与状态计算
+        
+        :note: 为避免状态闪烁，调用后不会更新状态
+        """
+        async with self._lock:
+            if part_id in self._part_states:
+                self._part_states.pop(part_id)
 
     async def request_status_update(self, part_id: int, status: STATUS):
         async with self._lock:
+            debug("分片", part_id, "请求状态更新为", status)
             self._part_states[part_id] = status
             self._update_status()

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/lister/FollowedBookLister.py

@@ -8,6 +8,7 @@ from kmdr.core import Lister, LISTERS, BookInfo, VolInfo
 from kmdr.core.utils import async_retry
 from kmdr.core.constants import API_ROUTE
 from kmdr.core.console import info
+from kmdr.core.error import EmptyResultError
 
 from .utils import extract_book_info_and_volumes
 
@@ -24,8 +25,7 @@ class FollowedBookLister(Lister):
             books = await self._list_followed_books()
         
         if not books:
-            info("[yellow]关注列表为空。[/yellow]")
-            exit(0)
+            raise EmptyResultError("关注列表为空。")
 
         table = Table(title="关注的书籍列表", show_header=True, header_style="bold blue")
         table.add_column("序号", style="dim", width=4, justify="center")

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmdr/module/lister/utils.py

@@ -8,6 +8,7 @@ from aiohttp import ClientSession as Session
 from kmdr.core import BookInfo, VolInfo, VolumeType
 from kmdr.core.utils import async_retry
 from kmdr.core.console import debug
+from kmdr.core.error import KmdrError
 
 @async_retry()
 async def extract_book_info_and_volumes(session: Session, url: str, book_info: Optional[BookInfo] = None) -> tuple[BookInfo, list[VolInfo]]:
@@ -41,6 +42,12 @@ async def extract_book_info_and_volumes(session: Session, url: str, book_info: O
 def __extract_book_info(url: str, book_page: BeautifulSoup, book_info: Optional[BookInfo]) -> BookInfo:
     book_name = book_page.find('font', class_='text_bglight_big').text
 
+    if '為符合要求，此書內容已屏蔽' in book_name:
+        raise KmdrError(
+            "[yellow]该书籍内容已被屏蔽，请检查代理配置。[/yellow]", 
+            solution=["kmdr config -s proxy=<your_proxy>  # 设置可用的代理地址"]
+        )
+
     id = book_page.find('input', attrs={'name': 'bookid'})['value']
 
     return BookInfo(

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmoe_manga_downloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kmoe-manga-downloader
-Version: 1.2.4b0
+Version: 1.2.6
 Summary: A CLI-downloader for site @kox.moe.
 Author-email: Chris Zheng <chrisis58@outlook.com>
 License: MIT License

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/src/kmoe_manga_downloader.egg-info/SOURCES.txt

@@ -2,6 +2,8 @@
 LICENSE
 README.md
 pyproject.toml
+.github/ISSUE_TEMPLATE/bug_report.yml
+.github/ISSUE_TEMPLATE/feature_request.yml
 .github/workflows/release-package.yml
 .github/workflows/unit-test.yml
 assets/kmdr-demo.gif

{kmoe_manga_downloader-1.2.4b0 → kmoe_manga_downloader-1.2.6}/tests/test_kmdr_download.py

@@ -129,6 +129,55 @@ class TestKmdrDownload(unittest.TestCase):
             os.path.getsize(os.path.join(dest, book_dir, f)) for f in os.listdir(os.path.join(dest, book_dir)) if os.path.isfile(os.path.join(dest, book_dir, f))
         )
         assert total_size < 1 * 0.6 * 1024 * 1024, "Total size of downloaded files exceeds 0.6 MB"
+    
+    def test_download_single_volume_use_vip(self):
+        dest = f'{BASE_DIR}/{self.test_download_single_volume_use_vip.__name__}'
+
+        kmdr_main(
+            Namespace(
+                command='download',
+                dest=dest,
+                book_url=f'{DEFAULT_BASE_URL}/c/51044.htm',
+                vol_type='extra',
+                volume='all',
+                max_size=0.6,
+                limit=1,
+                retry=3,
+                vip=True
+            )
+        )
+
+        assert len(sub_dir := os.listdir(dest)) == 1, "Expected one subdirectory in the destination"
+        assert os.path.isdir(os.path.join(dest, book_dir := sub_dir[0])), "Expected the subdirectory to be a directory"
+        assert len(os.listdir(os.path.join(dest, book_dir))) == 1, "Expected 1 volume to be downloaded"
+
+        total_size = sum(
+            os.path.getsize(os.path.join(dest, book_dir, f)) for f in os.listdir(os.path.join(dest, book_dir)) if os.path.isfile(os.path.join(dest, book_dir, f))
+        )
+        assert total_size < 1 * 0.6 * 1024 * 1024, "Total size of downloaded files exceeds 0.6 MB"
+
+    def test_download_volume_with_direct_downloader_and_use_vip(self):
+        dest = f'{BASE_DIR}/{self.test_download_volume_with_direct_downloader_and_use_vip.__name__}'
+
+        kmdr_main(
+            Namespace(
+                command='download',
+                dest=dest,
+                book_url=f'{DEFAULT_BASE_URL}/c/51043.htm',
+                vol_type='extra',
+                volume='all',
+                max_size=0.4,
+                method=2, # use direct download method
+                limit=1,
+                retry=3,
+                num_workers=1,
+                vip=True
+            )
+        )
+
+        assert len(sub_dir := os.listdir(dest)) == 1, "Expected one subdirectory in the destination"
+        assert os.path.isdir(os.path.join(dest, book_dir := sub_dir[0])), "Expected the subdirectory to be a directory"
+        assert len(os.listdir(os.path.join(dest, book_dir))) == 1, "Expected 1 volume to be downloaded"
 
     def test_download_multiple_volumes_with_multiple_workers(self):
         dest = f'{BASE_DIR}/{self.test_download_multiple_volumes_with_multiple_workers.__name__}'
@@ -175,7 +224,7 @@ class TestKmdrDownload(unittest.TestCase):
 
         assert len(files := os.listdir(dest)) == 2, "Expected one subdirectory and one callback log file in the destination"
         assert 'callback.log' in files, "Expected callback log file to be present"
-        with open(os.path.join(dest, 'callback.log'), 'r', encoding='utf-8') as f:
+        with open(os.path.join(dest, 'callback.log'), 'r') as f:
             log_content = f.read()
             assert "CALLBACK:" in log_content, "Expected callback log to contain the correct message"
         files.remove('callback.log')