lazysdk 0.1.66__py3-none-any.whl → 0.1.68__py3-none-any.whl

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(
@@ -351,7 +366,7 @@ def save(
 
     if suffix:
         # 如果指定了后缀名，就加上后缀名
-        file_dir = f'{file}.{suffix}'
+        file_dir = f'{file_dir}.{suffix}'
     else:
         # 如果没指定后缀名，就忽略
         pass

{lazysdk-0.1.66.dist-info → lazysdk-0.1.68.dist-info}/METADATA

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

{lazysdk-0.1.66.dist-info → lazysdk-0.1.68.dist-info}/RECORD

@@ -5,7 +5,7 @@ lazysdk/lazybase64.py,sha256=8jtuH9S1jICXpzxhRLe7xNur_o9TWbT1BRmTshZWYh0,669
 lazysdk/lazydict.py,sha256=uPc0YtLrFtBskLooChUbjapfjJ27HNG92cFRqGiTxdQ,7636
 lazysdk/lazyenv.py,sha256=P6HjO9cbBPzHD_Vs-Ww_GThDq-h9Wn31VSiu9OzTNWI,3024
 lazysdk/lazyexcel.py,sha256=r8_VbCzB1dRhMbK4Dwk-cr5keJCo6AV4r8SYe4O5y6k,15129
-lazysdk/lazyfile.py,sha256=fjwvPQorN7x4r1Yxkwuvq9XnzSopzXTmvz6Rf6NybFs,19861
+lazysdk/lazyfile.py,sha256=zif3K5hm6CwLI73fJEpnynA1ZHg5EloFfyP_fBMKd9s,20434
 lazysdk/lazyflask.py,sha256=VUhJqtNz_evVyGOS40FKkkQWWrqGEUZ26cv1RQxS388,727
 lazysdk/lazyhtml.py,sha256=vTtiLPoAhWMzXsDBFsF0DoFSsKbfmuEPjPMOZI_n6ag,1867
 lazysdk/lazyid.py,sha256=pEmRpN78-6vdz4hzLxgoCSHJw6gvnOVQyNjqusZZLQE,607
@@ -26,7 +26,7 @@ lazysdk/lazyurl.py,sha256=N89QLK2A6vXr9gqp-9vnk9RXv_fOjw171lVl9eEoxtE,1550
 lazysdk/lazywebhook.py,sha256=HwJIZ5j3wUpnEfPkFY-Xq9T_9xdhCJ71dYsWNX22_3Y,8386
 lazysdk/lazywifi.py,sha256=FOvLPTcb6BQE6D8kjfB0TLpfgGxw8jqC3vZbTs6LbD4,716
 lazysdk/showdata.py,sha256=v9TrDWrLl0Fn2JzDzfiISYlZS3uumIXpm9Dpix2XAXg,1678
-lazysdk-0.1.66.dist-info/METADATA,sha256=AqOuOWKa_zZNqfZrPPB7Ke0LMigRjdLF4tEWZFDp0yA,1775
-lazysdk-0.1.66.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-lazysdk-0.1.66.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
-lazysdk-0.1.66.dist-info/RECORD,,
+lazysdk-0.1.68.dist-info/METADATA,sha256=6bEOCJbbfOnTCu3GvljIvEjtSZujef9RkXztE2ukkxk,1775
+lazysdk-0.1.68.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+lazysdk-0.1.68.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
+lazysdk-0.1.68.dist-info/RECORD,,