kmoe-manga-downloader 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

kmdr/core/__init__.py

@@ -1,9 +1,9 @@
-from .bases import Authenticator, Lister, Picker, Downloader, Configurer
+from .bases import Authenticator, Lister, Picker, Downloader, Configurer, SessionManager
 from .structure import VolInfo, BookInfo, VolumeType
-from .bases import AUTHENTICATOR, LISTERS, PICKERS, DOWNLOADER, CONFIGURER, KMDR_SESSION
+from .bases import AUTHENTICATOR, LISTERS, PICKERS, DOWNLOADER, CONFIGURER, SESSION_MANAGER
 
-from .defaults import argument_parser, session_var
+from .defaults import argument_parser, console
 
 from .error import KmdrError, LoginError
 
-from .session import KmdrSession
+from .session import KmdrSessionManager

kmdr/core/bases.py

@@ -19,12 +19,18 @@ class Configurer(ConfigContext, TerminalContext):
     @abstractmethod
     def operate(self) -> None: ...
 
+class SessionManager(SessionContext, ConfigContext, TerminalContext):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    @abstractmethod
+    async def session(self) -> ClientSession: ...
+
 class Authenticator(SessionContext, ConfigContext, UserProfileContext, TerminalContext):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # 这里的 base url 可能会在认证过程中被更新
-        self._inner_base_url: Optional[str] = None
 
     # 在使用代理登录时，可能会出现问题，但是现在还不清楚是不是代理的问题。
     # 主站正常情况下不使用代理也能登录成功。但是不排除特殊的网络环境下需要代理。
@@ -33,21 +39,11 @@ class Authenticator(SessionContext, ConfigContext, UserProfileContext, TerminalC
     async def authenticate(self) -> None:
         with self._console.status("认证中..."):
             try:
-                # 这里添加了 base_url_setter，以便在重定向时更新 base_url
-                assert await async_retry(
-                    base_url_setter=self._configurer.set_base_url
-                )(self._authenticate)()
-
-                # 登录成功后，更新 base_url
-                self._base_url = self.base_url
+                assert await async_retry()(self._authenticate)()
             except LoginError as e:
-                self._console.print("[red]认证失败。请检查您的登录凭据或会话 cookie。[/red]")
                 self._console.print(f"[yellow]详细信息：{e}[/yellow]")
+                self._console.print("[red]认证失败。请检查您的登录凭据或会话 cookie。[/red]")
                 exit(1)
-    
-    @property
-    def base_url(self) -> str:
-        return self._inner_base_url or self._configurer.base_url
 
     @abstractmethod
     async def _authenticate(self) -> bool: ...
@@ -86,7 +82,7 @@ class Downloader(SessionContext, UserProfileContext, TerminalContext):
 
     async def download(self, book: BookInfo, volumes: list[VolInfo]):
         if not volumes:
-            self._console.print("No volumes to download.")
+            self._console.print("没有可下载的卷。", style="blue")
             exit(0)
 
         try:
@@ -101,7 +97,7 @@ class Downloader(SessionContext, UserProfileContext, TerminalContext):
     @abstractmethod
     async def _download(self, book: BookInfo, volume: VolInfo): ...
 
-KMDR_SESSION = Registry[ClientSession]('KmdrSession', True)
+SESSION_MANAGER = Registry[SessionManager]('SessionManager', True)
 AUTHENTICATOR = Registry[Authenticator]('Authenticator')
 LISTERS = Registry[Lister]('Lister')
 PICKERS = Registry[Picker]('Picker')

kmdr/core/constants.py

@@ -1,37 +1,30 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing_extensions import deprecated
+from typing import Union
 
+from typing_extensions import deprecated
 
-@dataclass(frozen=True)
-class _BaseUrl:
+class BASE_URL(Enum):
 
     @property
     @deprecated("KOX 已过时，请使用 KXO 或 KOZ。")
     def KOX(self) -> str:
         return 'https://kox.moe'
     
-    @property
-    def KXX(self) -> str:
-        return 'https://kxx.moe'
+    KXX = 'https://kxx.moe'
 
-    @property
-    def KXO(self) -> str:
-        return 'https://kxo.moe'
+    KXO = 'https://kxo.moe'
 
-    @property
-    def KOZ(self) -> str:
-        return 'https://koz.moe'
+    KOZ = 'https://koz.moe'
 
-    @property
-    def MOX(self) -> str:
-        return 'https://mox.moe'
+    MOX = 'https://mox.moe'
 
-    @property
-    def DEFAULT(self) -> str:
-        """默认基础 URL"""
-        return self.KXX
+    @classmethod
+    def alternatives(cls) -> set[str]:
+        """返回备用的基础 URL 列表"""
+        return {cls.KXO.value, cls.KOZ.value, cls.MOX.value}
 
+    DEFAULT = KXX
 
 @dataclass(frozen=True)
 class _ApiRoute():
@@ -71,9 +64,11 @@ class LoginResponse(Enum):
     def from_code(cls, code: str) -> 'LoginResponse':
         return cls.__members__.get(code, cls.unknown)
 
+    @classmethod
+    def ok(cls, code: Union[str, 'LoginResponse']) -> bool:
+        if isinstance(code, LoginResponse):
+            return code == cls.m100
+        return cls.from_code(code) == cls.m100
 
 API_ROUTE = _ApiRoute()
 """API 路由常量实例"""
-
-BASE_URL = _BaseUrl()
-"""基础 URL 实例"""

kmdr/core/context.py

@@ -30,6 +30,10 @@ class SessionContext:
     @property
     def _session(self) -> ClientSession:
         return session_var.get()
+    
+    @_session.setter
+    def _session(self, value: ClientSession):
+        session_var.set(value)
 
     @property
     def _base_url(self) -> str:

kmdr/core/defaults.py

@@ -176,7 +176,7 @@ class Configurer:
     @property
     def base_url(self) -> str:
         if self._config is None or self._config.base_url is None:
-            return BASE_URL.DEFAULT 
+            return BASE_URL.DEFAULT.value
         return self._config.base_url
     
     def set_base_url(self, value: str):
@@ -185,6 +185,9 @@ class Configurer:
         self._config.base_url = value
         self.update()
     
+    def get_base_url(self) -> str:
+        return self._config.base_url
+    
     def update(self):
         with open(os.path.join(os.path.expanduser("~"), self.__filename), 'w') as f:
             json.dump(self._config.__dict__, f, indent=4, ensure_ascii=False)

kmdr/core/error.py

@@ -7,6 +7,13 @@ 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)
 
