kmoe-manga-downloader 1.2.3b0__py3-none-any.whl → 1.2.4b0__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.3b0'
-__version_tuple__ = version_tuple = (1, 2, 3, 'b0')
+__version__ = version = '1.2.4b0'
+__version_tuple__ = version_tuple = (1, 2, 4, 'b0')
 
 __commit_id__ = commit_id = None

kmdr/core/session.py

@@ -53,6 +53,7 @@ class KmdrSessionManager(SessionManager):
             # 持久化配置
             self._configurer.set_base_url(self._base_url)
             debug("使用的基础 URL:", self._base_url)
+            debug("使用的代理:", self._proxy)
 
             self._session = ClientSession(
                 base_url=self._base_url,

kmdr/main.py

@@ -10,7 +10,7 @@ from kmdr.module import *
 async def main(args: Namespace, fallback: Callable[[], None] = lambda: print('NOT IMPLEMENTED!')) -> None:
 
     post_init(args)
-    log('[Lifecycle:Start] 启动 kmdr 版本:', __version__)
+    log('[Lifecycle:Start] 启动 kmdr, 版本', __version__)
     debug('[bold green]以调试模式启动[/bold green]')
     debug('接收到的参数:', args)
 

kmdr/module/authenticator/utils.py

@@ -77,7 +77,10 @@ def extract_var_define(script_text) -> dict[str, str]:
         line = line.strip()
         if line.startswith("var ") and "=" in line:
             var_name, var_value = line[4:].split("=", 1)
-            var_define[var_name.strip()] = var_value.strip().strip(";").strip('"')
+            var_value = var_value.strip().strip(";").strip('"')
+            if var_name and var_value:
+                var_define[var_name.strip()] = var_value
+    debug("解析到变量定义: ", var_define)
     return var_define
 
 def __resolve_quota_id(is_vip: Optional[int] = None, user_level: Optional[int] = None):

kmdr/module/configurer/OptionLister.py

@@ -26,7 +26,7 @@ class OptionLister(Configurer):
 
         if self._configurer.option is not None:
             for idx, (key, value) in enumerate(self._configurer.option.items()):
-                value_to_display = value
+                value_to_display = str(value)
                 if isinstance(value, (dict, list, set, tuple)):
                     value_to_display = Pretty(value)
 

kmdr/module/downloader/download_utils.py

@@ -13,6 +13,7 @@ from rich.progress import Progress
 from aiohttp.client_exceptions import ClientPayloadError
 
 from kmdr.core.console import info, log, debug
+from kmdr.core.error import ResponseError
 
 from .misc import STATUS, StateManager
 
@@ -161,8 +162,7 @@ async def download_file_multipart(
         info(f"[blue]{filename} 已经存在[/blue]")
         return
 
-    log(f"开始下载文件: {filename} 到路径: {dest_path}")
-
+    log("开始下载文件:", filename)
     part_paths = []
     part_expected_sizes = []
     task_id = None
@@ -171,12 +171,17 @@ async def download_file_multipart(
     try:
         current_url = await fetch_url(url)
 
-        async with session.head(current_url, headers=headers, allow_redirects=True) as response:
-            # 注意：这个请求完成后，服务器就会记录这次下载，并消耗对应的流量配额，详细的规则请参考网站说明：
-            #   注 1 : 訂閱連載中的漫畫，有更新時自動推送的卷(冊)，暫不計算在使用額度中，不扣減使用額度。
-            #   注 2 : 對同一卷(冊)書在 12 小時內重複*下載*，不會重複扣減額度。但重復推送是會扣減的。
-            response.raise_for_status()
-            total_size = int(response.headers['Content-Length'])
+        async with semaphore:
+            # 获取文件信息，请求以获取文件大小
+            # 复用 semaphore 以控制并发，避免过多并发请求触发服务器限流
+            async with session.head(current_url, headers=headers, allow_redirects=True) as response:
+                # 注意：这个请求完成后，服务器就会记录这次下载，并消耗对应的流量配额，详细的规则请参考网站说明：
+                #   注 1 : 訂閱連載中的漫畫，有更新時自動推送的卷(冊)，暫不計算在使用額度中，不扣減使用額度。
+                #   注 2 : 對同一卷(冊)書在 12 小時內重複*下載*，不會重複扣減額度。但重復推送是會扣減的。
+                response.raise_for_status()
+                if 'Content-Length' not in response.headers:
+                    raise ResponseError("无法从服务器获取文件大小，请检查网络连接或稍后重试。", status_code=response.status)
+                total_size = int(response.headers['Content-Length'])
 
         chunk_size = chunk_size_mb * 1024 * 1024
         num_chunks = math.ceil(total_size / chunk_size)

{kmoe_manga_downloader-1.2.3b0.dist-info → kmoe_manga_downloader-1.2.4b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kmoe-manga-downloader
-Version: 1.2.3b0
+Version: 1.2.4b0
 Summary: A CLI-downloader for site @kox.moe.
 Author-email: Chris Zheng <chrisis58@outlook.com>
 License: MIT License
@@ -50,9 +50,26 @@ Dynamic: license-file
 
 `kmdr (Kmoe Manga Downloader)` 是一个 Python 终端应用，用于从 [Kmoe](https://kxx.moe/) 网站下载漫画。它支持在终端环境下的登录、下载指定漫画及其卷，并支持回调脚本执行。
 
-<p align="center">
-  <img src="assets/kmdr-demo.gif" alt="kmdr 使用演示" width="720">
-</p>
+<table style="min-width: 600px;">
+  <tbody>
+    <tr>
+      <td style="text-align: center;" width="100">
+        交互模式
+      </td>
+      <td style="text-align: center;">
+        <img src="assets/kmdr-demo.gif" alt="kmdr 使用演示" />
+      </td>
+    </tr>
+    <tr>
+      <td style="text-align: center;" width="100">
+        日志模式
+      </td>
+      <td style="text-align: center;">
+        <img src="assets/kmdr-log-demo.gif" alt="kmdr 日志使用演示" />
+      </td>
+    </tr>
+  </tbody>
+</table>
 
 ## ✨功能特性
 

{kmoe_manga_downloader-1.2.3b0.dist-info → kmoe_manga_downloader-1.2.4b0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 kmdr/__init__.py,sha256=iLmy2rOkHS_4KZWMD8BgT7R3tLMKeaTCDVf3B4FyYxM,91
-kmdr/_version.py,sha256=wqiogbpHngoX8QtZ_nlsUei1NMVQXPtFkYVQOrBjkgo,712
-kmdr/main.py,sha256=xNUeU1voEMEqlf8z14EyiV-j61HPsRA3t2Nzreoaib4,2227
+kmdr/_version.py,sha256=rM7kfqxNlfxUahLd21Eo-qk4zyhI6_o3QboivAV5LQI,712
+kmdr/main.py,sha256=CSYLADdJ5bJMxT3wn0Nkq5_bmRBpXxzqpLmLCbzi9Q0,2227
 kmdr/core/__init__.py,sha256=aR3mhP1A81oTmTnBOonVQm_mFvFeNCOo7kalZVfszAc,416
 kmdr/core/bases.py,sha256=br3HJC4mWL2jN4Y5QeXB5SwA0xnOfi2ougr5pEx7j8s,3989
 kmdr/core/console.py,sha256=VziwGJQygF-zCrzTApPF-I9BgZKFSqCTiZ_pc5n8C-4,1950
@@ -10,25 +10,25 @@ kmdr/core/defaults.py,sha256=tF41i145znhhDGVNL5irQpdF4lV_1tkWtvToRfm2R4s,8968
 kmdr/core/error.py,sha256=qdbMEU6YhRcdbxlfZKKydoMFYXOCJQ473EYzl3mO33Q,1585
 kmdr/core/protocol.py,sha256=ntHmnrvg_nZXh2-It0Wu9g2e8f3YpOLfpoRsWniG8as,247
 kmdr/core/registry.py,sha256=KYjvww5WRuUg5SeIeWZb96803-kgrTIKYvFTj_7bPfo,5560
-kmdr/core/session.py,sha256=ZrnoxZWUwLSMiLIOZDGEQZcH7RuBLcc5e2E0m17qX-s,4937
+kmdr/core/session.py,sha256=_yXXV3c6GqxrNzCkqizFVSEvnadvcHjjWSZLaPbgxUY,4988
 kmdr/core/structure.py,sha256=EQG1-8kHQ22Not2S7Q_jGxE0nb9XUbLh3JcNTb_nkvk,1199
 kmdr/core/utils.py,sha256=_tRLggprXTGFvbRzyt3dgapQr2wI5NQ8Hc4_BHVj7lU,4069
 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
 kmdr/module/authenticator/__init__.py,sha256=iSWhq-suAM1BrABRuTWiCKvZ1fkmf5HQ2GmbZ341GK0,103
-kmdr/module/authenticator/utils.py,sha256=b49cwKjHVqOIHei0SUU5kMtWAgkYU0NH3YvDvdPhkxM,3053
+kmdr/module/authenticator/utils.py,sha256=ulXyMuKiR9N7hI0FX2X9qM66gD4D68KKVvN0KuN47ek,3179
 kmdr/module/configurer/BaseUrlUpdator.py,sha256=OsdMUuyGujfqE6vEPt96sCJkJTfsPxAf5z2hbjcNZsQ,522
 kmdr/module/configurer/ConfigClearer.py,sha256=irGBsck1EhTWl4IIOPF5b4o4TyrGvDAzibg9reQsI9A,501
 kmdr/module/configurer/ConfigUnsetter.py,sha256=tbrOGKnTSeKhdMukIBPFqtdctEiQhu7GRThLthFYZew,602
-kmdr/module/configurer/OptionLister.py,sha256=hqOtXfPcunzqkrq6Qx1KyZwEivp_vbpTVZ8PP3Q0MbY,1471
+kmdr/module/configurer/OptionLister.py,sha256=bGlrxouPiBGpGv8UiGPcT3KL6SWMJckQKd9gyd4kXjY,1476
 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=tb6fvj01cDiPTQa6tC4-dYcTfUJUX3DBmkHKAKeuW3g,3358
 kmdr/module/downloader/DirectDownloader.py,sha256=SPnzKDpVPg3utyrPrFr4pYiMI5w3eRCMemcYevH9VzY,1320
 kmdr/module/downloader/ReferViaDownloader.py,sha256=o565u6W4G_4UFoqsLkXGRFIlRSMueZB_ZMdiAfhUVCc,1970
 kmdr/module/downloader/__init__.py,sha256=PajPBQ4ZJwz_6Ok6k-HV7-YSibxAW5m5voYyP-U-_f4,97
-kmdr/module/downloader/download_utils.py,sha256=JBAlNUQdWysKIGJJWaZibH8IpkIXP_kUEVxoC_bLbhg,13944
+kmdr/module/downloader/download_utils.py,sha256=kVzDaHlwAeXMFha2HBv4znXxeBUiXYLM9u_Nqqw9puc,14384
 kmdr/module/downloader/misc.py,sha256=dS4GDHYxzKcqdhFNVJQG-4bS4IXMDnDrwi6eSWubl20,1892
 kmdr/module/lister/BookUrlLister.py,sha256=R1sak_GQG8HKfdSzHF-Dy1iby6TgFlxKJLf2dwBr0Bw,550
 kmdr/module/lister/FollowedBookLister.py,sha256=5r44sW_ypnRM5nBBd-4AL_WcNYCRklMewvMj1O2xCGc,2880
@@ -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.3b0.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
-kmoe_manga_downloader-1.2.3b0.dist-info/METADATA,sha256=9Z42LEHwL9wZVCRiUbR7FX2BsO1jBmu5dpXeIFRtN_c,9695
-kmoe_manga_downloader-1.2.3b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kmoe_manga_downloader-1.2.3b0.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
-kmoe_manga_downloader-1.2.3b0.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
-kmoe_manga_downloader-1.2.3b0.dist-info/RECORD,,
+kmoe_manga_downloader-1.2.4b0.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
+kmoe_manga_downloader-1.2.4b0.dist-info/METADATA,sha256=An6sk9_09r2Y0SFbyKuCgMkPBdhzJXENOhJ98RhIsr4,10116
+kmoe_manga_downloader-1.2.4b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kmoe_manga_downloader-1.2.4b0.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
+kmoe_manga_downloader-1.2.4b0.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
+kmoe_manga_downloader-1.2.4b0.dist-info/RECORD,,