kmoe-manga-downloader 1.2.1__py3-none-any.whl → 1.2.3b0__py3-none-any.whl

kmdr/main.py

@@ -1,3 +1,5 @@
+from kmdr import __version__
+
 from typing import Callable
 from argparse import Namespace
 import asyncio
@@ -7,29 +9,39 @@ from kmdr.module import *
 
 async def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPLEMENTED!')) -> None:
 
-    if args.command == 'config':
-        CONFIGURER.get(args).operate()
-        return
+    post_init(args)
+    log('[Lifecycle:Start] 启动 kmdr 版本:', __version__)
+    debug('[bold green]以调试模式启动[/bold green]')
+    debug('接收到的参数:', args)
 
-    async with KMDR_SESSION.get(args):
+    if args.command == 'version':
+        info(f"[green]{__version__}[/green]")
+
+    elif args.command == 'config':
+        CONFIGURER.get(args).operate()
 
-        if args.command == 'login':
+    elif args.command == 'login':
+        async with (await SESSION_MANAGER.get(args).session()):
             await AUTHENTICATOR.get(args).authenticate()
 
-        elif args.command == 'status':
+    elif args.command == 'status':
+        async with (await SESSION_MANAGER.get(args).session()):
             await AUTHENTICATOR.get(args).authenticate()
 
-        elif args.command == 'download':
+    elif args.command == 'download':
+        async with (await SESSION_MANAGER.get(args).session()):
             await AUTHENTICATOR.get(args).authenticate()
 
             book, volumes = await LISTERS.get(args).list()
+            debug("获取到书籍《", book.name, "》及其", len(volumes), "个章节信息。")
 
             volumes = PICKERS.get(args).pick(volumes)
+            debug("选择了", len(volumes), "个章节进行下载:", ', '.join(volume.name for volume in volumes))
 
             await DOWNLOADER.get(args).download(book, volumes)
 
