kmoe-manga-downloader 1.2.7__py3-none-any.whl → 1.2.8a1__py3-none-any.whl

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 = None

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)

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()
+    }

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,

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,

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.dist-info → kmoe_manga_downloader-1.2.8a1.dist-info}/METADATA

@@ -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.dist-info → kmoe_manga_downloader-1.2.8a1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 kmdr/__init__.py,sha256=iLmy2rOkHS_4KZWMD8BgT7R3tLMKeaTCDVf3B4FyYxM,91
-kmdr/_version.py,sha256=R7K92G6qT3thh3TqV7dEawNJTwh11SHGYMpvuwpJv0Y,704
+kmdr/_version.py,sha256=JyF-msezavGoYODPGaV_ID0jze_-I8yYyI16y_3GMJ0,712
 kmdr/main.py,sha256=B9CK53GlWO91-135AJDFOfqglSmYJe5-nZrha4A0LLs,2166
 kmdr/core/__init__.py,sha256=aR3mhP1A81oTmTnBOonVQm_mFvFeNCOo7kalZVfszAc,416
 kmdr/core/bases.py,sha256=47M6VyrIMnmTEvwZtt8WsPAjGz5vagkRyTpci16aH2k,3973
 kmdr/core/console.py,sha256=gD_PKjuAjePUJx-49ef9IBunetCiKt1LMI0EIU5kcZw,2016
 kmdr/core/constants.py,sha256=JFj8FHO9ab6AeIzHz3LaC8l3ziLLFi75vil8wMPfZoA,1869
 kmdr/core/context.py,sha256=ZhUfuCmZN0s1AQnxxkMFqYkCpjkRvJd53RUZWMhH8Gw,1390
-kmdr/core/defaults.py,sha256=o9Py-Y51xNMFxyZ_okpvUjh4Z92QX7y8RaWKJ98Q-JY,9100
+kmdr/core/defaults.py,sha256=1Hh--iLw8nb8GJSpi9jcSfdOqVuj3S7eU6aymMDWZ68,9205
 kmdr/core/error.py,sha256=gH4tcFpLRJXKQCwEnvfVM0lkhlakCwS-IYtNEkpO9a4,1984
 kmdr/core/protocol.py,sha256=_4Ba6BU4oEFK2O61UH_-X2-bmZtUd61O20WGarvXVOM,399
 kmdr/core/registry.py,sha256=m5jKma2SLbYN6hG2WqkxoyOYUENE4a-e0CzRALkGD7k,5654
 kmdr/core/session.py,sha256=f6tUKXuFnJ0ok-sh8JwMtgjQI_qBdfqqzhb3-pe2RnU,5795
 kmdr/core/structure.py,sha256=EQG1-8kHQ22Not2S7Q_jGxE0nb9XUbLh3JcNTb_nkvk,1199
-kmdr/core/utils.py,sha256=e1AS4MGz22mr16zRnAaeEZGSivjCtw4066LQ7C5YX_g,4887
+kmdr/core/utils.py,sha256=JsUH5Mpq40DeN4J5mSzZdA7_d3gPGmTAjvEp2KKFPwk,5337
 kmdr/module/__init__.py,sha256=hY6lMBpxSn93t7OKnEbXUwTok2XqQoQbuyq1HLeC4Kc,125
 kmdr/module/authenticator/CookieAuthenticator.py,sha256=lv_monQ7QUMfgPPgxoV1xr_KyUtwCKZhqJ8umv3W6xo,1108
 kmdr/module/authenticator/LoginAuthenticator.py,sha256=5nyrzxYEGiRQ9ulnhjpuUWYeog-ALZlCCSAYkbwlKMw,1890
