upplib 3.2.1__py3-none-any.whl → 3.2.3__py3-none-any.whl

upplib/file.py

@@ -1,32 +1,33 @@
 from upplib import *
 from upplib.index import *
+from upplib.index import is_win
 
 
 def get_file(file_path: str = None,
-             path_prefix: str = None,
-             prefix: str = None,
+             path_startswith: str = None,
+             startswith: str = None,
              path_contain: str = None,
              contain: str = None,
              sort_asc: bool | None = True,
-             path_suffix: str = None,
-             suffix: str = None) -> list[str]:
+             path_endswith: str = None,
+             endswith: str = None) -> list[str]:
     """
     有关文件的操作
     查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
-    file_path     : 文件路径
-    path_prefix   : 文件路径,以 prefix 开头
-    prefix        : 文件名称,以 prefix 开头
-    path_contain  : 文件路径,含有
-    contain       : 文件名称,含有
-    sort_asc      : 是否按升序排序，也就是从小到大排序
-    path_suffix   : 文件路径,以 suffix 结尾
-    suffix        : 文件名称,以 suffix 结尾
+    file_path         : 文件路径
+    path_startswith   : 文件路径,以 path_startswith 开头
+    startswith        : 文件名称,以 startswith 开头
+    path_contain      : 文件路径,含有
+    contain           : 文件名称,含有
+    sort_asc          : 是否按升序排序，也就是从小到大排序
+    path_endswith     : 文件路径,以 path_endswith 结尾
+    endswith          : 文件名称,以 endswith 结尾
     return list
     """
     if file_path is None:
         file_path = os.path.dirname(os.path.abspath('.'))
     list_data = []
-    get_file_all(file_path, list_data, path_prefix, prefix, path_contain, contain, path_suffix, suffix)
+    get_file_all(file_path, list_data, path_startswith, startswith, path_contain, contain, path_endswith, endswith)
     # 去一下重复的数据
     r_list = list(set(list_data))
     if sort_asc is not None:
@@ -50,30 +51,30 @@ def get_file_folder(file_name_one: str = None) -> str:
 
 
 def remove_folder_file(file_path: str = None,
-                       path_prefix: str = None,
-                       prefix: str = None,
+                       path_startswith: str = None,
+                       startswith: str = None,
                        path_contain: str = None,
                        contain: str = None,
-                       path_suffix: str = None,
-                       suffix: str = None):
+                       path_endswith: str = None,
+                       endswith: str = None):
     """
     删除指定文件夹下面的指定的文件
     """
     file_part_all_list = get_file(file_path=file_path,
-                                  path_prefix=path_prefix,
-                                  prefix=prefix,
+                                  path_startswith=path_startswith,
+                                  startswith=startswith,
                                   path_contain=path_contain,
                                   contain=contain,
-                                  path_suffix=path_suffix,
-                                  suffix=suffix)
+                                  path_endswith=path_endswith,
+                                  endswith=endswith)
     for file_part_all_one in file_part_all_list:
         os.remove(file_part_all_one)
 
 
 def get_folder(file_path: str = None,
-               prefix: str = None,
+               startswith: str = None,
                contain: str = None,
-               suffix: str = None) -> list[str]:
+               endswith: str = None) -> list[str]:
     """
     有关文件的操作, 只查询文件夹
     查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
@@ -83,17 +84,17 @@ def get_folder(file_path: str = None,
     if file_path is None:
         file_path = os.path.dirname(os.path.abspath('.'))
     list_data = []
-    get_folder_all(file_path, list_data, prefix, contain, suffix)
+    get_folder_all(file_path, list_data, startswith, contain, endswith)
     # 去一下重复的数据
     return list(set(list_data))
 
 
 # 是否包含指定的文件
 def contain_file(file_path: str = None,
-                 prefix: str = None,
+                 startswith: str = None,
                  contain: str = None,
-                 suffix: str = None) -> bool:
-    return len(get_file(file_path, prefix, contain, suffix)) > 0
+                 endswith: str = None) -> bool:
+    return len(get_file(file_path, startswith, contain, endswith)) > 0
 
 
 def get_file_data_line(file_path: str = None,
@@ -125,78 +126,77 @@ def get_file_data_line(file_path: str = None,
 # 查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
 def get_file_all(file_path: str = None,
                  list_data: list = None,
-                 path_prefix: str = None,
-                 prefix: str = None,
+                 path_startswith: str = None,
+                 startswith: str = None,
                  path_contain: str = None,
                  contain: str = None,
-                 path_suffix: str = None,
-                 suffix: str = None) -> None:
+                 path_endswith: str = None,
+                 endswith: str = None) -> None:
     if os.path.isdir(file_path):
         for root, dir_names, file_names in os.walk(file_path):
             for file_name in file_names:
-                if (get_file_check(os.path.join(root, file_name), path_prefix, path_contain, path_suffix)
-                        and get_file_check(file_name, prefix, contain, suffix)):
+                if (get_file_check(os.path.join(root, file_name), path_startswith, path_contain, path_endswith)
+                        and get_file_check(file_name, startswith, contain, endswith)):
                     list_data.append(os.path.join(root, file_name))
             for dir_name in dir_names:
-                get_file_all(os.path.join(root, dir_name), list_data, path_prefix, prefix, path_contain, contain, path_suffix, suffix)
-    elif (get_file_check(file_path, prefix, contain, suffix)
-          and get_file_check(file_path, path_prefix, path_contain, path_suffix)):
+                get_file_all(os.path.join(root, dir_name), list_data, path_startswith, startswith, path_contain, contain, path_endswith, endswith)
+    elif (get_file_check(file_path, startswith, contain, endswith)
+          and get_file_check(file_path, path_startswith, path_contain, path_endswith)):
         list_data.append(file_path)
 
 
 # 查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
 def get_folder_all(file_path: str = None,
                    list_data: list = None,
-                   prefix: str = None,
+                   startswith: str = None,
                    contain: str = None,
-                   suffix: str = None) -> None:
+                   endswith: str = None) -> None:
     if os.path.isdir(file_path):
         for root, dir_names, file_names in os.walk(file_path):
             for dir_name in dir_names:
                 dir_name_path = os.path.join(root, dir_name)
-                if get_file_check(dir_name_path, prefix, contain, suffix):
+                if get_file_check(dir_name_path, startswith, contain, endswith):
                     list_data.append(dir_name_path)
                 else:
-                    get_folder_all(dir_name_path, list_data, prefix, contain, suffix)
+                    get_folder_all(dir_name_path, list_data, startswith, contain, endswith)
 
 
-def get_file_check(
-        name: str = None,
-        prefix: str = None,
-        contain: str = None,
-        suffix: str = None) -> bool:
+def get_file_check(name: str = None,
+                   startswith: str = None,
+                   contain: str = None,
+                   endswith: str = None) -> bool:
     """
     检查文件是否符合要求
