lazysdk 0.1.67__tar.gz → 0.1.68__tar.gz

{lazysdk-0.1.67 → lazysdk-0.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.67
+Version: 0.1.68
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.67 → lazysdk-0.1.68}/lazysdk/lazyfile.py

@@ -97,6 +97,7 @@ def download(
         size_limit: int = None,
         range_start: int = None,
         range_end: int = None,
+        overwrite: bool = False
 ):
     """
     实现文件下载功能，可指定url、文件名、后缀名、请求头、文件保存路径
@@ -109,6 +110,7 @@ def download(
     :param size_limit:尺寸限制
     :param range_start:开始位置
     :param range_end:结束位置
+    :param overwrite: 覆盖
     :return:
     """
     if not headers:
@@ -192,6 +194,9 @@ def download(
     time_start = time.time()  # 获取下载开始时间
     is_finish = False
 
+    if overwrite and os.path.exists(path_local):
+        delete(file=path_local)
+
     with open(path_local, "ab") as f:  # wb新建文件，a追加
         for chunk in response.iter_content(chunk_size=chunk_size):
             try:
@@ -261,26 +266,36 @@ def safe_download(
         range_start=None,
         range_end=None
 ):
+    overwrite = False
+    overwrite_range_start = copy.deepcopy(range_start)
     while True:
-        download_response = download(
-            url=url,
-            filename=filename,
-            suffix_name=suffix_name,
-            headers=headers,
-            path=path,
-            proxies=proxies,
-            size_limit=size_limit,
-            range_start=range_start,
-            range_end=range_end
-        )
-        if download_response.get('is_finish') is True:
-            local_file_dir = download_response.get('file_dir')
-            return local_file_dir
-        else:
-            print(':( 下载中断')
-            range_start = download_response.get('temp_size')
+        try:
+            download_response = download(
+                url=url,
+                filename=filename,
+                suffix_name=suffix_name,
+                headers=headers,
+                path=path,
+                proxies=proxies,
+                size_limit=size_limit,
+                range_start=range_start,
+                range_end=range_end,
+                overwrite=overwrite
+            )
+            if download_response.get('is_finish') is True:
+                local_file_dir = download_response.get('file_dir')
+                return local_file_dir
+            else:
+                print(':( 下载中断')
+                range_start = download_response.get('temp_size')
+                time.sleep(1)
+                print('将继续下载（断点续传）...')
+                overwrite = False
+        except:
+            print(':( 下载中断，将重新下载')
             time.sleep(1)
-            print('将继续下载（断点续传）...')
+            overwrite = True
+            range_start = copy.deepcopy(overwrite_range_start)
 
 
 def read(

{lazysdk-0.1.67 → lazysdk-0.1.68}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.67
+Version: 0.1.68
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.67 → lazysdk-0.1.68}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.67",
+    version="0.1.68",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",