kmoe-manga-downloader 1.1.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

kmdr/module/authenticator/utils.py

@@ -1,8 +1,10 @@
 from typing import Optional, Callable
 
-from requests import Session
+from aiohttp import ClientSession
+from rich.console import Console
 
 from kmdr.core.error import LoginError
+from kmdr.core.utils import async_retry
 
 PROFILE_URL = 'https://kox.moe/my.php'
 LOGIN_URL = 'https://kox.moe/login.php'
@@ -13,52 +15,54 @@ 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,
         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 = PROFILE_URL) 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) == LOGIN_URL:
+            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 = {}

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(
@@ -11,9 +14,20 @@ class OptionLister(Configurer):
 
     def operate(self) -> None:
         if self._configurer.option is None:
-            print("No configurations found.")
+            self._console.print("[blue]当前没有任何配置项。[/blue]")
             return
 
-        print("Current configurations:")
+        table = Table(title="[green]当前 Kmdr 配置项[/green]", show_header=False, header_style="blue")
+
+        table.add_column("配置项 (Key)", style="cyan", no_wrap=True, min_width=10)
+        table.add_column("值 (Value)", style="white", no_wrap=False, min_width=20)
+
         for key, value in self._configurer.option.items():
-            print(f"\t{key} = {value}")
+            value_to_display = value
+            if isinstance(value, (dict, list, set, tuple)):
+                value_to_display = Pretty(value)
+            
+            table.add_row(key, value_to_display)
+            table.add_section()
+        
+        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/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,6 @@
 from kmdr.core import Downloader, BookInfo, VolInfo, DOWNLOADER
 
-from .utils import download_file, safe_filename
+from .utils import download_file, safe_filename, download_file_multipart
 
 @DOWNLOADER.register(
     hasvalues={
@@ -8,19 +8,21 @@ 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
         )
 

kmdr/module/downloader/ReferViaDownloader.py

@@ -1,44 +1,47 @@
+from functools import partial
+
+import json
+from async_lru import alru_cache
+
 from kmdr.core import Downloader, VolInfo, DOWNLOADER, BookInfo
 
-from .utils import download_file, safe_filename, cached_by_kwargs
+from .utils import download_file, 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 = f"https://kox.moe/getdownurl.php?b={book_id}&v={volume_id}&mobi=2&vip={self._profile.is_vip}&json=1"
+
+        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']