-    prefix  : 前缀
-    contain : 包含这个字符
-    suffix  : 后缀
+    startswith  : 以这个开头
+    contain     : 包含这个字符
+    endswith    : 以这个结尾
     """
     if name is None or name == '':
         return False
     p = True
     c = True
     s = True
-    if prefix is not None:
-        p = name.startswith(prefix)
+    if startswith is not None:
+        p = name.startswith(startswith)
     if contain is not None:
         c = name.find(contain) > -1
-    if suffix is not None:
-        s = name.endswith(suffix)
+    if endswith is not None:
+        s = name.endswith(endswith)
     return p and c and s
 
 
 def find_file_by_content(file_path: str = '',
                          contain_txt: str = None,
-                         prefix: str = None,
+                         startswith: str = None,
                          contain: str = None,
-                         suffix: str = None) -> bool | None:
+                         endswith: str = None) -> bool | None:
     """
     检查文件内容是否包含指定的字符串
     慎用,否则, 执行时间可能比较长
     """
-    list_file = get_file(file_path, prefix, contain, suffix)
+    list_file = get_file(file_path, startswith, contain, endswith)
     if len(list_file) == 0:
-        to_log(f'no_matched_file : {file_path} , {contain_txt} , {prefix} , {contain} , {suffix}')
+        to_log(f'no_matched_file : {file_path} , {contain_txt} , {startswith} , {contain} , {endswith}')
         return False
     if contain_txt is None:
         to_log(list_file)

{upplib-3.2.1.dist-info → upplib-3.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upplib
-Version: 3.2.1
+Version: 3.2.3
 Summary: util
 Author: Luck
 Author-email: wantwaterfish@gmail.com

{upplib-3.2.1.dist-info → upplib-3.2.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ upplib/chart_html.py,sha256=39CTD2LbN7LNN3wtb3n-ojN2r_X7RJMWappPgiLSJG4,23144
 upplib/clean_up_msg.py,sha256=yR4D2fIXOT8z9VpClfhBjVnjhexObgNZDhvPu5v_5Y4,19237
 upplib/common_package.py,sha256=2-u66k4WbZnX6-PUaYy8wsblnz41nvtX4Hwo3J5hjO0,832
 upplib/db.py,sha256=-3ZALQSzP92-zIhye6ckrXIctbHsVmwoLiCVOlTyDyo,7058
-upplib/file.py,sha256=XmrIKbAaCW1WdwPxmZWPZL5YwHyQEXxiDQ6MNEf97DE,8349
+upplib/file.py,sha256=-IZ8NJq7iaOG0TZbTjpgZcDFNNR-wC0-78Nyt02PReM,8675
 upplib/file_text.py,sha256=JYoRSatwPMVOqXpJ2wszfJ2pVx1Ot2rQ2Jnxm_vj_YY,43106
 upplib/format_data.py,sha256=Qxq-OZ8v6HBRJ-tUcNFem1Imbauk3Y5qJTrAGT0CC4I,10153
 upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
@@ -16,8 +16,8 @@ upplib/multi_thread.py,sha256=zOeWG5HGYIzwqiPvef-4ak5bzorf0S3q6Ht8wPit_M0,2705
 upplib/query_log.py,sha256=m93f8wyZeatVs_PF8O5eyC6U5yJfohg7x6muXPUMOJA,9204
 upplib/redis_tool.py,sha256=I1kOqBwfQWVIOAY-hQaaOn1Zrx8BNlK83u-pk4uHPCA,707
 upplib/util.py,sha256=0JXo9eIEC67Cnby-s8IELkbP9m7a6deB4pX7OIGb3zg,4709
-upplib-3.2.1.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-3.2.1.dist-info/METADATA,sha256=wKO-0xGa_i_HaYws0NL7tGTUwBP_YqNyRzY56cs1Kmk,940
-upplib-3.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-upplib-3.2.1.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-3.2.1.dist-info/RECORD,,
+upplib-3.2.3.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.2.3.dist-info/METADATA,sha256=3-BcSuY4ftZ41Qrkswuut-ru43zku2jXAM-8r79iU9Y,940
+upplib-3.2.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.2.3.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.2.3.dist-info/RECORD,,