kmoe-manga-downloader 1.2.7__tar.gz → 1.2.8a1__tar.gz

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/PKG-INFO

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

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.2.7'
-__version_tuple__ = version_tuple = (1, 2, 7)
+__version__ = version = '1.2.8a1'
+__version_tuple__ = version_tuple = (1, 2, 8, 'a1')
 
-__commit_id__ = commit_id = 'g097a6376f'
+__commit_id__ = commit_id = 'gb00d38e86'

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/core/defaults.py

@@ -71,6 +71,7 @@ def argument_parser():
     download_parser.add_argument('-c', '--callback', type=str, help='每个卷下载完成后执行的回调脚本，例如: `echo {v.name} downloaded!`', required=False)
     download_parser.add_argument('-m', '--method', type=int, help='下载方法，对应网站上的不同下载方式', required=False, choices=[1, 2], default=1)
     download_parser.add_argument('--vip', action='store_true', help='尝试使用 VIP 链接进行下载（下载速度可能不及 CDN 方式）')
+    download_parser.add_argument('--disable-multi-part', action='store_true', help='禁用分片下载')
 
     login_parser = subparsers.add_parser('login', help='登录到 Kmoe')
     login_parser.add_argument('-u', '--username', type=str, help='用户名', required=True)

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/core/utils.py

@@ -1,5 +1,5 @@
 import functools
-from typing import Optional, Callable, TypeVar, Hashable, Generic
+from typing import Optional, Callable, TypeVar, Hashable, Generic, Mapping, Any
 import asyncio
 from asyncio.proactor_events import _ProactorBasePipeTransport
 
@@ -146,4 +146,18 @@ def _silence_event_loop_closed(func):
  
     return wrapper
 
-_ProactorBasePipeTransport.__del__ = _silence_event_loop_closed(_ProactorBasePipeTransport.__del__)
+_ProactorBasePipeTransport.__del__ = _silence_event_loop_closed(_ProactorBasePipeTransport.__del__)
+
+
+
+SENSITIVE_KEYS = {'cookie', 'authorization', 'proxy-authorization', 'set-cookie'}
+"""定义需要脱敏的字段（全部小写以便不区分大小写匹配）"""
+
+def sanitize_headers(headers: Mapping[str, Any]) -> dict:
+    """
+    清洗 HTTP 头信息，隐藏敏感字段（如 Cookie, Authorization）。
+    """
+    return {
+        k: '******' if k.lower() in SENSITIVE_KEYS else v
+        for k, v in headers.items()
+    }

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/module/downloader/DirectDownloader.py

@@ -3,7 +3,7 @@ from functools import partial
 from kmdr.core import Downloader, BookInfo, VolInfo, DOWNLOADER
 from kmdr.core.constants import API_ROUTE
 
-from .download_utils import download_file_multipart, readable_safe_filename
+from .download_utils import download_file_multipart, readable_safe_filename, download_file
 
 @DOWNLOADER.register(
     hasvalues={
@@ -11,14 +11,28 @@ from .download_utils import download_file_multipart, readable_safe_filename
     }
 )
 class DirectDownloader(Downloader):
-    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, *args, **kwargs):
+    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, disable_multi_part=False, *args, **kwargs):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
         self._use_vip = vip
+        self._disable_multi_part = disable_multi_part
 
     async def _download(self, book: BookInfo, volume: VolInfo):
         sub_dir = readable_safe_filename(book.name)
         download_path = f'{self._dest}/{sub_dir}'
 
+        if self._disable_multi_part:
+            await download_file(
+                self._session,
+                self._semaphore,
+                self._progress,
+                partial(self.construct_download_url, book, volume),
+                download_path,
+                readable_safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
+                self._retry,
+                callback=lambda: self._callback(book, volume) if self._callback else None
+            )
+            return
+
         await download_file_multipart(
             self._session,
             self._semaphore,

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/module/downloader/ReferViaDownloader.py

@@ -10,19 +10,33 @@ from kmdr.core.error import ResponseError
 from kmdr.core.utils import async_retry
 from kmdr.core.console import debug
 
-from .download_utils import download_file_multipart, readable_safe_filename
+from .download_utils import download_file, download_file_multipart, readable_safe_filename
 
 
 @DOWNLOADER.register(order=10)
 class ReferViaDownloader(Downloader):
-    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, *args, **kwargs):
+    def __init__(self, dest='.', callback=None, retry=3, num_workers=8, proxy=None, vip=False, disable_multi_part=False, *args, **kwargs):
         super().__init__(dest, callback, retry, num_workers, proxy, *args, **kwargs)
         self._use_vip = vip
