lazysdk 0.1.16__tar.gz → 0.1.17__tar.gz

{lazysdk-0.1.16 → lazysdk-0.1.17}/PKG-INFO

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

{lazysdk-0.1.16 → lazysdk-0.1.17}/lazysdk/lazyfile.py

@@ -263,41 +263,43 @@ def safe_download(
 
 
 def read(
-        file_name,
-        postfix="txt",
+        file,
+        postfix=None,
         path=None,
-        silence=False
+        silence=False,
+        json_auto=True
 ):
+    """
+    读取文件
+    json_auto：json格式自动转换
+    """
+    if path:
+        # 如果指定了路径，就加上路径
+        file_dir = f'{path}{path_separator}{file}'
+    else:
+        # 如果没指定路径，就直接使用文件名
+        file_dir = file
+
+    if postfix:
+        # 如果指定了后缀名，就加上后缀名
+        file_dir = f'{file}.{postfix}'
+    else:
+        # 如果没指定后缀名，就忽略
+        pass
     try:
-        if postfix == "txt":
-            if path is None:
-                f = open("%s.%s" % (file_name, postfix), encoding='utf-8')
-            else:
-                f = open("%s/%s.%s" % (path, file_name, postfix), encoding='utf-8')
-            res = f.read()
-            return res
-        elif postfix == "json":
+        if postfix == "json" and json_auto:
             content_list = list()
-            if path is None:
-                with open("%s.%s" % (file_name, postfix), 'r', encoding='utf-8') as f:
-                    content = f.readlines()
-                    for each in content:
-                        each_json = json.loads(each)
-                        content_list.append(each_json)
-            else:
-                with open("./%s/%s.%s" % (path, file_name, postfix), 'r', encoding='utf-8') as f:
-                    content = f.readlines()
-                    for each in content:
-                        each_json = json.loads(each)
-                        content_list.append(each_json)
+            with open(file=file_dir, mode='r', encoding='utf-8') as f:
+                content = f.readlines()
+                for each in content:
+                    each_json = json.loads(each)
+                    content_list.append(each_json)
             return content_list
         else:
-            if path is None:
-                f = open("%s.%s" % (file_name, postfix), encoding='utf-8')
-            else:
-                f = open("%s/%s.%s" % (path, file_name, postfix), encoding='utf-8')
+            f = open(file=file_dir, mode='r', encoding='utf-8')
             res = f.read()
             return res
+
     except Exception as e:
         if silence is True:
             pass

{lazysdk-0.1.16 → lazysdk-0.1.17}/lazysdk/lazym3u8.py

@@ -657,7 +657,7 @@ def download_m3u8(
     if m3u8_file_path is not None:
         print("正在解析m3u8文件...")
         all_content = lazyfile.read(
-            file_name=m3u8_file_path,
+            file=m3u8_file_path,
             postfix=postfix
         )
         m3u8_lines = all_content.split("\n")  # 读取文件里的每一行

{lazysdk-0.1.16 → lazysdk-0.1.17}/lazysdk.egg-info/PKG-INFO

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

{lazysdk-0.1.16 → lazysdk-0.1.17}/setup.py

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