+class InitializationError(KmdrError):
+    def __init__(self, message, solution: Optional[list[str]] = None):
+        super().__init__(message, solution)
+
+    def __str__(self):
+        return f"{self.message}\n{self._solution}"
+
 class LoginError(KmdrError):
     def __init__(self, message, solution: Optional[list[str]] = None):
         super().__init__(message, solution)
@@ -20,4 +27,12 @@ class RedirectError(KmdrError):
         self.new_base_url = new_base_url
 
     def __str__(self):
-        return f"{self.message} 新的地址: {self.new_base_url}"
+        return f"{self.message} 新的地址: {self.new_base_url}"
+
+class ResponseError(KmdrError):
+    def __init__(self, message, status_code: int):
+        super().__init__(message)
+        self.status_code = status_code
+
+    def __str__(self):
+        return f"{self.message} (状态码: {self.status_code})"

kmdr/core/protocol.py

@@ -0,0 +1,10 @@
+from typing import Protocol, TypeVar
+
+S = TypeVar('S', covariant=True)
+T = TypeVar('T', contravariant=True)
+
+class Supplier(Protocol[S]):
+    def __call__(self) -> S: ...
+
+class Consumer(Protocol[T]):
+    def __call__(self, value: T) -> None: ...

kmdr/core/session.py

@@ -1,16 +1,115 @@
 from typing import Optional
+from urllib.parse import urlsplit, urljoin
 
 from aiohttp import ClientSession
 
-from .bases import KMDR_SESSION
-from .defaults import session_var, HEADERS
+from .constants import BASE_URL, API_ROUTE
+from .utils import async_retry, PrioritySorter
+from .bases import SESSION_MANAGER, SessionManager
+from .defaults import HEADERS
+from .error import InitializationError, RedirectError
+from .protocol import Supplier
 
-@KMDR_SESSION.register()
-class KmdrSession(ClientSession):
+
+
+# 通常只会有一个 SessionManager 的实现
+# 因此这里直接注册为默认实现
+@SESSION_MANAGER.register()
+class KmdrSessionManager(SessionManager):
     """
-    Kmdr 的 HTTP 会话管理类，支持从参数中初始化。简化 ClientSession 的使用。
+    Kmdr 的 HTTP 会话管理类，支持从参数中初始化 ClientSession 的实例。
     """
 