+        self._disable_multi_part = disable_multi_part
 
     async def _download(self, book: BookInfo, volume: VolInfo):
         sub_dir = readable_safe_filename(book.name)
         download_path = f'{self._dest}/{sub_dir}'
 
+        if self._disable_multi_part:
+            await download_file(
+                self._session,
+                self._semaphore,
+                self._progress,
+                partial(self.fetch_download_url, book.id, volume.id),
+                download_path,
+                readable_safe_filename(f'[Kmoe][{book.name}][{volume.name}].epub'),
+                self._retry,
+                callback=lambda: self._callback(book, volume) if self._callback else None
+            )
+            return
+
         await download_file_multipart(
             self._session,
             self._semaphore,

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmdr/module/downloader/download_utils.py

@@ -15,7 +15,7 @@ from aiohttp.client_exceptions import ClientPayloadError
 
 from kmdr.core.console import info, log, debug
 from kmdr.core.error import ResponseError
-from kmdr.core.utils import async_retry
+from kmdr.core.utils import async_retry, sanitize_headers
 
 from .misc import STATUS, StateManager
 
@@ -319,6 +319,9 @@ async def _download_part(
                 debug("开始下载分片:", os.path.basename(part_path), "范围:", current_start, "-", end)
                 async with session.get(url, headers=local_headers) as response:
                     response.raise_for_status()
+                    debug("分片", os.path.basename(part_path), "状态码:", response.status)
+                    debug("分片", os.path.basename(part_path), "请求头:", sanitize_headers(response.request_info.headers))
+                    debug("分片", os.path.basename(part_path), "响应头:", sanitize_headers(response.headers))
 
                     await state_manager.request_status_update(part_id=start, status=STATUS.DOWNLOADING)
 

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/src/kmoe_manga_downloader.egg-info/PKG-INFO

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

{kmoe_manga_downloader-1.2.7 → kmoe_manga_downloader-1.2.8a1}/tests/test_kmdr_download.py

@@ -3,6 +3,7 @@ import os
 import time
 import unittest
 from argparse import Namespace
+import warnings
 
 from kmdr.main import main_sync as kmdr_main
 from kmdr.core.constants import BASE_URL
@@ -249,6 +250,55 @@ class TestKmdrDownload(unittest.TestCase):
             )
         )
 
+        assert len(sub_dir := os.listdir(dest)) == 1, "Expected one subdirectory in the destination"
+        assert os.path.isdir(os.path.join(dest, book_dir := sub_dir[0])), "Expected the subdirectory to be a directory"
+        assert len(os.listdir(os.path.join(dest, book_dir))) == 1, "Expected 1 volume to be downloaded"
+    
+    def test_download_volume_with_refer_via_downloader_disable_multi_part(self):
+        dest = f'{BASE_DIR}/{self.test_download_volume_with_refer_via_downloader_disable_multi_part.__name__}'
+
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning, message="本函数可能不会积极维护")
+            kmdr_main(
+                Namespace(
+                    command='download',
+                    dest=dest,
+                    book_url=f'{DEFAULT_BASE_URL}/c/51043.htm',
+                    vol_type='extra',
+                    volume='all',
+                    max_size=0.4,
+                    limit=1,
+                    retry=3,
+                    num_workers=1,
+                    disable_multi_part=True
+                )
+            )
+
+        assert len(sub_dir := os.listdir(dest)) == 1, "Expected one subdirectory in the destination"
+        assert os.path.isdir(os.path.join(dest, book_dir := sub_dir[0])), "Expected the subdirectory to be a directory"
+        assert len(os.listdir(os.path.join(dest, book_dir))) == 1, "Expected 1 volume to be downloaded"
+
+    def test_download_volume_with_direct_downloader_disable_multi_part(self):
+        dest = f'{BASE_DIR}/{self.test_download_volume_with_direct_downloader_disable_multi_part.__name__}'
+
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning, message="本函数可能不会积极维护")
+            kmdr_main(
+                Namespace(
+                    command='download',
+                    dest=dest,
+                    book_url=f'{DEFAULT_BASE_URL}/c/51043.htm',
+                    vol_type='extra',
+                    volume='all',
+                    max_size=0.4,
+                    method=2, # use direct download method
+                    limit=1,
+                    retry=3,
+                    num_workers=1,
+                    disable_multi_part=True
+                )
+            )
+
         assert len(sub_dir := os.listdir(dest)) == 1, "Expected one subdirectory in the destination"
         assert os.path.isdir(os.path.join(dest, book_dir := sub_dir[0])), "Expected the subdirectory to be a directory"
         assert len(os.listdir(os.path.join(dest, book_dir))) == 1, "Expected 1 volume to be downloaded"