kmoe-manga-downloader 1.1.0__tar.gz → 1.1.2__tar.gz

{kmoe_manga_downloader-1.1.0/src/kmoe_manga_downloader.egg-info → kmoe_manga_downloader-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kmoe-manga-downloader
-Version: 1.1.0
+Version: 1.1.2
 Summary: A CLI-downloader for site @kox.moe.
 Author-email: Chris Zheng <chrisis58@outlook.com>
 License: MIT License
@@ -47,6 +47,10 @@ Dynamic: license-file
 
 `kmdr (Kmoe Manga Downloader)` 是一个 Python 应用，用于从 [Kmoe](https://kox.moe/) 网站下载漫画。它支持在终端环境下的登录、下载指定书籍及其卷，并支持回调脚本执行。
 
+<p align="center">
+  <img src="assets/kmdr-demo.gif" alt="kmdr 使用演示" width="720">
+</p>
+
 ## ✨功能特性
 
 - **凭证管理**: 命令行登录并持久化会话

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/README.md

@@ -4,6 +4,10 @@
 
 `kmdr (Kmoe Manga Downloader)` 是一个 Python 应用，用于从 [Kmoe](https://kox.moe/) 网站下载漫画。它支持在终端环境下的登录、下载指定书籍及其卷，并支持回调脚本执行。
 
+<p align="center">
+  <img src="assets/kmdr-demo.gif" alt="kmdr 使用演示" width="720">
+</p>
+
 ## ✨功能特性
 
 - **凭证管理**: 命令行登录并持久化会话

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kmoe-manga-downloader"
-version = "1.1.0"
+version = "1.1.2"
 authors = [
     { name="Chris Zheng", email="chrisis58@outlook.com" },
 ]

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/src/kmdr/core/bases.py

@@ -107,16 +107,26 @@ class Downloader(SessionContext, UserProfileContext):
     def _download(self, book: BookInfo, volume: VolInfo, retry: int): ...
 
     def _download_with_multiple_workers(self, book: BookInfo, volumes: list[VolInfo], retry: int):
-        from concurrent.futures import ThreadPoolExecutor
-
-        max_workers = min(self._num_workers, len(volumes))
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futures = [
-                executor.submit(self._download, book, volume, retry)
-                for volume in volumes
-            ]
+        from concurrent.futures import ThreadPoolExecutor, wait, FIRST_EXCEPTION
+
+        try:
+            max_workers = min(self._num_workers, len(volumes))
+            with ThreadPoolExecutor(max_workers=max_workers) as executor:
+                futures = [
+                    executor.submit(self._download, book, volume, retry)
+                    for volume in volumes
+                ]
+            wait(futures, return_when=FIRST_EXCEPTION)
             for future in futures:
                 future.result()
+        except KeyboardInterrupt:
+            print("\n操作已取消（KeyboardInterrupt）")
+            try:
+                executor.shutdown(wait=False, cancel_futures=True)
+            except NameError:
+                pass
+            finally:
+                exit(130)
 
 AUTHENTICATOR = Registry[Authenticator]('Authenticator')
 LISTERS = Registry[Lister]('Lister')

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/src/kmdr/main.py

@@ -28,9 +28,13 @@ def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPL
         fallback()
 
 def entry_point():
-    parser = argument_parser()
-    args = parser.parse_args()
-    main(args, lambda: parser.print_help())
+    try:
+        parser = argument_parser()
+        args = parser.parse_args()
+        main(args, lambda: parser.print_help())
+    except KeyboardInterrupt:
+        print("\n操作已取消（KeyboardInterrupt）")
+        exit(130)
 
 if __name__ == '__main__':
     entry_point()

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/src/kmdr/module/downloader/DirectDownloader.py

@@ -17,9 +17,9 @@ class DirectDownloader(Downloader):
 
         download_file(
             self._session,
-            self.construct_download_url(book, volume),
+            lambda: self.construct_download_url(book, volume),
             download_path,
-            f'[Kmoe][{book.name}][{volume.name}].epub',
+            safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
             retry,
             callback=lambda: self._callback(book, volume) if self._callback else None
         )

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/src/kmdr/module/downloader/ReferViaDownloader.py

@@ -23,9 +23,9 @@ class ReferViaDownloader(Downloader):
 
         download_file(
             self._session if not self._scraper else self._scraper,
-            self.fetch_download_url(book_id=book.id, volume_id=volume.id),
+            lambda: self.fetch_download_url(book_id=book.id, volume_id=volume.id),
             download_path,
-            f'[Kmoe][{book.name}][{volume.name}].epub',
+            safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
             retry,
             headers={
                 "X-Km-From": "kb_http_down"

kmoe_manga_downloader-1.1.2/src/kmdr/module/downloader/utils.py

@@ -0,0 +1,157 @@
+from typing import Callable, Optional, Union
+import os
+import time
+import threading
+from functools import wraps
+
+from requests import Session, HTTPError
+from requests.exceptions import ChunkedEncodingError
+from tqdm import tqdm
+import re
+
+BLOCK_SIZE_REDUCTION_FACTOR = 0.75
+MIN_BLOCK_SIZE = 2048
+
+def download_file(
+        session: Session,
+        url: Union[str, Callable[[], str]],
+        dest_path: str,
+        filename: str,
+        retry_times: int = 3,
+        headers: Optional[dict] = None,
+        callback: Optional[Callable] = None,
+):
+    """
+    下载文件
+
+    :param session: requests.Session 对象
+    :param url: 下载链接或者其 Supplier
+    :param dest_path: 目标路径
+    :param filename: 文件名
+    :param retry_times: 重试次数
+    :param headers: 请求头
+    :param callback: 下载完成后的回调函数
+    """
+    if headers is None:
+        headers = {}
+    filename_downloading = f'{filename}.downloading'
+    file_path = os.path.join(dest_path, filename)
+    tmp_file_path = os.path.join(dest_path, filename_downloading)
+
+    if not os.path.exists(dest_path):
+        os.makedirs(dest_path, exist_ok=True)
+
+    if os.path.exists(file_path):
+        tqdm.write(f"{filename} 已经存在")
+        return
+
+    block_size = 8192
+    
+    attempts_left = retry_times + 1
+    progress_bar = tqdm(
+        total=0, unit='B', unit_scale=True,
+        desc=f'{filename} (连接中...)',
+        leave=False,
+        dynamic_ncols=True
+    )
+
+    try:
+        while attempts_left > 0:
+            attempts_left -= 1
+            
+            resume_from = os.path.getsize(tmp_file_path) if os.path.exists(tmp_file_path) else 0
+            
+            if resume_from:
+                headers['Range'] = f'bytes={resume_from}-'
+
+            try:
+                current_url = url() if callable(url) else url
+                with session.get(url=current_url, stream=True, headers=headers) as r:
+                    r.raise_for_status()
+
+                    total_size_in_bytes = int(r.headers.get('content-length', 0)) + resume_from
+
+                    progress_bar.set_description(f'{filename}')
+                    progress_bar.total = total_size_in_bytes
+                    progress_bar.n = resume_from
+                    progress_bar.refresh()
+
+                    with open(tmp_file_path, 'ab') as f:
+                        for chunk in r.iter_content(chunk_size=block_size):
+                            if chunk:
+                                f.write(chunk)
+                                progress_bar.update(len(chunk))
+
+                    if os.path.getsize(tmp_file_path) >= total_size_in_bytes:
+                        os.rename(tmp_file_path, file_path)
+                        if callback:
+                            callback()
+                        return
+
+            except Exception as e:
+                if attempts_left > 0:
+                    progress_bar.set_description(f'{filename} (重试中...)')
+                    if isinstance(e, ChunkedEncodingError):
+                        new_block_size = max(int(block_size * BLOCK_SIZE_REDUCTION_FACTOR), MIN_BLOCK_SIZE)
+                        if new_block_size < block_size:
+                            block_size = new_block_size
+
+                    # 避免限流
+                    time.sleep(3)
+                else:
+                    raise e
+    finally:
+        if progress_bar.total and progress_bar.n >= progress_bar.total:
+            tqdm.write(f"{filename} 下载完成")
+        elif progress_bar.total is not None:
+            tqdm.write(f"{filename} 下载失败")
+        progress_bar.close()
+
+
+def safe_filename(name: str) -> str:
+    """
+    替换非法文件名字符为下划线
+    """
+    return re.sub(r'[\\/:*?"<>|]', '_', name)
+
+
+function_cache = {}
+
+def cached_by_kwargs(func):
+    """
+    根据关键字参数缓存函数结果的装饰器。
+
+    Example:
+    >>> @kwargs_cached
+    >>> def add(a, b, c):
+    >>>     return a + b + c
+    >>> result1 = add(1, 2, c=3)  # Calls the function
+    >>> result2 = add(3, 2, c=3)  # Uses cached result
+    >>> assert result1 == result2  # Both results are the same
+    """
+
+    global function_cache
+    if func not in function_cache:
+        function_cache[func] = {}
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        if not kwargs:
+            return func(*args, **kwargs)
+
+        key = frozenset(kwargs.items())
+
+        if key not in function_cache[func]:
+            function_cache[func][key] = func(*args, **kwargs)
+        return function_cache[func][key]
+
+    return wrapper
+
+def clear_cache(func):
+    assert hasattr(func, "__wrapped__"), "Function is not wrapped"
+    global function_cache
+
+    wrapped = func.__wrapped__
+
+    if wrapped in function_cache:
+        function_cache[wrapped] = {}

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2/src/kmoe_manga_downloader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kmoe-manga-downloader
-Version: 1.1.0
+Version: 1.1.2
 Summary: A CLI-downloader for site @kox.moe.
 Author-email: Chris Zheng <chrisis58@outlook.com>
 License: MIT License
@@ -47,6 +47,10 @@ Dynamic: license-file
 
 `kmdr (Kmoe Manga Downloader)` 是一个 Python 应用，用于从 [Kmoe](https://kox.moe/) 网站下载漫画。它支持在终端环境下的登录、下载指定书籍及其卷，并支持回调脚本执行。
 
+<p align="center">
+  <img src="assets/kmdr-demo.gif" alt="kmdr 使用演示" width="720">
+</p>
+
 ## ✨功能特性
 
 - **凭证管理**: 命令行登录并持久化会话

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.2}/src/kmoe_manga_downloader.egg-info/SOURCES.txt

@@ -37,5 +37,4 @@ src/kmoe_manga_downloader.egg-info/top_level.txt
 tests/test_cache_by_kwargs.py
 tests/test_kmdr_config_option.py
 tests/test_kmdr_download.py
-tests/test_kmdr_login.py
 tests/test_utils_resolve_volme.py

kmoe_manga_downloader-1.1.0/src/kmdr/module/downloader/utils.py

@@ -1,127 +0,0 @@
-from typing import Callable, Optional
-import os
-import time
-from functools import wraps
-
-from requests import Session, HTTPError
-from requests.exceptions import ChunkedEncodingError
-from tqdm import tqdm
-import re
-
-BLOCK_SIZE_REDUCTION_FACTOR = 0.75
-MIN_BLOCK_SIZE = 2048
-
-def download_file(
-            session: Session, 
-            url: str,
-            dest_path: str, 
-            filename: str, 
-            retry_times: int = 0, 
-            headers: Optional[dict] = None, 
-            callback: Optional[Callable] = None,
-            block_size: int = 8192
-    ):
-    if headers is None:
-        headers = {}
-    filename_downloading = f'{filename}.downloading'
-        
-    file_path = f'{dest_path}/{filename}'
-    tmp_file_path = f'{dest_path}/{filename_downloading}'
-    
-    if not os.path.exists(dest_path):
-        os.makedirs(dest_path, exist_ok=True)
-        
-    if os.path.exists(file_path):
-        tqdm.write(f"{filename} already exists.")
-        return
-
-    resume_from = 0
-    total_size_in_bytes = 0
-    
-    if os.path.exists(tmp_file_path):
-        resume_from = os.path.getsize(tmp_file_path)
-    
-    if resume_from:
-        headers['Range'] = f'bytes={resume_from}-'
-
-    try:
-        with session.get(url = url, stream=True, headers=headers) as r:
-            r.raise_for_status()
-            
-            total_size_in_bytes = int(r.headers.get('content-length', 0)) + resume_from
-            
-            with open(tmp_file_path, 'ab') as f:
-                with tqdm(total=total_size_in_bytes, unit='B', unit_scale=True, desc=f'{filename}', initial=resume_from) as progress_bar:
-                    for chunk in r.iter_content(chunk_size=block_size):
-                        if chunk:
-                            f.write(chunk)
-                            progress_bar.update(len(chunk))
-            
-            if (os.path.getsize(tmp_file_path) == total_size_in_bytes):
-                os.rename(tmp_file_path, file_path)
-                
-                if callback:
-                    callback()
-    except Exception as e:
-        prefix = f"{type(e).__name__} occurred while downloading {filename}. "
-
-        new_block_size = block_size
-        if isinstance(e, ChunkedEncodingError):
-            new_block_size = max(int(block_size * BLOCK_SIZE_REDUCTION_FACTOR), MIN_BLOCK_SIZE)
-
-        if retry_times > 0:
-            # 重试下载
-            tqdm.write(f"{prefix} Retry after 3 seconds...")
-            time.sleep(3) # 等待3秒后重试，避免触发限流
-            download_file(session, url, dest_path, filename, retry_times - 1, headers, callback, new_block_size)
-        else:
-            tqdm.write(f"{prefix} Meet max retry times, download failed.")
-            raise e
-
-def safe_filename(name: str) -> str:
-    """
-    替换非法文件名字符为下划线
-    """
-    return re.sub(r'[\\/:*?"<>|]', '_', name)
-
-
-function_cache = {}
-
-def cached_by_kwargs(func):
-    """
-    根据关键字参数缓存函数结果的装饰器。
-
-    Example:
-    >>> @kwargs_cached
-    >>> def add(a, b, c):
-    >>>     return a + b + c
-    >>> result1 = add(1, 2, c=3)  # Calls the function
-    >>> result2 = add(3, 2, c=3)  # Uses cached result
-    >>> assert result1 == result2  # Both results are the same
-    """
-
-    global function_cache
-    if func not in function_cache:
-        function_cache[func] = {}
-
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        if not kwargs:
-            return func(*args, **kwargs)
-
-        key = frozenset(kwargs.items())
-
-        if key not in function_cache[func]:
-            function_cache[func][key] = func(*args, **kwargs)
-        return function_cache[func][key]
-
-    return wrapper
-
-def clear_cache(func):
-    assert hasattr(func, "__wrapped__"), "Function is not wrapped"
-    global function_cache
-
-    wrapped = func.__wrapped__
-
-    if wrapped in function_cache:
-        function_cache[wrapped] = {}

kmoe_manga_downloader-1.1.0/tests/test_kmdr_login.py

@@ -1,29 +0,0 @@
-import os
-
-import unittest
-from argparse import Namespace
-
-from kmdr.core.utils import clear_session_context
-from kmdr.main import main as kmdr_main
-
-KMOE_USERNAME = os.environ.get('KMOE_USERNAME')
-KMOE_PASSWORD = os.environ.get('KMOE_PASSWORD')
-
-@unittest.skipUnless(KMOE_USERNAME and KMOE_PASSWORD, "KMOE_USERNAME and KMOE_PASSWORD must be set in environment variables")
-class TestKmdrLogin(unittest.TestCase):
-
-    @classmethod
-    def tearDownClass(cls):
-        clear_session_context()
-
-    def test_login_with_username_and_password(self):
-        assert KMOE_USERNAME and KMOE_PASSWORD, "KMOE_USERNAME and KMOE_PASSWORD must be set in environment variables"
-
-        kmdr_main(
-            Namespace(
-                command='login',
-                username=KMOE_USERNAME,
-                password=KMOE_PASSWORD,
-                show_quota=False
-            )
-        )