@@ -25,10 +25,10 @@ kmdr/module/configurer/OptionLister.py,sha256=bGlrxouPiBGpGv8UiGPcT3KL6SWMJckQKd
 kmdr/module/configurer/OptionSetter.py,sha256=BQXIgyLoMDSNua2x96FtX-9JmJhVpPJ5o0tWHj_-7B0,898
 kmdr/module/configurer/__init__.py,sha256=nSWGwUCcwOkvg28zxRd0S3b4jeag_W0IhzP74xq0ewE,204
 kmdr/module/configurer/option_validate.py,sha256=9QzVO9wwGwhXMPXx2zLJSIsyVle7-GTgxCoPn7Tp6kw,3535
-kmdr/module/downloader/DirectDownloader.py,sha256=mMdxAudYEdzCjNtLEDIr6eoxZJJ61zEQey_PcOABxX0,1383
-kmdr/module/downloader/ReferViaDownloader.py,sha256=IFra1gVOfTl8hVK2KyINP53u0r6NFycYupoLx5TeMdY,2531
+kmdr/module/downloader/DirectDownloader.py,sha256=ewSOV1BQ80LOq0mA6Lpr9gaYYYl33REQK4CgYlfD83c,1980
+kmdr/module/downloader/ReferViaDownloader.py,sha256=j61KQ6Gb6Unz3Ww6m-8s1zwNLUcgrU6o-8YfODdLr88,3130
 kmdr/module/downloader/__init__.py,sha256=PajPBQ4ZJwz_6Ok6k-HV7-YSibxAW5m5voYyP-U-_f4,97
-kmdr/module/downloader/download_utils.py,sha256=K0zhOWy4iQH1qyrKr2bgGre8sgBiLHXb6O3Fxq0w--0,18515
+kmdr/module/downloader/download_utils.py,sha256=bFlrH4AUIyTJnGvIBk2geGrP5FzplHQdo1K2dxpIjRs,18872
 kmdr/module/downloader/misc.py,sha256=P8hqtYIiD1AR6wzfJ0JBghpSJ_zx2_vTg8jDHcEU8hM,2328
 kmdr/module/lister/BookUrlLister.py,sha256=R1sak_GQG8HKfdSzHF-Dy1iby6TgFlxKJLf2dwBr0Bw,550
 kmdr/module/lister/FollowedBookLister.py,sha256=d2IxWAf1VSL1Kv8SQkzbxDUunFb7UkxkreUbWQvs6tc,2906
@@ -38,9 +38,9 @@ kmdr/module/picker/ArgsFilterPicker.py,sha256=wBCDa6KsSSOLLQk8D4ftZ9ZnwPLiHIirxf
 kmdr/module/picker/DefaultVolPicker.py,sha256=qScmRtwpe1u3fY7HMIo15YXtwB4LYAIJaTu_EkrAJbs,1780
 kmdr/module/picker/__init__.py,sha256=qYELEkv0nFT8DadItB6fdUTED2CHrC43wuPKO7QrCCQ,93
 kmdr/module/picker/utils.py,sha256=baJzpQSSSBdTPZ2scrEeNOssGYOL0nNwxN1gTsOAqnc,1604
-kmoe_manga_downloader-1.2.7.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
-kmoe_manga_downloader-1.2.7.dist-info/METADATA,sha256=NtWHjh6DmIz3mwCXRFz_e1Foekl9vIf7qIz8BKVFhnI,10114
-kmoe_manga_downloader-1.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kmoe_manga_downloader-1.2.7.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
-kmoe_manga_downloader-1.2.7.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
-kmoe_manga_downloader-1.2.7.dist-info/RECORD,,
+kmoe_manga_downloader-1.2.8a1.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
+kmoe_manga_downloader-1.2.8a1.dist-info/METADATA,sha256=Lj7KQHbci4AWXASNBCL-VLh9BE9OLbOUpub7JU_6BG0,10116
+kmoe_manga_downloader-1.2.8a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kmoe_manga_downloader-1.2.8a1.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
+kmoe_manga_downloader-1.2.8a1.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
+kmoe_manga_downloader-1.2.8a1.dist-info/RECORD,,