-    def __init__(self, proxy: Optional[str] = None, *args, **kwargs):
-        ClientSession.__init__(self, proxy=proxy, trust_env=True, headers=HEADERS)
-        session_var.set(self)
+    def __init__(self, proxy: Optional[str] = None, book_url: Optional[str] = None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._proxy = proxy
+
+        self._sorter = PrioritySorter[str]()
+        [self._sorter.set(alt) for alt in BASE_URL.alternatives()]
+        self._sorter.incr(BASE_URL.DEFAULT.value, 2)
+        self._sorter.incr(self._base_url, 5)
+
+        if book_url is not None and book_url.strip() != "" :
+            splited = urlsplit(book_url)
+            primary_base_url = f"{splited.scheme}://{splited.netloc}"
+
+            self._sorter.incr(primary_base_url, 10)
+
+    async def session(self) -> ClientSession:
+        try:
+            if self._session is not None and not self._session.closed:
+                # 幂等性检查：如果 session 已经存在且未关闭，直接返回
+                return self._session
+        except LookupError:
+            # session_var 尚未设置
+            pass
+
+        with self._console.status("初始化中..."):
+            
+            self._base_url = await self._probing_base_url()
+            # 持久化配置
+            self._configurer.set_base_url(self._base_url)
+
+            self._session = ClientSession(
+                base_url=self._base_url,
+                proxy=self._proxy,
+                trust_env=True,
+                headers=HEADERS,
+            )
+
+            return self._session
+    
+    async def validate_url(self, session: ClientSession, url_supplier: Supplier[str]) -> bool:
+        try:
+            async with session.head(
+                # 这里只请求登录页面的头信息保证快速响应
+                # 选择登录页面，一个是因为登录页面对所有用户都开放
+                # 另外是因为不同网站的登录页面通常是不同的，可以有效区分不同的网站
+                # 如果后续发现有更合适的探测方式，可以考虑替换
+                urljoin(url_supplier(), API_ROUTE.LOGIN),
+                allow_redirects=False
+            ) as response:
+                if response.status in (301, 302, 307, 308) and 'Location' in response.headers:
+                    new_location = urlsplit(response.headers['Location'])
+                    raise RedirectError("检测到重定向", new_base_url=f"{new_location.scheme}://{new_location.netloc}")
+
+                return response.status == 200
+        except Exception as e:
+            self._console.print(f"[yellow]无法连接到镜像: {url_supplier()}，错误信息: {e}[/yellow]")
+            return False
+
+    async def _probing_base_url(self) -> str:
+        """
+        探测可用的镜像地址。
+        顺序为：首选地址 -> 备用地址
+        当前首选地址不可用时，尝试备用地址，直到找到可用的地址或耗尽所有选项。
+        如果所有地址均不可用，则抛出 InitializationError 异常。
+
+        :raises InitializationError: 如果所有镜像地址均不可用。
+        :return: 可用的镜像地址。
+        """
+
+        ret_base_url: str
+    
+        def get_base_url() -> str:
+            nonlocal ret_base_url
+            return ret_base_url
+        
+        def set_base_url(value: str) -> None:
+            nonlocal ret_base_url
+            ret_base_url = value
+
+        async with ClientSession(proxy=self._proxy, trust_env=True, headers=HEADERS) as probe_session:
+            # TODO: 请求远程仓库中的镜像列表，并添加到 sorter 中
+
+            for bu in self._sorter.sort():
+                set_base_url(bu)
+
+                if await async_retry(
+                    base_url_setter=set_base_url,
+                    on_failure=lambda e: self._console.print(f"[yellow]无法连接到镜像: {get_base_url()}，错误信息: {e}[/yellow]"),
+                )(self.validate_url)(probe_session, get_base_url):
+                    return get_base_url()
+
+            raise InitializationError(f"所有镜像均不可用，请检查您的网络连接或使用其他镜像。\n详情参考：https://github.com/chrisis58/kmoe-manga-downloader/blob/main/mirror/mirrors.json")
+

kmdr/core/utils.py

@@ -1,5 +1,5 @@
 import functools
-from typing import Optional, Callable
+from typing import Optional, Callable, TypeVar, Hashable, Generic
 import asyncio
 
 import aiohttp
@@ -8,6 +8,7 @@ import subprocess
 
 from .structure import BookInfo, VolInfo
 from .error import RedirectError
+from .protocol import Consumer
 
 
 def singleton(cls):
@@ -44,7 +45,8 @@ def async_retry(
     delay: float = 1.0,
     backoff: float = 2.0,
     retry_on_status: set[int] = {500, 502, 503, 504, 429, 408},
-    base_url_setter: Optional[Callable[[str], None]] = None,
+    base_url_setter: Optional[Consumer[str]] = None,
+    on_failure: Optional[Callable[[Exception], None]] = None
 ):
     def decorator(func):
         @functools.wraps(func)
@@ -70,9 +72,56 @@ def async_retry(
                         continue
                     else:
                         raise
+                except Exception as e:
+                    if on_failure:
+                        on_failure(e)
+                        break
+                    else:
+                        raise
                 
                 await asyncio.sleep(current_delay)
 
                 current_delay *= backoff
         return wrapper
     return decorator
+
+
+H = TypeVar('H', bound=Hashable)
+class PrioritySorter(Generic[H]):
+    """
+    根据优先级对元素进行排序的工具类
+    """
+
+    DEFAULT_ORDER = 10
+
+    def __init__(self):
+        self._items: dict[H, int] = {}
+
+    def __repr__(self) -> str:
+        return f"PrioritySorter({self._items})"
+
+    def get(self, key: H) -> Optional[int]:
+        """获取对应元素的优先级"""
+        return self._items.get(key)
+
+    def set(self, key: H, value: int = DEFAULT_ORDER) -> None:
+        """设置对应元素的优先级"""
+        self._items[key] = value
+
+    def remove(self, key: H) -> None:
+        """移除对应元素"""
+        self._items.pop(key, None)
+
+    def incr(self, key: H, offset: int = 1) -> None:
+        """提升对应元素的优先级"""
+        current_value = self._items.get(key, self.DEFAULT_ORDER)
+        self._items[key] = current_value + offset
+
+    def decr(self, key: H, offset: int = 1) -> None:
+        """降低对应元素的优先级"""
+        current_value = self._items.get(key, self.DEFAULT_ORDER)
+        self._items[key] = current_value - offset
+
+    def sort(self) -> list[H]:
+        """返回根据优先级排序后的元素列表，优先级高的元素排在前面"""
+        return [k for k, v in sorted(self._items.items(), key=lambda item: item[1], reverse=True)]

kmdr/main.py

@@ -11,8 +11,7 @@ async def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NO
         CONFIGURER.get(args).operate()
         return
 
-    async with KMDR_SESSION.get(args):
-
+    async with (await SESSION_MANAGER.get(args).session()):
         if args.command == 'login':
             await AUTHENTICATOR.get(args).authenticate()
 
@@ -41,8 +40,11 @@ def entry_point():
 
         main_coro = main(args, lambda: parser.print_help())
         asyncio.run(main_coro)
+    except KmdrError as e:
+        console.print(f"[red]错误: {e}[/red]")
+        exit(1)
     except KeyboardInterrupt:
-        print("\n操作已取消（KeyboardInterrupt）")
+        console.print("\n操作已取消（KeyboardInterrupt）", style="yellow")
         exit(130)
 
 if __name__ == '__main__':

kmdr/module/authenticator/CookieAuthenticator.py

@@ -4,11 +4,11 @@ from yarl import URL
 
 from kmdr.core import Authenticator, AUTHENTICATOR, LoginError
 
-from .utils import check_status, extract_base_url
+from .utils import check_status
 
 @AUTHENTICATOR.register()
 class CookieAuthenticator(Authenticator):
-    def __init__(self, proxy: Optional[str] = None, book_url: Optional[str] = None, *args, **kwargs):
+    def __init__(self, proxy: Optional[str] = None, *args, **kwargs):
         super().__init__(proxy, *args, **kwargs)
 
         if 'command' in kwargs and kwargs['command'] == 'status':
@@ -16,20 +16,16 @@ class CookieAuthenticator(Authenticator):
         else:
             self._show_quota = False
 
-        # 根据用户提供的 book_url 来决定访问的镜像站
-        self._inner_base_url = extract_base_url(book_url, default=self._base_url)
-
     async def _authenticate(self) -> bool:
         cookie = self._configurer.cookie
         
         if not cookie:
             raise LoginError("无法找到 Cookie，请先完成登录。", ['kmdr login -u <username>'])
-        
-        self._session.cookie_jar.update_cookies(cookie, response_url=URL(self.base_url))
+
+        self._session.cookie_jar.update_cookies(cookie, response_url=URL(self._base_url))
         return await check_status(
             self._session,
             self._console,
-            base_url=self.base_url,
             show_quota=self._show_quota,
             is_vip_setter=lambda value: setattr(self._profile, 'is_vip', value),
             level_setter=lambda value: setattr(self._profile, 'user_level', value),

kmdr/module/authenticator/LoginAuthenticator.py

@@ -1,24 +1,14 @@
 from typing import Optional
 import re
 from yarl import URL
-from urllib.parse import urljoin
 
 from rich.prompt import Prompt
 
 from kmdr.core import Authenticator, AUTHENTICATOR, LoginError
-from kmdr.core.constants import API_ROUTE
-from kmdr.core.error import RedirectError
+from kmdr.core.constants import API_ROUTE, LoginResponse
 
-from .utils import check_status, extract_base_url
+from .utils import check_status
 
-CODE_OK = 'm100'
-
-CODE_MAPPING = {
-    'e400': "帳號或密碼錯誤。",
-    'e401': "非法訪問，請使用瀏覽器正常打開本站",
-    'e402': "帳號已經註銷。不會解釋原因，無需提問。",
-    'e403': "驗證失效，請刷新頁面重新操作。",
-}
 
 @AUTHENTICATOR.register(
     hasvalues = {'command': 'login'}
@@ -37,31 +27,28 @@ class LoginAuthenticator(Authenticator):
     async def _authenticate(self) -> bool:
 
         async with self._session.post(
-            url = urljoin(self._base_url, API_ROUTE.LOGIN_DO),
+            url = API_ROUTE.LOGIN_DO,
             data = {
                 'email': self._username,
                 'passwd': self._password,
                 'keepalive': 'on'
             },
-            allow_redirects = False
         ) as response:
 
             response.raise_for_status()
 
-            if response.status in (301, 302, 307, 308) and 'Location' in response.headers:
-                new_location = response.headers['Location']
-                raise RedirectError("检测到重定向", new_base_url=extract_base_url(new_location) or self._base_url)
-
             match = re.search(r'"\w+"', await response.text())
 
             if not match:
                 raise LoginError("无法解析登录响应。")
             
             code = match.group(0).split('"')[1]
-            if code != CODE_OK:
-                raise LoginError(f"认证失败，错误代码：{code} " + CODE_MAPPING.get(code, "未知错误。"))
 
-            if await check_status(self._session, self._console, base_url=self.base_url, show_quota=self._show_quota):
+            login_response = LoginResponse.from_code(code)
+            if not LoginResponse.ok(login_response):
+                raise LoginError(f"认证失败，错误代码：{login_response.name} {login_response.value}" )
+
+            if await check_status(self._session, self._console, show_quota=self._show_quota):
                 cookie = self._session.cookie_jar.filter_cookies(URL(self._base_url))
                 self._configurer.cookie = {key: morsel.value for key, morsel in cookie.items()}
 

kmdr/module/authenticator/utils.py

@@ -2,11 +2,12 @@ from typing import Optional, Callable
 
 from aiohttp import ClientSession
 from rich.console import Console
-from urllib.parse import urljoin, urlsplit
+
+from yarl import URL
 
 from kmdr.core.error import LoginError
 from kmdr.core.utils import async_retry
-from kmdr.core.constants import API_ROUTE, BASE_URL
+from kmdr.core.constants import API_ROUTE
 
 NICKNAME_ID = 'div_nickname_display'
 
@@ -18,12 +19,11 @@ LV1_ID = 'div_user_lv1'
 async def check_status(
         session: ClientSession,
         console: Console,
-        base_url: str = BASE_URL.KXO,
         show_quota: bool = False,
         is_vip_setter: Optional[Callable[[int], None]] = None,
         level_setter: Optional[Callable[[int], None]] = None,
 ) -> bool:
-    async with session.get(url = urljoin(base_url, API_ROUTE.PROFILE)) as response:
+    async with session.get(url = API_ROUTE.PROFILE) as response:
         try:
             response.raise_for_status()
         except Exception as e:
@@ -31,7 +31,7 @@ async def check_status(
             return False
         
         if response.history and any(resp.status in (301, 302, 307) for resp in response.history) \
-                and str(response.url) == urljoin(base_url, API_ROUTE.LOGIN):
+                and URL(response.url).path == API_ROUTE.LOGIN:
             raise LoginError("凭证已失效，请重新登录。", ['kmdr config -c cookie', 'kmdr login -u <username>'])
 
         if not is_vip_setter and not level_setter and not show_quota:
@@ -81,13 +81,3 @@ def __resolve_quota_id(is_vip: Optional[int] = None, user_level: Optional[int] =
         return LV1_ID
     
     return NOR_ID
-
-def extract_base_url(url: Optional[str], default: Optional[str] = None) -> Optional[str]:
-    if not url:
-        return default
-
-    parsed = urlsplit(url)
-    if parsed.scheme and parsed.netloc:
-        return f"{parsed.scheme}://{parsed.netloc}"
-
-    return default

kmdr/module/downloader/DirectDownloader.py

@@ -1,9 +1,9 @@
-from urllib.parse import urljoin
+from functools import partial
 
 from kmdr.core import Downloader, BookInfo, VolInfo, DOWNLOADER
 from kmdr.core.constants import API_ROUTE
 
-from .download_utils import safe_filename, download_file_multipart
+from .download_utils import download_file_multipart, readable_safe_filename
 
 @DOWNLOADER.register(
     hasvalues={
@@ -15,26 +15,23 @@ class DirectDownloader(Downloader):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
 
     async def _download(self, book: BookInfo, volume: VolInfo):
-        sub_dir = safe_filename(book.name)
+        sub_dir = readable_safe_filename(book.name)
         download_path = f'{self._dest}/{sub_dir}'
 
         await download_file_multipart(
             self._session,
             self._semaphore,
             self._progress,
-            lambda: self.construct_download_url(book, volume),
+            partial(self.construct_download_url, book, volume),
             download_path,
-            safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
+            readable_safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
             self._retry,
             callback=lambda: self._callback(book, volume) if self._callback else None
         )
 
     def construct_download_url(self, book: BookInfo, volume: VolInfo) -> str:
-        return urljoin(
-            self._base_url,
-            API_ROUTE.DOWNLOAD.format(
-                book_id=book.id,
-                volume_id=volume.id,
-                is_vip=self._profile.is_vip
-            )
+        return API_ROUTE.DOWNLOAD.format(
+            book_id=book.id,
+            volume_id=volume.id,
+            is_vip=self._profile.is_vip
         )

kmdr/module/downloader/ReferViaDownloader.py

@@ -1,13 +1,13 @@
 from functools import partial
-from urllib.parse import urljoin
 
 import json
 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 .download_utils import safe_filename, download_file_multipart
+from .download_utils import download_file_multipart, readable_safe_filename
 
 
 @DOWNLOADER.register(order=10)
@@ -17,7 +17,7 @@ class ReferViaDownloader(Downloader):
 
 
     async def _download(self, book: BookInfo, volume: VolInfo):
-        sub_dir = safe_filename(book.name)
+        sub_dir = readable_safe_filename(book.name)
         download_path = f'{self._dest}/{sub_dir}'
 
         await download_file_multipart(
@@ -26,7 +26,7 @@ class ReferViaDownloader(Downloader):
             self._progress,
             partial(self.fetch_download_url, book.id, volume.id),
             download_path,
-            safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
+            readable_safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
             self._retry,
             headers={
                 "X-Km-From": "kb_http_down"
@@ -37,20 +37,17 @@ class ReferViaDownloader(Downloader):
     @alru_cache(maxsize=128)
     async def fetch_download_url(self, book_id: str, volume_id: str) -> str:
 
-        url = urljoin(
-            self._base_url,
+        async with self._session.get(
             API_ROUTE.GETDOWNURL.format(
                 book_id=book_id,
                 volume_id=volume_id,
                 is_vip=self._profile.is_vip
             )
-        )
-
-        async with self._session.get(url) as response:
+        ) as response:
             response.raise_for_status()
             data = await response.text()
             data = json.loads(data)
-            if data.get('code') != 200:
-                raise Exception(f"Failed to fetch download URL: {data.get('msg', 'Unknown error')}")
-            
+            if (code := data.get('code')) != 200:
+                raise ResponseError(f"Failed to fetch download URL: {data.get('msg', 'Unknown error')}", code)
+
             return data['url']

kmdr/module/downloader/download_utils.py

@@ -267,6 +267,12 @@ async def _download_part(
                                 await f.write(chunk)
                                 state_manager.advance(len(chunk))
             return
+    
+        except asyncio.CancelledError:
+            # 如果任务被取消，更新状态为已取消
+            await state_manager.request_status_update(part_id=start, status=STATUS.CANCELLED)
+            raise
+
         except Exception as e:
             if attempts_left > 0:
                 await asyncio.sleep(3)
@@ -297,7 +303,31 @@ async def _merge_parts(part_paths: list[str], final_path: str):
             raise e
 
 
+CHAR_MAPPING = {
+    '\\': '＼',
+    '/': '／',
+    ':': '：',
+    '*': '＊',
+    '?': '？',
+    '"': '＂',
+    '<': '＜',
+    '>': '＞',
+    '|': '｜',
+}
+DEFAULT_ILLEGAL_CHARS_REPLACEMENT = '_'
+ILLEGAL_CHARS_RE = re.compile(r'[\\/:*?"<>|]')
+
+def readable_safe_filename(name: str) -> str:
+    """
+    将字符串转换为安全的文件名，替换掉非法字符。
+    """
+    def replace_char(match):
+        char = match.group(0)
+        return CHAR_MAPPING.get(char, DEFAULT_ILLEGAL_CHARS_REPLACEMENT)
+
+    return ILLEGAL_CHARS_RE.sub(replace_char, name).strip()
 
+@deprecated("请使用 'readable_safe_filename'")
 def safe_filename(name: str) -> str:
     """
     替换非法文件名字符为下划线

kmdr/module/downloader/misc.py

@@ -12,6 +12,7 @@ class STATUS(Enum):
     COMPLETED='[green]完成[/green]'
     PARTIALLY_FAILED='[red]分片失败[/red]'
     FAILED='[red]失败[/red]'
+    CANCELLED='[yellow]已取消[/yellow]'
 
     @property
     def order(self) -> int:
@@ -23,6 +24,7 @@ class STATUS(Enum):
             STATUS.COMPLETED: 5,
             STATUS.PARTIALLY_FAILED: 6,
             STATUS.FAILED: 7,
+            STATUS.CANCELLED: 8,
         }
         return order_mapping[self]
     

kmdr/module/lister/FollowedBookLister.py

@@ -1,5 +1,4 @@
 import asyncio
-from urllib.parse import urljoin
 
 from bs4 import BeautifulSoup
 from rich.table import Table
@@ -63,7 +62,7 @@ class FollowedBookLister(Lister):
     
     @async_retry()
     async def _list_followed_books(self) -> 'list[BookInfo]':
-        async with self._session.get(urljoin(self._base_url, API_ROUTE.MY_FOLLOW)) as response:
+        async with self._session.get(API_ROUTE.MY_FOLLOW) as response:
             response.raise_for_status()
             html_text = await response.text()
 

kmdr/module/lister/utils.py

@@ -1,7 +1,6 @@
 from bs4 import BeautifulSoup
 import re
 from typing import Optional
-from urllib.parse import urljoin
 
 from yarl import URL
 from aiohttp import ClientSession as Session
@@ -20,19 +19,18 @@ async def extract_book_info_and_volumes(session: Session, url: str, book_info: O
     """
     structured_url = URL(url)
 
-    if structured_url.path.startswith('/m/'):
-        # 移除移动端路径部分，统一为桌面端路径
-        # 因为移动端页面的结构与桌面端不同，可能会影响解析
-        structured_url = structured_url.with_path(structured_url.path.replace('/m/', '', 1))
+    # 移除移动端路径部分，统一为桌面端路径
+    # 因为移动端页面的结构与桌面端不同，可能会影响解析
+    route = structured_url.path[2:] if structured_url.path.startswith('/m/') else structured_url.path
 
-    async with session.get(structured_url) as response:
+    async with session.get(route) as response:
         response.raise_for_status()
 
         # 如果后续有性能问题，可以先考虑使用 lxml 进行解析
         book_page = BeautifulSoup(await response.text(), 'html.parser')
 
         book_info = __extract_book_info(url, book_page, book_info)
-        volumes = await __extract_volumes(session, url, book_page)
+        volumes = await __extract_volumes(session, book_page)
 
         return book_info, volumes
 
@@ -51,13 +49,13 @@ def __extract_book_info(url: str, book_page: BeautifulSoup, book_info: Optional[
     )
     
 
-async def __extract_volumes(session: Session, url: str, book_page: BeautifulSoup) -> list[VolInfo]:
+async def __extract_volumes(session: Session, book_page: BeautifulSoup) -> list[VolInfo]:
     script = book_page.find_all('script', language="javascript")[-1].text
 
     pattern = re.compile(r'/book_data.php\?h=\w+')
     book_data_url = pattern.search(script).group(0)
     
-    async with session.get(url = urljoin(url, book_data_url)) as response:
+    async with session.get(url = book_data_url) as response:
         response.raise_for_status()
 
         book_data = (await response.text()).split('\n')

{kmoe_manga_downloader-1.2.1.dist-info → kmoe_manga_downloader-1.2.2.dist-info}/METADATA

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

kmoe_manga_downloader-1.2.2.dist-info/RECORD

@@ -0,0 +1,44 @@
+kmdr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kmdr/main.py,sha256=LUb3ccAEd8F2Hg4kBlfD85q0gI5wzsZnCfYQQFGy1hU,1491
+kmdr/core/__init__.py,sha256=yE96S0ShaNObncCatA9rnGoJI50Atp4vRVmdladnPlY,364
+kmdr/core/bases.py,sha256=aTvCePKDvPLtQW3Eq8isobHhncxxdVvIvZLX5jsZqKk,3673
+kmdr/core/constants.py,sha256=JFj8FHO9ab6AeIzHz3LaC8l3ziLLFi75vil8wMPfZoA,1869
+kmdr/core/context.py,sha256=AEh6A8f1ZMf3mhrA0-BR00Vd_wEK6pcI2-8VZnSeMaI,1033
+kmdr/core/defaults.py,sha256=L7KdJKisZnrkE25t_ncnYFjimMutIHSeMDpeg0o7VA0,8541
+kmdr/core/error.py,sha256=i2X175KJUvUWdmFWJnRWojIp07lTJnZWSo6IJnYqLRo,1359
+kmdr/core/protocol.py,sha256=ntHmnrvg_nZXh2-It0Wu9g2e8f3YpOLfpoRsWniG8as,247
+kmdr/core/registry.py,sha256=KYjvww5WRuUg5SeIeWZb96803-kgrTIKYvFTj_7bPfo,5560
+kmdr/core/session.py,sha256=lcC8mRn3G54kdYM00sRYIOrs2cHLnrN9qSk_axdhE0w,4740
+kmdr/core/structure.py,sha256=EQG1-8kHQ22Not2S7Q_jGxE0nb9XUbLh3JcNTb_nkvk,1199
+kmdr/core/utils.py,sha256=_tRLggprXTGFvbRzyt3dgapQr2wI5NQ8Hc4_BHVj7lU,4069
+kmdr/module/__init__.py,sha256=hY6lMBpxSn93t7OKnEbXUwTok2XqQoQbuyq1HLeC4Kc,125
+kmdr/module/authenticator/CookieAuthenticator.py,sha256=lv_monQ7QUMfgPPgxoV1xr_KyUtwCKZhqJ8umv3W6xo,1108
+kmdr/module/authenticator/LoginAuthenticator.py,sha256=5nyrzxYEGiRQ9ulnhjpuUWYeog-ALZlCCSAYkbwlKMw,1890
+kmdr/module/authenticator/__init__.py,sha256=iSWhq-suAM1BrABRuTWiCKvZ1fkmf5HQ2GmbZ341GK0,103
+kmdr/module/authenticator/utils.py,sha256=htMhBWlCo9T6aa2iMDTP_6Rjang5wRxlTTAPOMTO9Wc,2807
+kmdr/module/configurer/BaseUrlUpdator.py,sha256=cTOadDJI38rIVsCb1UvOqODY_UnxUY-1TzR-tMwKcME,501
+kmdr/module/configurer/ConfigClearer.py,sha256=2Ra-EV4fuDilWwoUS8NBSL1__-50D0YD0P6kHurH62c,480
+kmdr/module/configurer/ConfigUnsetter.py,sha256=WVCETKg80vGCDEoaN5XWG7MYDJo-eGit-n53rBk46ZE,597
+kmdr/module/configurer/OptionLister.py,sha256=wHcx8XGjjUL6Nj4K909aqikVK06UE7CXPo6XkZc3q3c,1466
+kmdr/module/configurer/OptionSetter.py,sha256=g3Nid0cG0VFhEguAcHwsOpfOluf-8lKpwZLemrUfP-A,893
+kmdr/module/configurer/__init__.py,sha256=nSWGwUCcwOkvg28zxRd0S3b4jeag_W0IhzP74xq0ewE,204
+kmdr/module/configurer/option_validate.py,sha256=Mn91UmpTI8zVV9Em8rL2mjNV21h0iYlzT8xoWDLEI68,3387
+kmdr/module/downloader/DirectDownloader.py,sha256=STJW5xkf6qV96ZufEOSLggZ0g19KVpy1VDGp578jZBo,1320
+kmdr/module/downloader/ReferViaDownloader.py,sha256=z58UEpZvzbDEjIWdHoaKEqM7a1DXD5MMuEZWmhW0LyQ,1875
+kmdr/module/downloader/__init__.py,sha256=PajPBQ4ZJwz_6Ok6k-HV7-YSibxAW5m5voYyP-U-_f4,97
+kmdr/module/downloader/download_utils.py,sha256=Oc5CbOqNOkbeQWWqbW1sr_7T0AQcv0ZPZLxsf3iCkcY,12730
+kmdr/module/downloader/misc.py,sha256=dS4GDHYxzKcqdhFNVJQG-4bS4IXMDnDrwi6eSWubl20,1892
+kmdr/module/lister/BookUrlLister.py,sha256=R1sak_GQG8HKfdSzHF-Dy1iby6TgFlxKJLf2dwBr0Bw,550
+kmdr/module/lister/FollowedBookLister.py,sha256=oen4te0H_GYEDkGiiZeWVnIPo0UVp_btIWIWxbXI4_o,2875
+kmdr/module/lister/__init__.py,sha256=VVRMRGXASdIagzlmOuhy9gKjJzf8Rj3000BPzeWpHHE,91
+kmdr/module/lister/utils.py,sha256=Q1EwGOYH4uJ2Xzsi57k_f5u8tp8Q3546GxTBxvZmZIA,3459
+kmdr/module/picker/ArgsFilterPicker.py,sha256=wBCDa6KsSSOLLQk8D4ftZ9ZnwPLiHIirxf6gGBq3I08,1782
+kmdr/module/picker/DefaultVolPicker.py,sha256=XD5mo48bwpa6T69AIxWJVvrX1daPsxyG8AFsJ4RLTBc,1760
+kmdr/module/picker/__init__.py,sha256=qYELEkv0nFT8DadItB6fdUTED2CHrC43wuPKO7QrCCQ,93
+kmdr/module/picker/utils.py,sha256=lpxM7q9BJeupFQy8glBrHu1o4E38dk7iLexzKytAE6g,1222
+kmoe_manga_downloader-1.2.2.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
+kmoe_manga_downloader-1.2.2.dist-info/METADATA,sha256=ImooJYbR8FLJOGhQfQNwlIvccOxBw5VegHof8ijjwxM,9693
+kmoe_manga_downloader-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kmoe_manga_downloader-1.2.2.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
+kmoe_manga_downloader-1.2.2.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
+kmoe_manga_downloader-1.2.2.dist-info/RECORD,,

kmoe_manga_downloader-1.2.1.dist-info/RECORD

@@ -1,43 +0,0 @@
-kmdr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kmdr/main.py,sha256=EubhpLIrGHl9XjHXdmhROg3RBKyvHPuPaZPTaSYDsxQ,1355
-kmdr/core/__init__.py,sha256=mTBPcw-mEKfHPV1bgwDx-JoO2G6dQ9QcOnQiEMmi7DE,342
-kmdr/core/bases.py,sha256=muUjcuEm-n51YTHiU7LTwfQm_AwkcNJ5TzIdPZNpK0o,3929
-kmdr/core/constants.py,sha256=_jY56Tpsg7U7Xw4Ht4Q46W4fNu8kyNCEicoTjGgKVUI,1802
-kmdr/core/context.py,sha256=cy4_Iar-dpsWQiLGIJaitNEVw6uwRkzdvF6iYDjLWl0,930
-kmdr/core/defaults.py,sha256=6A3nECLdbb3zVngdFKn_U1GrtcJRMor8Ju4XebCutU8,8459
-kmdr/core/error.py,sha256=1UR16-5E-51hV8Rtg1Ua0Ro7jGfmLpFsTBFkoD6hmto,884
-kmdr/core/registry.py,sha256=KYjvww5WRuUg5SeIeWZb96803-kgrTIKYvFTj_7bPfo,5560
-kmdr/core/session.py,sha256=lFH4lnriwqvw-tlB3MEgRedX7h_LdtaR21Rfo-HAhRs,498
-kmdr/core/structure.py,sha256=EQG1-8kHQ22Not2S7Q_jGxE0nb9XUbLh3JcNTb_nkvk,1199
-kmdr/core/utils.py,sha256=MbJQM5943IEVr4J4j7zdPKuepKh3iJmI5fy6QYnIVr8,2424
-kmdr/module/__init__.py,sha256=hY6lMBpxSn93t7OKnEbXUwTok2XqQoQbuyq1HLeC4Kc,125
-kmdr/module/authenticator/CookieAuthenticator.py,sha256=ur_MtaeNmcrLQYpFplTvVGyd1EocR-_jocPj6K5z1uY,1353
-kmdr/module/authenticator/LoginAuthenticator.py,sha256=8xtCIwR_GkHniJc2JMYwRYLdL4KfQ8d5phEz_NfzMpU,2529
-kmdr/module/authenticator/__init__.py,sha256=iSWhq-suAM1BrABRuTWiCKvZ1fkmf5HQ2GmbZ341GK0,103
-kmdr/module/authenticator/utils.py,sha256=7_oHc-9Ab48T-cTNMWEke6_OI0Z3rg-eb5LyzRzCE9M,3179
-kmdr/module/configurer/BaseUrlUpdator.py,sha256=cTOadDJI38rIVsCb1UvOqODY_UnxUY-1TzR-tMwKcME,501
-kmdr/module/configurer/ConfigClearer.py,sha256=2Ra-EV4fuDilWwoUS8NBSL1__-50D0YD0P6kHurH62c,480
-kmdr/module/configurer/ConfigUnsetter.py,sha256=WVCETKg80vGCDEoaN5XWG7MYDJo-eGit-n53rBk46ZE,597
-kmdr/module/configurer/OptionLister.py,sha256=wHcx8XGjjUL6Nj4K909aqikVK06UE7CXPo6XkZc3q3c,1466
-kmdr/module/configurer/OptionSetter.py,sha256=g3Nid0cG0VFhEguAcHwsOpfOluf-8lKpwZLemrUfP-A,893
-kmdr/module/configurer/__init__.py,sha256=nSWGwUCcwOkvg28zxRd0S3b4jeag_W0IhzP74xq0ewE,204
-kmdr/module/configurer/option_validate.py,sha256=Mn91UmpTI8zVV9Em8rL2mjNV21h0iYlzT8xoWDLEI68,3387
-kmdr/module/downloader/DirectDownloader.py,sha256=IedLaw6cGH-7Rwsvvs_27kqCDbzfHnNT5GP6ERHEo9o,1370
-kmdr/module/downloader/ReferViaDownloader.py,sha256=oM9S8BURmMQL3KPSkb0XJw-SvSIzCiJsWse4XIahKCY,1887
-kmdr/module/downloader/__init__.py,sha256=PajPBQ4ZJwz_6Ok6k-HV7-YSibxAW5m5voYyP-U-_f4,97
-kmdr/module/downloader/download_utils.py,sha256=CXpsMujgAxCQbokJ9RiQdKFozr_AgbhkJ9n-V_JWr4U,11882
-kmdr/module/downloader/misc.py,sha256=-gKmqqENQ2ukTVou9cDan0K2MDfwX43W8LyTw3o-oVM,1816
-kmdr/module/lister/BookUrlLister.py,sha256=R1sak_GQG8HKfdSzHF-Dy1iby6TgFlxKJLf2dwBr0Bw,550
-kmdr/module/lister/FollowedBookLister.py,sha256=WeMm7c81hbLr5TkrgQiBx8pQ1odOxWXn_xvQ9LxYZYs,2933
-kmdr/module/lister/__init__.py,sha256=VVRMRGXASdIagzlmOuhy9gKjJzf8Rj3000BPzeWpHHE,91
-kmdr/module/lister/utils.py,sha256=iUA0zu8JzKUouT3rwM_fr8knlHSPqApqeGSYOFI2D7I,3575
-kmdr/module/picker/ArgsFilterPicker.py,sha256=wBCDa6KsSSOLLQk8D4ftZ9ZnwPLiHIirxf6gGBq3I08,1782
-kmdr/module/picker/DefaultVolPicker.py,sha256=XD5mo48bwpa6T69AIxWJVvrX1daPsxyG8AFsJ4RLTBc,1760
-kmdr/module/picker/__init__.py,sha256=qYELEkv0nFT8DadItB6fdUTED2CHrC43wuPKO7QrCCQ,93
-kmdr/module/picker/utils.py,sha256=lpxM7q9BJeupFQy8glBrHu1o4E38dk7iLexzKytAE6g,1222
-kmoe_manga_downloader-1.2.1.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
-kmoe_manga_downloader-1.2.1.dist-info/METADATA,sha256=0YGgNLfT2bFWscpO-N3QWsDbu19hMEYcXlb5yFbo3Wc,9693
-kmoe_manga_downloader-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kmoe_manga_downloader-1.2.1.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
-kmoe_manga_downloader-1.2.1.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
-kmoe_manga_downloader-1.2.1.dist-info/RECORD,,