-        else:
-            fallback()
+    else:
+        fallback()
 
 def main_sync(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPLEMENTED!')) -> None:
     asyncio.run(main(args, fallback))
@@ -41,9 +53,18 @@ def entry_point():
 
         main_coro = main(args, lambda: parser.print_help())
         asyncio.run(main_coro)
+    except KmdrError as e:
+        info(f"[red]错误: {e}[/red]")
+        exit(1)
     except KeyboardInterrupt:
-        print("\n操作已取消（KeyboardInterrupt）")
+        info("\n操作已取消（KeyboardInterrupt）", style="yellow")
         exit(130)
+    except Exception as e:
+        exception(e)
+        exit(1)
+    finally:
+        log('[Lifecycle:End] 运行结束，kmdr 已退出')
+    
 
 if __name__ == '__main__':
     entry_point()

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,13 @@ 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
+from kmdr.core.console import *
 
 NICKNAME_ID = 'div_nickname_display'
 
@@ -18,20 +20,19 @@ 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:
-            console.print(f"Error: {type(e).__name__}: {e}")
+            info(f"Error: {type(e).__name__}: {e}")
             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:
@@ -50,6 +51,8 @@ async def check_status(
             is_vip = int(var_define.get('is_vip', '0'))
             user_level = int(var_define.get('user_level', '0'))
 
+            debug("解析到用户状态: is_vip=", is_vip, ", user_level=", user_level)
+
             if is_vip_setter:
                 is_vip_setter(is_vip)
             if level_setter:
@@ -58,10 +61,14 @@ async def check_status(
         if not show_quota:
             return True
 
-        nickname = soup.find('div', id=NICKNAME_ID).text.strip().split(' ')[0]
-        quota = soup.find('div', id=__resolve_quota_id(is_vip, user_level)).text.strip()
+        nickname = soup.find('div', id=NICKNAME_ID).text.strip().split(' ')[0].replace('\xa0', '')
+        quota = soup.find('div', id=__resolve_quota_id(is_vip, user_level)).text.strip().replace('\xa0', '')
+
+        if console.is_interactive:
+            info(f"\n当前登录为 [bold cyan]{nickname}[/bold cyan]\n\n{quota}")
+        else:
+            info(f"当前登录为 {nickname}")
 
-        console.print(f"\n当前登录为 [bold cyan]{nickname}[/bold cyan]\n\n{quota}")
         return True
 
 def extract_var_define(script_text) -> dict[str, str]:
@@ -81,13 +88,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/configurer/BaseUrlUpdator.py

@@ -1,4 +1,5 @@
 from kmdr.core import Configurer, CONFIGURER
+from kmdr.core.console import info
 
 @CONFIGURER.register()
 class BaseUrlUpdator(Configurer):
@@ -10,7 +11,7 @@ class BaseUrlUpdator(Configurer):
         try:
             self._configurer.set_base_url(self._base_url)
         except KeyError as e:
-            self._console.print(e.args[0])
+            info(f"[red]{e.args[0]}[/red]")
             exit(1)
 
-        self._console.print(f"已设置基础 URL: {self._base_url}")
+        info(f"已设置基础 URL: {self._base_url}")

kmdr/module/configurer/ConfigClearer.py

@@ -1,4 +1,5 @@
 from kmdr.core import Configurer, CONFIGURER
+from kmdr.core.console import info
 
 @CONFIGURER.register()
 class ConfigClearer(Configurer):
@@ -10,7 +11,7 @@ class ConfigClearer(Configurer):
         try:
             self._configurer.clear(self._clear)
         except KeyError as e:
-            self._console.print(e.args[0])
+            info(f"[red]{e.args[0]}[/red]")
             exit(1)
 
-        self._console.print(f"Cleared configuration: {self._clear}")
+        info(f"Cleared configuration: {self._clear}")

kmdr/module/configurer/ConfigUnsetter.py

@@ -1,4 +1,5 @@
 from kmdr.core import Configurer, CONFIGURER
+from kmdr.core.console import info
 
 from .option_validate import check_key
 
@@ -10,9 +11,9 @@ class ConfigUnsetter(Configurer):
 
     def operate(self) -> None:
         if not self._unset:
-            self._console.print("[yellow]请提供要取消设置的配置项。[/yellow]")
+            info("[yellow]请提供要取消设置的配置项。[/yellow]")
             return
 
         check_key(self._unset)
         self._configurer.unset_option(self._unset)
-        self._console.print(f"[green]取消配置项: {self._unset}[/green]")
+        info(f"[green]取消配置项: {self._unset}[/green]")

kmdr/module/configurer/OptionLister.py

@@ -2,6 +2,7 @@ from rich.table import Table
 from rich.pretty import Pretty
 
 from kmdr.core import CONFIGURER, Configurer
+from kmdr.core.console import info
 
 @CONFIGURER.register(
     hasvalues={
@@ -14,7 +15,7 @@ class OptionLister(Configurer):
 
     def operate(self) -> None:
         if self._configurer.option is None and self._configurer.base_url is None:
-            self._console.print("[blue]当前没有任何配置项。[/blue]")
+            info("[blue]当前没有任何配置项。[/blue]")
             return
 
         table = Table(title="[green]当前 Kmdr 配置项[/green]", show_header=False, header_style="blue")
@@ -35,4 +36,4 @@ class OptionLister(Configurer):
         if self._configurer.base_url is not None:
             table.add_row('应用配置', '镜像地址', self._configurer.base_url or '未设置')
 
-        self._console.print(table)
+        info(table)

kmdr/module/configurer/OptionSetter.py

@@ -1,4 +1,5 @@
 from kmdr.core import Configurer, CONFIGURER
+from kmdr.core.console import info
 
 from .option_validate import validate
 
@@ -11,7 +12,7 @@ class OptionSetter(Configurer):
     def operate(self) -> None:
         for option in self._set:
             if '=' not in option:
-                self._console.print(f"[red]无效的选项格式: `{option}`。[/red] 应为 key=value 格式。")
+                info(f"[red]无效的选项格式: `{option}`。[/red] 应为 key=value 格式。")
                 continue
 
             key, value = option.split('=', 1)
@@ -23,7 +24,7 @@ class OptionSetter(Configurer):
                 continue
 
             self._configurer.set_option(key, validated_value)
-            self._console.print(f"[green]已设置配置: {key} = {validated_value}[/green]")
+            info(f"[green]已设置配置: {key} = {validated_value}[/green]")
 
 
 

kmdr/module/configurer/option_validate.py

@@ -2,7 +2,7 @@ from typing import Optional
 from functools import wraps
 import os
 
-from kmdr.core.defaults import console_print as print
+from kmdr.core.console import info
 
 __OPTIONS_VALIDATOR = {}
 
@@ -17,7 +17,7 @@ def validate(key: str, value: str) -> Optional[object]:
     if key in __OPTIONS_VALIDATOR:
         return __OPTIONS_VALIDATOR[key](value)
     else:
-        print(f"[red]不支持的配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
+        info(f"[red]不支持的配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
         return None
 
 def check_key(key: str, exit_if_invalid: bool = True) -> None:
@@ -29,7 +29,7 @@ def check_key(key: str, exit_if_invalid: bool = True) -> None:
     :param exit_if_invalid: 如果键名无效，是否退出程序
     """
     if key not in __OPTIONS_VALIDATOR:
-        print(f"[red]未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
+        info(f"[red]未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
         if exit_if_invalid:
             exit(1)
 
@@ -65,24 +65,24 @@ def validate_num_workers(value: str) -> Optional[int]:
             raise ValueError("必须是正值。")
         return num_workers
     except ValueError as e:
-        print(f"[red]无效的 num_workers 值: {value}。{str(e)}[/red]")
+        info(f"[red]无效的 num_workers 值: {value}。{str(e)}[/red]")
         return None
 
 @register_validator('dest')
 def validate_dest(value: str) -> Optional[str]:
     if not value:
-        print("[red]目标目录不能为空。[/red]")
+        info("[red]目标目录不能为空。[/red]")
         return None
     if not os.path.exists(value) or not os.path.isdir(value):
-        print(f"[red]目标目录不存在或不是目录: {value}[/red]")
+        info(f"[red]目标目录不存在或不是目录: {value}[/red]")
         return None
 
     if not os.access(value, os.W_OK):
-        print(f"[red]目标目录不可写: {value}[/red]")
+        info(f"[red]目标目录不可写: {value}[/red]")
         return None
 
     if not os.path.isabs(value):
-        print(f"[yellow]目标目录最好是绝对路径: {value}[/yellow]")
+        info(f"[yellow]目标目录最好是绝对路径: {value}[/yellow]")
 
     return value
 
@@ -94,19 +94,19 @@ def validate_retry(value: str) -> Optional[int]:
             raise ValueError("必须是正值。")
         return retry
     except ValueError as e:
-        print(f"[red]无效的 retry 值: {value}。{str(e)}[/red]")
+        info(f"[red]无效的 retry 值: {value}。{str(e)}[/red]")
         return None
 
 @register_validator('callback')
 def validate_callback(value: str) -> Optional[str]:
     if not value:
-        print("[red]回调不能为空。[/red]")
+        info("[red]回调不能为空。[/red]")
         return None
     return value
 
 @register_validator('proxy')
 def validate_proxy(value: str) -> Optional[str]:
     if not value:
-        print("[red]代理不能为空。[/red]")
+        info("[red]代理不能为空。[/red]")
         return None
     return value

kmdr/module/downloader/DirectDownloader.py

@@ -1,13 +1,13 @@
-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={
-        'method': 1
+        'method': 2
     }
 )
 class DirectDownloader(Downloader):
@@ -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,14 @@
 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 kmdr.core.console import debug
 
-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 +18,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 +27,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 +38,18 @@ 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')}")
-            
+            debug("获取下载链接响应数据:", data)
+            if (code := data.get('code')) != 200:
+                raise ResponseError(f"Failed to fetch download URL: {data.get('msg', 'Unknown error')}", code)
+
             return data['url']