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

kmdr/main.py

@@ -1,37 +1,46 @@
 from typing import Callable
 from argparse import Namespace
+import asyncio
 
 from kmdr.core import *
 from kmdr.module import *
 
-def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPLEMENTED!')) -> None:
+async def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPLEMENTED!')) -> None:
 
-    if args.command == 'login':
-        AUTHENTICATOR.get(args).authenticate()
+    if args.command == 'config':
+        CONFIGURER.get(args).operate()
+        return
 
-    elif args.command == 'status':
-        AUTHENTICATOR.get(args).authenticate()
+    async with KMDR_SESSION.get(args):
 
-    elif args.command == 'download':
-        AUTHENTICATOR.get(args).authenticate()
+        if args.command == 'login':
+            await AUTHENTICATOR.get(args).authenticate()
 
-        book, volumes = LISTERS.get(args).list()
+        elif args.command == 'status':
+            await AUTHENTICATOR.get(args).authenticate()
 
-        volumes = PICKERS.get(args).pick(volumes)
+        elif args.command == 'download':
+            await AUTHENTICATOR.get(args).authenticate()
 
-        DOWNLOADER.get(args).download(book, volumes)
+            book, volumes = await LISTERS.get(args).list()
 
-    elif args.command == 'config':
-        CONFIGURER.get(args).operate()
+            volumes = PICKERS.get(args).pick(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))
 
 def entry_point():
     try:
         parser = argument_parser()
         args = parser.parse_args()
-        main(args, lambda: parser.print_help())
+
+        main_coro = main(args, lambda: parser.print_help())
+        asyncio.run(main_coro)
     except KeyboardInterrupt:
         print("\n操作已取消（KeyboardInterrupt）")
         exit(130)

kmdr/module/__init__.py

@@ -1,5 +1,5 @@
-from .authenticator import CookieAuthenticator, LoginAuthenticator
-from .lister import BookUrlLister, FollowedBookLister
-from .picker import ArgsFilterPicker, DefaultVolPicker
-from .downloader import DirectDownloader, ReferViaDownloader
-from .configurer import OptionLister, OptionSetter, ConfigClearer, ConfigUnsetter
+from .authenticator import *
+from .lister import *
+from .picker import *
+from .downloader import *
+from .configurer import *

kmdr/module/authenticator/CookieAuthenticator.py

@@ -1,12 +1,14 @@
 from typing import Optional
 
+from yarl import URL
+
 from kmdr.core import Authenticator, AUTHENTICATOR, LoginError
 
-from .utils import check_status
+from .utils import check_status, extract_base_url
 
 @AUTHENTICATOR.register()
 class CookieAuthenticator(Authenticator):
-    def __init__(self, proxy: Optional[str] = None, *args, **kwargs):
+    def __init__(self, proxy: Optional[str] = None, book_url: Optional[str] = None, *args, **kwargs):
         super().__init__(proxy, *args, **kwargs)
 
         if 'command' in kwargs and kwargs['command'] == 'status':
@@ -14,16 +16,21 @@ class CookieAuthenticator(Authenticator):
         else:
             self._show_quota = False
 
-    def _authenticate(self) -> bool:
+        # 根据用户提供的 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("No cookie found, please login first.", ['kmdr login -u <username>'])
+            raise LoginError("无法找到 Cookie，请先完成登录。", ['kmdr login -u <username>'])
         
