lazysdk 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

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/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/lazypath.py

@@ -92,7 +92,7 @@ def project_path(
     return _project_path
 
 
-def file_path():
+def file_path(__file__):
     """
     os.path.dirname(os.path.abspath(__file__))  单纯的文件地址
     os.path.dirname(os.path.realpath(__file__))  可能会存在的文件指向的真实地址
@@ -154,3 +154,18 @@ def open_path(path):
         os.startfile(path)  # Windows上打开文件
     else:
         subprocess.check_call(['open', path])  # 非Windows上打开文件
+
+
+def path_clean(content):
+    """
+    清除路径前后可能出现的引号
+    """
+    if content[0] == '"' and content[-1] == '"':
+        content = content[1:-1]
+    elif content[0] == '“' and content[-1] == '”':
+        content = content[1:-1]
+    elif content[0] == "'" and content[-1] == "'":
+        content = content[1:-1]
+    else:
+        pass
+    return content

{lazysdk-0.1.15.dist-info → lazysdk-0.1.17.dist-info}/METADATA

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

{lazysdk-0.1.15.dist-info → lazysdk-0.1.17.dist-info}/RECORD

@@ -4,13 +4,13 @@ lazysdk/lazybase64.py,sha256=KUes0YYmC29y6wF79KWMLV4a7r89Kh3mc10JQvoIY7E,555
 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=Rdj9f11IUyd1lLAZu-G4JHZqSKrvBQGkLCeJ9CxSzPQ,20267
+lazysdk/lazyfile.py,sha256=CDJi-NDcXr4fSJjI1M0BhKD2ATP0KSobp75ahCe_OvQ,19962
 lazysdk/lazyflask.py,sha256=VUhJqtNz_evVyGOS40FKkkQWWrqGEUZ26cv1RQxS388,727
 lazysdk/lazyid.py,sha256=pEmRpN78-6vdz4hzLxgoCSHJw6gvnOVQyNjqusZZLQE,607
 lazysdk/lazyip.py,sha256=ZM4N0nCimW4r4z1_Bymb-ZAfabR_3L-hB5Biyyz77-I,451
-lazysdk/lazym3u8.py,sha256=WbxQbhWgFSfYpHM5UbCcu4GdGkX1LAX49uqijibSmoo,31954
+lazysdk/lazym3u8.py,sha256=F-rdbUZvGD91jYyfiSOzDY25xK6vicc8vIpas6OWn1Y,31949
 lazysdk/lazymd5.py,sha256=JSKIcUmH2zwPDDJAd9XajTYd59eKidoKAkLLNU8OHM4,1112
-lazysdk/lazypath.py,sha256=Oyn9azQx5Ql--d9Bs1Gc1AxLA6_JC8Z4-aa-Iw8HW-8,4569
+lazysdk/lazypath.py,sha256=Schq1CtoyJmThbAFaTKJnwF0mm4j5Kzh8zPyjCQikps,4957
 lazysdk/lazyprocess.py,sha256=q6ED88Ez5rj3xFzC8KVLV2FWjaBaqR57523JnFBNxA8,5159
 lazysdk/lazyproxies.py,sha256=bljLKkP3WksZ6jOHhjS5-jSHdUBRH6gx-BxEZTPJeXc,546
 lazysdk/lazyrandom.py,sha256=K2RHKJXBgYGaPNfTyXQkZ18xGpxrievNE66Iu924XDc,1482
@@ -21,7 +21,7 @@ lazysdk/lazytime.py,sha256=lOQ5U8iWa9dp1ZJ8SjfZ2FRBj9t43SsteYbxDcXkFzo,23199
 lazysdk/lazyua.py,sha256=QI4EgZAMF9AqXJJvaDEzsMSTbsR47_y8CkJkfPbX-kM,3783
 lazysdk/lazyurl.py,sha256=5sCdVkaQ7_OsQ9AIwjTkBLXQR9SLP27hBCn-J6v04RY,396
 lazysdk/lazywebhook.py,sha256=HwJIZ5j3wUpnEfPkFY-Xq9T_9xdhCJ71dYsWNX22_3Y,8386
-lazysdk-0.1.15.dist-info/METADATA,sha256=LGfpyKxBVcewaLpcgSS6vC75BIudLCVKLXw-3kxBOLU,1731
-lazysdk-0.1.15.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-lazysdk-0.1.15.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
-lazysdk-0.1.15.dist-info/RECORD,,
+lazysdk-0.1.17.dist-info/METADATA,sha256=8o-KsNOnSMYOQDG-iwCeR1WUvrV5CDO89DxQ40geLcA,1731
+lazysdk-0.1.17.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+lazysdk-0.1.17.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
+lazysdk-0.1.17.dist-info/RECORD,,