lazysdk 0.1.18__tar.gz → 0.1.20__tar.gz

{lazysdk-0.1.18 → lazysdk-0.1.20}/PKG-INFO

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

{lazysdk-0.1.18 → lazysdk-0.1.20}/lazysdk/lazyfile.py

@@ -264,10 +264,10 @@ def safe_download(
 
 def read(
         file,
-        postfix=None,
-        path=None,
-        silence=False,
-        json_auto=True
+        postfix: str = None,
+        path: str = None,
+        silence: bool = False,
+        json_auto: bool = True
 ):
     """
     读取文件
@@ -308,6 +308,46 @@ def read(
         return
 
 
+def save(
+        file,
+        content,
+        postfix: str = None,
+        path: str = None,
+        overwrite: str = True,
+        encoding: str = 'utf-8'
+):
+    """
+    保存文件
+    """
+    if path:
+        # 如果指定了路径，就加上路径
+        lazypath.make_path(path)
+        file_dir = f'{path}{path_separator}{file}'
+    else:
+        # 如果没指定路径，就直接使用文件名
+        file_dir = file
+
+    if postfix:
+        # 如果指定了后缀名，就加上后缀名
+        file_dir = f'{file}.{postfix}'
+    else:
+        # 如果没指定后缀名，就忽略
+        pass
+
+    if overwrite is True:
+        write_mode = "w"  # 覆盖
+    else:
+        write_mode = "a"  # 追加
+
+    f = open(
+        file=file_dir,
+        mode=write_mode,
+        encoding=encoding
+    )
+    f.write(content)
+    f.close()
+
+
 def read_(_source_file):
     # >>读取数据【方式：一次性全部读取】------------------------------------------------------------
     data = xlrd.open_workbook(_source_file)  # 打开表
@@ -496,30 +536,6 @@ class DateEncoder(json.JSONEncoder):
             return json.JSONEncoder.default(self, obj)
 
 
-def save(
-        file_name,
-        content,
-        postfix: str = "txt",
-        path=None,
-        overwrite=True
-):
-    """
-    增加自动创建目录功能
-    """
-    if overwrite is True:
-        write_mode = "w"  # 覆盖
-    else:
-        write_mode = "a"  # 追加
-
-    if path is None:
-        f = open("%s.%s" % (file_name, postfix), write_mode, encoding='utf-8')
-    else:
-        lazypath.make_path(path)
-        f = open("%s%s%s.%s" % (path, path_separator, file_name, postfix), write_mode, encoding='utf-8')
-    f.write(content)
-    f.close()
-
-
 def save_list(
         file_name,
         list_data,

{lazysdk-0.1.18 → lazysdk-0.1.20}/lazysdk/lazym3u8.py

@@ -733,7 +733,7 @@ def download_m3u8_to_file(
                 return False
             else:
                 lazyfile.save(
-                    file_name=temp_filename,
+                    file=temp_filename,
                     content=m3u8_content,
                     postfix="m3u8",
                     path=video_save_path,
@@ -751,7 +751,7 @@ def download_m3u8_to_file(
             m3u8_file = m3u8_file_maker(m3u8_url=m3u8_url)
             print(':) 获取m3u8内容成功')
             lazyfile.save(
-                file_name=temp_filename,
+                file=temp_filename,
                 content=m3u8_file,
                 postfix="m3u8",
                 path=video_save_path,

{lazysdk-0.1.18 → lazysdk-0.1.20}/lazysdk/lazyrequests.py

@@ -21,6 +21,7 @@ def lazy_requests(
         ReadTimeout_retry: bool = True,  # 超时重试
         JSONDecodeError_retry: bool = True,  # 返回非json类型重试
         ConnectionError_retry: bool = True,  # 连接错误重试
+        ChunkedEncodingError: bool = True,
 
         **kwargs
 ):
@@ -62,6 +63,11 @@ def lazy_requests(
                 retry_count += 1
                 showlog.warning(f'ConnectionError_retry，将在{retry_delay}秒后重试第{retry_count}次...')
                 time.sleep(retry_delay)
+        except requests.exceptions.ChunkedEncodingError:
+            if ChunkedEncodingError is True:
+                retry_count += 1
+                showlog.warning(f'ConnectionError_retry，将在{retry_delay}秒后重试第{retry_count}次...')
+                time.sleep(retry_delay)
         if retry_limit == 0:
             break
         elif retry_limit < 0:

{lazysdk-0.1.18 → lazysdk-0.1.20}/lazysdk.egg-info/PKG-INFO

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

{lazysdk-0.1.18 → lazysdk-0.1.20}/setup.py

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