-        self._session.cookies.update(cookie)
-        return check_status(
+        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,10 +1,15 @@
 from typing import Optional
 import re
-from getpass import getpass
+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 .utils import check_status
+from .utils import check_status, extract_base_url
 
 CODE_OK = 'm100'
 
@@ -25,32 +30,41 @@ class LoginAuthenticator(Authenticator):
         self._show_quota = show_quota
 
         if password is None:
-            password = getpass("please input your password: ")
+            password = Prompt.ask("请输入密码", password=True, console=self._console)
 
         self._password = password
 
-    def _authenticate(self) -> bool:
-        
-        response = self._session.post(
-            url = 'https://kox.moe/login_do.php', 
+    async def _authenticate(self) -> bool:
+
+        async with self._session.post(
+            url = urljoin(self._base_url, API_ROUTE.LOGIN_DO),
             data = {
                 'email': self._username,
                 'passwd': self._password,
                 'keepalive': 'on'
             },
-        )
-        response.raise_for_status()
-        match = re.search(r'"\w+"', response.text)
-
-        if not match:
-            raise LoginError("Failed to extract authentication code from response.")
-        
-        code = match.group(0).split('"')[1]
-        if code != CODE_OK:
-            raise LoginError(f"Authentication failed with error code: {code} " + CODE_MAPPING.get(code, "Unknown error."))
-
-        if check_status(self._session, show_quota=self._show_quota):
-            self._configurer.cookie = self._session.cookies.get_dict()
-            return True
-        
-        return False
+            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):
+                cookie = self._session.cookie_jar.filter_cookies(URL(self._base_url))
+                self._configurer.cookie = {key: morsel.value for key, morsel in cookie.items()}
+
+                return True
+            
+            return False

kmdr/module/authenticator/__init__.py

@@ -0,0 +1,2 @@
+from .CookieAuthenticator import CookieAuthenticator
+from .LoginAuthenticator import LoginAuthenticator

kmdr/module/authenticator/utils.py

@@ -1,11 +1,12 @@
 from typing import Optional, Callable
 
-from requests import Session
+from aiohttp import ClientSession
+from rich.console import Console
+from urllib.parse import urljoin, urlsplit
 
 from kmdr.core.error import LoginError
-
-PROFILE_URL = 'https://kox.moe/my.php'
-LOGIN_URL = 'https://kox.moe/login.php'
+from kmdr.core.utils import async_retry
+from kmdr.core.constants import API_ROUTE, BASE_URL
 
 NICKNAME_ID = 'div_nickname_display'
 
@@ -13,52 +14,55 @@ VIP_ID = 'div_user_vip'
 NOR_ID = 'div_user_nor'
 LV1_ID = 'div_user_lv1'
 
-def check_status(
-        session: Session,
+@async_retry()
+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
+        level_setter: Optional[Callable[[int], None]] = None,
 ) -> bool:
-    response = session.get(url = PROFILE_URL)
-
-    try:
-        response.raise_for_status()
-    except Exception as e:
-        print(f"Error: {type(e).__name__}: {e}")
-        return False
-    
-    if response.history and any(resp.status_code in (301, 302, 307) for resp in response.history) \
-        and response.url == LOGIN_URL:
-        raise LoginError("Invalid credentials, please login again.", ['kmdr config -c cookie', 'kmdr login -u <username>'])
-
-    if not is_vip_setter and not level_setter and not show_quota:
+    async with session.get(url = urljoin(base_url, API_ROUTE.PROFILE)) as response:
+        try:
+            response.raise_for_status()
+        except Exception as e:
+            console.print(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):
+            raise LoginError("凭证已失效，请重新登录。", ['kmdr config -c cookie', 'kmdr login -u <username>'])
+
+        if not is_vip_setter and not level_setter and not show_quota:
+            return True
+        
+        from bs4 import BeautifulSoup
+
+        # 如果后续有性能问题，可以先考虑使用 lxml 进行解析
+        soup = BeautifulSoup(await response.text(), 'html.parser')
+
+        script = soup.find('script', language="javascript")
+
+        if script:
+            var_define = extract_var_define(script.text[:100])
+
+            is_vip = int(var_define.get('is_vip', '0'))
+            user_level = int(var_define.get('user_level', '0'))
+
+            if is_vip_setter:
+                is_vip_setter(is_vip)
+            if level_setter:
+                level_setter(user_level)
+        
+        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()
+
+        console.print(f"\n当前登录为 [bold cyan]{nickname}[/bold cyan]\n\n{quota}")
         return True
-    
-    from bs4 import BeautifulSoup
-
-    soup = BeautifulSoup(response.text, 'html.parser')
-
-    script = soup.find('script', language="javascript")
-
-    if script:
-        var_define = extract_var_define(script.text[:100])
-
-        is_vip = int(var_define.get('is_vip', '0'))
-        user_level = int(var_define.get('user_level', '0'))
-
-        if is_vip_setter:
-            is_vip_setter(is_vip)
-        if level_setter:
-            level_setter(user_level)
-    
-    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()
-
-    print(f"\n当前登录为 {nickname}\n\n{quota}")
-    return True
 
 def extract_var_define(script_text) -> dict[str, str]:
     var_define = {}
@@ -77,3 +81,13 @@ 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

@@ -0,0 +1,16 @@
+from kmdr.core import Configurer, CONFIGURER
+
+@CONFIGURER.register()
+class BaseUrlUpdator(Configurer):
+    def __init__(self, base_url: str, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._base_url = base_url
+
+    def operate(self) -> None:
+        try:
+            self._configurer.set_base_url(self._base_url)
+        except KeyError as e:
+            self._console.print(e.args[0])
+            exit(1)
+
+        self._console.print(f"已设置基础 URL: {self._base_url}")

kmdr/module/configurer/ConfigClearer.py

@@ -7,5 +7,10 @@ class ConfigClearer(Configurer):
         self._clear = clear
 
     def operate(self) -> None:
-        self._configurer.clear(self._clear)
-        print(f"Cleared configuration: {self._clear}")
+        try:
+            self._configurer.clear(self._clear)
+        except KeyError as e:
+            self._console.print(e.args[0])
+            exit(1)
+
+        self._console.print(f"Cleared configuration: {self._clear}")

kmdr/module/configurer/ConfigUnsetter.py

@@ -10,9 +10,9 @@ class ConfigUnsetter(Configurer):
 
     def operate(self) -> None:
         if not self._unset:
-            print("No option specified to unset.")
+            self._console.print("[yellow]请提供要取消设置的配置项。[/yellow]")
             return
 
         check_key(self._unset)
         self._configurer.unset_option(self._unset)
-        print(f"Unset configuration: {self._unset}")
+        self._console.print(f"[green]取消配置项: {self._unset}[/green]")

kmdr/module/configurer/OptionLister.py

@@ -1,3 +1,6 @@
+from rich.table import Table
+from rich.pretty import Pretty
+
 from kmdr.core import CONFIGURER, Configurer
 
 @CONFIGURER.register(
@@ -10,10 +13,26 @@ class OptionLister(Configurer):
         super().__init__(*args, **kwargs)
 
     def operate(self) -> None:
-        if self._configurer.option is None:
-            print("No configurations found.")
+        if self._configurer.option is None and self._configurer.base_url is None:
+            self._console.print("[blue]当前没有任何配置项。[/blue]")
             return
 
-        print("Current configurations:")
-        for key, value in self._configurer.option.items():
-            print(f"\t{key} = {value}")
+        table = Table(title="[green]当前 Kmdr 配置项[/green]", show_header=False, header_style="blue")
+
+        table.add_column("配置类型 (Type)", style="magenta", no_wrap=True, min_width=10)
+        table.add_column("配置项 (Key)", style="cyan", no_wrap=True, min_width=10)
+        table.add_column("值 (Value)", no_wrap=False, min_width=20)
+
+        if self._configurer.option is not None:
+            for idx, (key, value) in enumerate(self._configurer.option.items()):
+                value_to_display = value
+                if isinstance(value, (dict, list, set, tuple)):
+                    value_to_display = Pretty(value)
+
+                table.add_row('下载配置' if idx == 0 else '', key, value_to_display)
+                table.add_section()
+
+        if self._configurer.base_url is not None:
+            table.add_row('应用配置', '镜像地址', self._configurer.base_url or '未设置')
+
+        self._console.print(table)

kmdr/module/configurer/OptionSetter.py

@@ -11,7 +11,7 @@ class OptionSetter(Configurer):
     def operate(self) -> None:
         for option in self._set:
             if '=' not in option:
-                print(f"Invalid option format: `{option}`. Expected format is key=value.")
+                self._console.print(f"[red]无效的选项格式: `{option}`。[/red] 应为 key=value 格式。")
                 continue
 
             key, value = option.split('=', 1)
@@ -23,7 +23,7 @@ class OptionSetter(Configurer):
                 continue
 
             self._configurer.set_option(key, validated_value)
-            print(f"Set configuration: {key} = {validated_value}")
+            self._console.print(f"[green]已设置配置: {key} = {validated_value}[/green]")
 
 
 

kmdr/module/configurer/__init__.py

@@ -0,0 +1,5 @@
+from .BaseUrlUpdator import BaseUrlUpdator
+from .ConfigClearer import ConfigClearer
+from .OptionLister import OptionLister
+from .OptionSetter import OptionSetter
+from .ConfigUnsetter import ConfigUnsetter

kmdr/module/configurer/option_validate.py

@@ -2,6 +2,8 @@ from typing import Optional
 from functools import wraps
 import os
 
+from kmdr.core.defaults import console_print as print
+
 __OPTIONS_VALIDATOR = {}
 
 def validate(key: str, value: str) -> Optional[object]:
@@ -15,7 +17,7 @@ def validate(key: str, value: str) -> Optional[object]:
     if key in __OPTIONS_VALIDATOR:
         return __OPTIONS_VALIDATOR[key](value)
     else:
-        print(f"Unsupported option: {key}. Supported options are: {', '.join(__OPTIONS_VALIDATOR.keys())}")
+        print(f"[red]不支持的配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
         return None
 
 def check_key(key: str, exit_if_invalid: bool = True) -> None:
@@ -27,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"Unknown option: {key}. Supported options are: {', '.join(__OPTIONS_VALIDATOR.keys())}")
+        print(f"[red]未知配置项: {key}。可用配置项：{', '.join(__OPTIONS_VALIDATOR.keys())}[/red]")
         if exit_if_invalid:
             exit(1)
 
@@ -60,27 +62,27 @@ def validate_num_workers(value: str) -> Optional[int]:
     try:
         num_workers = int(value)
         if num_workers <= 0:
-            raise ValueError("Number of workers must be a positive integer.")
+            raise ValueError("必须是正值。")
         return num_workers
     except ValueError as e:
-        print(f"Invalid value for num_workers: {value}. {str(e)}")
+        print(f"[red]无效的 num_workers 值: {value}。{str(e)}[/red]")
         return None
 
 @register_validator('dest')
 def validate_dest(value: str) -> Optional[str]:
     if not value:
-        print("Destination cannot be empty.")
+        print("[red]目标目录不能为空。[/red]")
         return None
     if not os.path.exists(value) or not os.path.isdir(value):
-        print(f"Destination directory does not exist or is not a directory: {value}")
+        print(f"[red]目标目录不存在或不是目录: {value}[/red]")
         return None
 
     if not os.access(value, os.W_OK):
-        print(f"Destination directory is not writable: {value}")
+        print(f"[red]目标目录不可写: {value}[/red]")
         return None
 
     if not os.path.isabs(value):
-        print(f"Destination better be an absolute path: {value}")
+        print(f"[yellow]目标目录最好是绝对路径: {value}[/yellow]")
 
     return value
 
@@ -89,22 +91,22 @@ def validate_retry(value: str) -> Optional[int]:
     try:
         retry = int(value)
         if retry < 0:
-            raise ValueError("Retry count must be a non-negative integer.")
+            raise ValueError("必须是正值。")
         return retry
     except ValueError as e:
-        print(f"Invalid value for retry: {value}. {str(e)}")
+        print(f"[red]无效的 retry 值: {value}。{str(e)}[/red]")
         return None
 
 @register_validator('callback')
 def validate_callback(value: str) -> Optional[str]:
     if not value:
-        print("Callback cannot be empty.")
+        print("[red]回调不能为空。[/red]")
         return None
     return value
 
 @register_validator('proxy')
 def validate_proxy(value: str) -> Optional[str]:
     if not value:
-        print("Proxy cannot be empty.")
+        print("[red]代理不能为空。[/red]")
         return None
     return value

kmdr/module/downloader/DirectDownloader.py

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

kmdr/module/downloader/ReferViaDownloader.py

@@ -1,44 +1,56 @@
+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 .utils import download_file, safe_filename, cached_by_kwargs
+from .download_utils import safe_filename, download_file_multipart
 
-try:
-    import cloudscraper
-except ImportError:
-    cloudscraper = None
 
 @DOWNLOADER.register(order=10)
 class ReferViaDownloader(Downloader):
-    def __init__(self, dest='.', callback=None, retry=3, num_workers=1, proxy=None, *args, **kwargs):
+    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, *args, **kwargs):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
 
-        if cloudscraper:
-            self._scraper = cloudscraper.create_scraper()
-        else:
-            self._scraper = None
 
-    def _download(self, book: BookInfo, volume: VolInfo, retry: int):
+    async def _download(self, book: BookInfo, volume: VolInfo):
         sub_dir = safe_filename(book.name)
         download_path = f'{self._dest}/{sub_dir}'
 
-        download_file(
-            self._session if not self._scraper else self._scraper,
-            lambda: self.fetch_download_url(book_id=book.id, volume_id=volume.id),
+        await download_file_multipart(
+            self._session,
+            self._semaphore,
+            self._progress,
+            partial(self.fetch_download_url, book.id, volume.id),
             download_path,
             safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
-            retry,
+            self._retry,
             headers={
                 "X-Km-From": "kb_http_down"
             },
             callback=lambda: self._callback(book, volume) if self._callback else None
         )
 
-    @cached_by_kwargs
-    def fetch_download_url(self, book_id: str, volume_id: str) -> str:
-        response = self._session.get(f"https://kox.moe/getdownurl.php?b={book_id}&v={volume_id}&mobi=2&vip={self._profile.is_vip}&json=1")
-        response.raise_for_status()
-        data = response.json()
-        if data.get('code') != 200:
-            raise Exception(f"Failed to fetch download URL: {data.get('msg', 'Unknown error')}")
-        
-        return data['url']
+    @alru_cache(maxsize=128)
+    async def fetch_download_url(self, book_id: str, volume_id: str) -> str:
+
+        url = urljoin(
+            self._base_url,
+            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:
+            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')}")
+            
+            return data['url']

kmdr/module/downloader/__init__.py

@@ -0,0 +1,2 @@
+from .DirectDownloader import DirectDownloader
+from .ReferViaDownloader import ReferViaDownloader