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

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,4 +1,4 @@
-from typing import Callable, Optional
+from typing import Callable, Optional, Union
 import os
 import time
 from functools import wraps
@@ -13,7 +13,7 @@ MIN_BLOCK_SIZE = 2048
 
 def download_file(
             session: Session, 
-            url: str,
+            url: Union[str, Callable[[], str]],
             dest_path: str, 
             filename: str, 
             retry_times: int = 0, 
@@ -21,10 +21,22 @@ def download_file(
             callback: Optional[Callable] = None,
             block_size: int = 8192
     ):
+    """
+    下载文件
+
+    :param session: requests.Session 对象
+    :param url: 下载链接或者其 Supplier
+    :param dest_path: 目标路径
+    :param filename: 文件名
+    :param retry_times: 重试次数
+    :param headers: 请求头
+    :param callback: 下载完成后的回调函数
+    :param block_size: 块大小
+    """
     if headers is None:
         headers = {}
     filename_downloading = f'{filename}.downloading'
-        
+
     file_path = f'{dest_path}/{filename}'
     tmp_file_path = f'{dest_path}/{filename_downloading}'
     
@@ -34,6 +46,9 @@ def download_file(
     if os.path.exists(file_path):
         tqdm.write(f"{filename} already exists.")
         return
+    
+    if callable(url):
+        url = url()
 
     resume_from = 0
     total_size_in_bytes = 0

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

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

{kmoe_manga_downloader-1.1.0.dist-info → kmoe_manga_downloader-1.1.1.dist-info}/RECORD

@@ -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=TdZ5ojVsw4ke-n5347pDzgulndOt-r56JD9lD7CuEW4,4323
 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.1.dist-info/licenses/LICENSE,sha256=bKQlsXu8mAYKRZyoZKOEqMcCc8YjT5Q3Hgr21e0yU4E,1068
+kmoe_manga_downloader-1.1.1.dist-info/METADATA,sha256=1Rj0x86vnKIJbG5C_0Q2A615ssX0b7FujbHseuSbnVs,7773
+kmoe_manga_downloader-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kmoe_manga_downloader-1.1.1.dist-info/entry_points.txt,sha256=DGMytQAhx4uNuKQL7BPkiWESHLXkH-2KSEqwHdygNPA,47
+kmoe_manga_downloader-1.1.1.dist-info/top_level.txt,sha256=e0qxOgWp0tl3GLpmXGjZv3--q_TLoJ7GztM48Ov27wM,5
+kmoe_manga_downloader-1.1.1.dist-info/RECORD,,