kmoe-manga-downloader 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

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')

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

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
         )

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"

kmdr/module/downloader/utils.py

@@ -1,6 +1,7 @@
-from typing import Callable, Optional
+from typing import Callable, Optional, Union
 import os
 import time
+import threading
 from functools import wraps
 
 from requests import Session, HTTPError
@@ -12,71 +13,100 @@ 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
-    ):
+        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 = f'{dest_path}/{filename}'
-    tmp_file_path = f'{dest_path}/{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} already exists.")
+        tqdm.write(f"{filename} 已经存在")
         return
 
-    resume_from = 0
-    total_size_in_bytes = 0
-    
-    if os.path.exists(tmp_file_path):
-        resume_from = os.path.getsize(tmp_file_path)
+    block_size = 8192
     
-    if resume_from:
-        headers['Range'] = f'bytes={resume_from}-'
+    attempts_left = retry_times + 1
+    progress_bar = tqdm(
+        total=0, unit='B', unit_scale=True,
+        desc=f'{filename} (连接中...)',
+        leave=False,
+        dynamic_ncols=True
+    )
 
     try:
-        with session.get(url = url, stream=True, headers=headers) as r:
-            r.raise_for_status()
+        while attempts_left > 0:
+            attempts_left -= 1
             
-            total_size_in_bytes = int(r.headers.get('content-length', 0)) + resume_from
+            resume_from = os.path.getsize(tmp_file_path) if os.path.exists(tmp_file_path) else 0
             
-            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
+            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:
     """
@@ -124,4 +154,4 @@ def clear_cache(func):
     wrapped = func.__wrapped__
 
     if wrapped in function_cache:
-        function_cache[wrapped] = {}
+        function_cache[wrapped] = {}

{kmoe_manga_downloader-1.1.0.dist-info → kmoe_manga_downloader-1.1.2.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 kmdr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kmdr/main.py,sha256=f3bHGfrVs_ZEydj03YOWz2ATrNH7pHQs8GLDgKea-48,891
+kmdr/main.py,sha256=F_zXjRr2QIBdNrqvCqpSNkFSxVY6ySfm-mk-Gg9qy7g,1018
 kmdr/core/__init__.py,sha256=WT4MHsww1KOcIlf3z_AK5-4mXNFNBoCE1REQ0dvf9DE,281
-kmdr/core/bases.py,sha256=nlrMNq_GsJmZtBnOSR-VP8LgJ9ZOHBWH4Sj8aqACx9E,4091
+kmdr/core/bases.py,sha256=uDLamjuRfwcVhbGI99aSUZBi-fN32OM2fl91t0bbVog,4484
 kmdr/core/defaults.py,sha256=9vVN0xywLOHm3tcNf1GGJ9RTXB38YLTvBMqxmp0jEAE,6582
 kmdr/core/error.py,sha256=ZXsiD-Ihe0zo5wdNgd7Rg-ISZifsiU5C6FeHesurfy4,597
 kmdr/core/registry.py,sha256=KYjvww5WRuUg5SeIeWZb96803-kgrTIKYvFTj_7bPfo,5560
@@ -16,18 +16,18 @@ kmdr/module/configurer/ConfigUnsetter.py,sha256=ZjySNAQj4-j9k68_tbXa2Z9G0TqGgfKP
 kmdr/module/configurer/OptionLister.py,sha256=qc-nWPft_EtbEgJnz32h3nwGyGbe9oabKZpm6dIJi_o,516
 kmdr/module/configurer/OptionSetter.py,sha256=9MIkWZb-aFUTqpVCVrnri3JZTE0zO3CIYuN_nz5yzzY,842
 kmdr/module/configurer/option_validate.py,sha256=DdtUG0E-LgjjHQgPBSyRZ_ID40QRRFSS_FEQHdK94hM,3327
-kmdr/module/downloader/DirectDownloader.py,sha256=3U9I9Uz1Zw5qYgje0BrhzIB3-Hff5sPBfw4JIxcBHEM,1037
-kmdr/module/downloader/ReferViaDownloader.py,sha256=g_6MAzl_HLmXlMoIHpxDE6W7-EIq--HZeM-BUbgzJw8,1671
-kmdr/module/downloader/utils.py,sha256=zBR6NSYetQdWblcA84rZp1EGVdOPwv-1eJNVrZcGyP0,3908
+kmdr/module/downloader/DirectDownloader.py,sha256=5ny3or9fj2rb3qGxEWBmiEs5vlIfvCSGFiMoFISs_J8,1060
+kmdr/module/downloader/ReferViaDownloader.py,sha256=_x-hniGmIqc_7OFY-kQUrOIH0TwDcf-_NCsmVql2pp0,1694
+kmdr/module/downloader/utils.py,sha256=qGp_c0coVENDKPNUpA7uZoHoDxBIj5jQHlw8qf4NRpQ,4814
 kmdr/module/lister/BookUrlLister.py,sha256=Mq7EBXWSKd-6cygfkTjmOvgcUUaJI4NMQiaEIv9VDSk,470
 kmdr/module/lister/FollowedBookLister.py,sha256=_fShmCAsZQqboeuRtLBjo6d9CkGpat8xNKC3COtKllc,1537
 kmdr/module/lister/utils.py,sha256=0EHQIA05EZ1V0_SfkJ8demjzMRmFh9Q5qPvE6jvBqSU,2560
 kmdr/module/picker/ArgsFilterPicker.py,sha256=f3suMPPeFEtB3u7aUY63k_sGIOP196R-VviQ9RfDBTA,1756
 kmdr/module/picker/DefaultVolPicker.py,sha256=kpG5dvv1UKMhSA01VKGNB59zM5uszspyUVfRlL9aQA0,750
 kmdr/module/picker/utils.py,sha256=lpxM7q9BJeupFQy8glBrHu1o4E38dk7iLexzKytAE6g,1222
-kmoe_manga_downloader-1.1.0.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
-kmoe_manga_downloader-1.1.0.dist-info/METADATA,sha256=uCbTxKLFbNyhIURQMOBJxdtmOhRw4oWeLW9Lc2XRgT0,7773
-kmoe_manga_downloader-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kmoe_manga_downloader-1.1.0.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
-kmoe_manga_downloader-1.1.0.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
-kmoe_manga_downloader-1.1.0.dist-info/RECORD,,
+kmoe_manga_downloader-1.1.2.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
+kmoe_manga_downloader-1.1.2.dist-info/METADATA,sha256=vPMrYaRtOC0rTenqPS2QWj5Inq1X1gYlMbSZ2HANAPQ,7869
+kmoe_manga_downloader-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kmoe_manga_downloader-1.1.2.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
+kmoe_manga_downloader-1.1.2.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
+kmoe_manga_downloader-1.1.2.dist-info/RECORD,,