kmoe-manga-downloader 1.1.0__tar.gz → 1.1.1__tar.gz

{kmoe_manga_downloader-1.1.0/src/kmoe_manga_downloader.egg-info → kmoe_manga_downloader-1.1.1}/PKG-INFO

@@ -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 → kmoe_manga_downloader-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kmoe-manga-downloader"
-version = "1.1.0"
+version = "1.1.1"
 authors = [
     { name="Chris Zheng", email="chrisis58@outlook.com" },
 ]

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.1}/src/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
         )

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.1}/src/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"

{kmoe_manga_downloader-1.1.0 → kmoe_manga_downloader-1.1.1}/src/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 → kmoe_manga_downloader-1.1.1/src/kmoe_manga_downloader.egg-info}/PKG-INFO

@@ -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 → kmoe_manga_downloader-1.1.1}/src/kmoe_manga_downloader.egg-info/SOURCES.txt

@@ -37,5 +37,4 @@ src/kmoe_manga_downloader.egg-info/top_level.txt
 tests/test_cache_by_kwargs.py
 tests/test_kmdr_config_option.py
 tests/test_kmdr_download.py
-tests/test_kmdr_login.py
 tests/test_utils_resolve_volme.py

kmoe_manga_downloader-1.1.0/tests/test_kmdr_login.py

@@ -1,29 +0,0 @@
-import os
-
-import unittest
-from argparse import Namespace
-
-from kmdr.core.utils import clear_session_context
-from kmdr.main import main as kmdr_main
-
-KMOE_USERNAME = os.environ.get('KMOE_USERNAME')
-KMOE_PASSWORD = os.environ.get('KMOE_PASSWORD')
-
-@unittest.skipUnless(KMOE_USERNAME and KMOE_PASSWORD, "KMOE_USERNAME and KMOE_PASSWORD must be set in environment variables")
-class TestKmdrLogin(unittest.TestCase):
-
-    @classmethod
-    def tearDownClass(cls):
-        clear_session_context()
-
-    def test_login_with_username_and_password(self):
-        assert KMOE_USERNAME and KMOE_PASSWORD, "KMOE_USERNAME and KMOE_PASSWORD must be set in environment variables"
-
-        kmdr_main(
-            Namespace(
-                command='login',
-                username=KMOE_USERNAME,
-                password=KMOE_PASSWORD,
-                show_quota=False
-            )
-        )