upplib 3.2.2__py3-none-any.whl → 3.3.1__py3-none-any.whl

upplib/__init__.py

@@ -10,6 +10,8 @@ from upplib.util import *
 from upplib.file import *
 from upplib.file_text import *
 
+from upplib.config_data import *
+
 # 有关 图表的 html 代码的包
 from upplib.chart_html import *
 # 有关 图表的 操作类的包

upplib/config_data.py

@@ -0,0 +1,71 @@
+from upplib import *
+from upplib.common_package import *
+from upplib.file import *
+
+__CONFIG_PATH = '.upp.config'
+
+__CONFIG_PATH_BAK = '_upp.config'
+
+
+# 将数据写入到 config 中
+def set_config_data(file_name: str = 'config',
+                    param: dict[str, Any] = None) -> None:
+    set_data_in_user_home(file_name, {} if param is None else param)
+
+
+# 从 config 中获得 配置数据
+def get_config_data(file_name: str = 'config') -> dict[str, Any]:
+    # print('get_config_data', file_name)
+    config_data = get_data_from_user_home(file_name)
+    # print('get_data_from_user_home', config_data)
+    if not config_data:
+        config_data = get_data_from_path(file_name)
+    # print('get_data_from_path', config_data)
+    return config_data
+
+
+# 在当前用户的主目录中, 获得指定文件的数据
+def get_data_from_user_home(file_name: str = 'config') -> dict[str, Any]:
+    return get_data_from_path(file_name, os.path.expanduser("~"))
+
+
+# 将 data 数据,在当前用户的主目录中, 获得指定文件的数据
+def set_data_in_user_home(file_name: str = 'config',
+                          param: dict[str, Any] = None) -> None:
+    set_data_in_path(file_name, {} if param is None else param, os.path.expanduser("~"))
+
+
+# 在当前的目录中, 获得指定文件的数据
+def get_data_from_path(file_name: str = 'config',
+                       file_path: str = None) -> dict[str, Any]:
+    param = get_data_from_path_detail(file_name, file_path, __CONFIG_PATH)
+    return param if param else get_data_from_path_detail(file_name, file_path, __CONFIG_PATH_BAK)
+
+
+def get_data_from_path_detail(file_name: str = 'config',
+                              file_path: str = None,
+                              path_name: str = __CONFIG_PATH) -> dict[str, Any]:
+    config_path = file_path + '/' + path_name if file_path else path_name
+    # print('config_path_1', config_path)
+    if not os.path.exists(config_path):
+        # print('config_path_2', config_path)
+        return {}
+    file_path = config_path + '/' + file_name + '.json'
+    # print('config_path_3', file_path)
+    if not os.path.exists(file_path):
+        return {}
+    # print('to_json_from_file', file_path)
+    return to_json_from_file(file_path)
+
+
+# 在当前的目录中, 设置数据到指定路径下
+def set_data_in_path(file_name: str = 'config',
+                     param: str = None,
+                     file_path: str = '') -> None:
+    config_path = file_path + '/' + __CONFIG_PATH
+    if not os.path.exists(config_path):
+        os.mkdir(config_path)
+    file_path = config_path + '/' + file_name + '.json'
+    text_file = open(file_path, 'w', encoding='utf-8')
+    text_file.write(to_str({} if param is None else param))
+    text_file.close()

upplib/file.py

@@ -1,5 +1,6 @@
 from upplib import *
 from upplib.index import *
+from upplib.index import is_win
 
 
 def get_file(file_path: str = None,

upplib/file_text.py

@@ -1,9 +1,6 @@
 from upplib import *
-from datetime import datetime, timezone, timedelta
-from typing import Any, Optional, Union
 from upplib.common_package import *
 from upplib.file import get_file
-from collections import defaultdict
 
 
 def get_latest_file(file_path: str = None,
@@ -365,8 +362,8 @@ def to_list(file_name: str = 'a.txt',
             sep_line_prefix: str = None,
             sep_line_suffix: str = None,
             sep_all: str = None,
-            ignore_start_with: list[str] | set[str] | str = None,
-            ignore_end_with: list[str] | set[str] | str | None = None,
+            line_ignore_start_with: list[str] | set[str] | str = None,
+            line_ignore_end_with: list[str] | set[str] | str | None = None,
             start_index: int = None,
             start_line: str = None,
             end_index: int = None,
@@ -410,8 +407,8 @@ def to_list(file_name: str = 'a.txt',
                             sep_line_prefix=sep_line_prefix,
                             sep_line_suffix=sep_line_suffix,
                             sep_all=sep_all,
-                            ignore_start_with=ignore_start_with,
-                            ignore_end_with=ignore_end_with,
+                            line_ignore_start_with=line_ignore_start_with,
+                            line_ignore_end_with=line_ignore_end_with,
                             start_index=start_index,
                             start_line=start_line,
                             end_index=end_index,
@@ -820,16 +817,16 @@ def to_list_from_txt(file_name: str = 'a.txt',
 # 读取文件中的数据,返回一个 str
 def to_str_from_file(file_name: str = 'a.txt',
                      str_join: str = ' ',
-                     ignore_start_with: list | int | str | None = None,
-                     ignore_end_with: list | int | str | None = None,
+                     line_ignore_start_with: list | int | str | None = None,
+                     line_ignore_end_with: list | int | str | None = None,
                      start_index: int = None,
                      start_line: str = None,
                      end_index: int = None,
                      end_line: str = None,
                      count: int = None) -> str:
     return to_data_from_file(file_name=file_name,
-                             ignore_start_with=ignore_start_with,
-                             ignore_end_with=ignore_end_with,
+                             line_ignore_start_with=line_ignore_start_with,
+                             line_ignore_end_with=line_ignore_end_with,
                              str_join=str_join,
                              start_index=start_index,
                              start_line=start_line,
@@ -851,7 +848,7 @@ def to_json_from_file(file_name: str = 'a.txt',
                              start_line=start_line,
                              end_index=end_index,
                              end_line=end_line,
-                             ignore_start_with=['//', '/*', '#'],
+                             line_ignore_start_with=['//', '/*', '#'],
                              count=count,
                              r_json=True)
 
@@ -860,8 +857,8 @@ def to_data_from_file(file_name: str = 'a.txt',
                       sep: str = None,
                       sep_line: str = None,
                       sep_all: str = None,
-                      ignore_start_with: list | int | str | None = None,
-                      ignore_end_with: list | int | str | None = None,
+                      line_ignore_start_with: list | int | str | None = None,
+                      line_ignore_end_with: list | int | str | None = None,
                       start_index: int = None,
                       start_line: str = None,
                       end_index: int = None,
@@ -884,8 +881,8 @@ def to_data_from_file(file_name: str = 'a.txt',
                 sep=sep,
                 sep_line=sep_line,
                 sep_all=sep_all,
-                ignore_start_with=ignore_start_with,
-                ignore_end_with=ignore_end_with,
+                line_ignore_start_with=line_ignore_start_with,
+                line_ignore_end_with=line_ignore_end_with,
                 start_index=start_index,
                 start_line=start_line,
                 end_index=end_index,

upplib/index.py

@@ -2,12 +2,8 @@ from upplib import *
 from datetime import datetime, timezone, timedelta
 from typing import Any, Optional, Union
 from upplib.common_package import *
-from upplib.file import get_file
 from collections import defaultdict
 
-__CONFIG_PATH = '.upp.config'
-
-__CONFIG_PATH_BAK = '_upp.config'
 
 # 创建一个线程本地存储对象
 __THREAD_LOCAL_INDEX_DATA = threading.local()
@@ -566,70 +562,6 @@ def format_sorted_kv_string(data_obj: Any,
     return sep.join(result)
 
 
-# 将数据写入到 config 中
-def set_config_data(file_name: str = 'config',
-                    param: dict[str, Any] = None) -> None:
-    set_data_in_user_home(file_name, {} if param is None else param)
-
-
-# 从 config 中获得 配置数据
-def get_config_data(file_name: str = 'config') -> dict[str, Any]:
-    # print('get_config_data', file_name)
-    config_data = get_data_from_user_home(file_name)
-    # print('get_data_from_user_home', config_data)
-    if not config_data:
-        config_data = get_data_from_path(file_name)
-    # print('get_data_from_path', config_data)
-    return config_data
-
-
-# 在当前用户的主目录中, 获得指定文件的数据
-def get_data_from_user_home(file_name: str = 'config') -> dict[str, Any]:
-    return get_data_from_path(file_name, os.path.expanduser("~"))
-
-
-# 将 data 数据,在当前用户的主目录中, 获得指定文件的数据
-def set_data_in_user_home(file_name: str = 'config',
-                          param: dict[str, Any] = None) -> None:
-    set_data_in_path(file_name, {} if param is None else param, os.path.expanduser("~"))
-
-
-# 在当前的目录中, 获得指定文件的数据
-def get_data_from_path(file_name: str = 'config',
-                       file_path: str = None) -> dict[str, Any]:
-    param = get_data_from_path_detail(file_name, file_path, __CONFIG_PATH)
-    return param if param else get_data_from_path_detail(file_name, file_path, __CONFIG_PATH_BAK)
-
-
-def get_data_from_path_detail(file_name: str = 'config',
-                              file_path: str = None,
-                              path_name: str = __CONFIG_PATH) -> dict[str, Any]:
-    config_path = file_path + '/' + path_name if file_path else path_name
-    # print('config_path_1', config_path)
-    if not os.path.exists(config_path):
-        # print('config_path_2', config_path)
-        return {}
-    file_path = config_path + '/' + file_name + '.json'
-    # print('config_path_3', file_path)
-    if not os.path.exists(file_path):
-        return {}
-    # print('to_json_from_file', file_path)
-    return to_json_from_file(file_path)
-
-
-# 在当前的目录中, 设置数据到指定路径下
-def set_data_in_path(file_name: str = 'config',
-                     param: str = None,
-                     file_path: str = '') -> None:
-    config_path = file_path + '/' + __CONFIG_PATH
-    if not os.path.exists(config_path):
-        os.mkdir(config_path)
-    file_path = config_path + '/' + file_name + '.json'
-    text_file = open(file_path, 'w', encoding='utf-8')
-    text_file.write(to_str({} if param is None else param))
-    text_file.close()
-
-
 # 执行命令
 def exec_command(command: str = None) -> None:
     if command is None:

upplib/util.py

@@ -1,5 +1,5 @@
 from upplib import *
-from upplib.clean_up_msg import *
+from upplib.file_text import *
 from datetime import datetime, timezone, timedelta
 from typing import Any, Optional, Union, Callable, List
 
@@ -50,8 +50,7 @@ def get_from_txt(file_name: str = '_start_time_end_time_str.txt',
         second : 获得时间，在 second 基础上，前后冗余多少秒
         获得日志
     """
-    date_list = to_list_from_txt(file_name)
-    date_list = list(filter(lambda x: len(x) > 0 and not str(x).strip().startswith('#'), date_list))
+    date_list = to_list_from_txt(file_name, line_ignore_start_with='#')
     if len(date_list) == 0:
         return None, None
     date_time_list = []

{upplib-3.2.2.dist-info → upplib-3.3.1.dist-info}/METADATA

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

{upplib-3.2.2.dist-info → upplib-3.3.1.dist-info}/RECORD

@@ -1,23 +1,24 @@
-upplib/__init__.py,sha256=AzQ1nB4NdyU5Kjnhi6aqjotkljhA2oNioQ1pgxpe8no,828
+upplib/__init__.py,sha256=nWtsWCkm9fxAT0JiJ22xd1kq1WD8tp8gbZanIyy5Wbo,862
 upplib/chart.py,sha256=DEcfhr1HlWdITaPWTVlL0CVSr3GiJTV_bWyOPb1UoyA,27667
 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/config_data.py,sha256=y-2S70V0jwXJXxXz2vsqCK--Heay27VnA7MGpO3a40o,2748
 upplib/db.py,sha256=-3ZALQSzP92-zIhye6ckrXIctbHsVmwoLiCVOlTyDyo,7058
-upplib/file.py,sha256=R753ZBNE1PxbWNqu9eQ8VvcimahwBkvtu4mlx3qTFoE,8643
-upplib/file_text.py,sha256=JYoRSatwPMVOqXpJ2wszfJ2pVx1Ot2rQ2Jnxm_vj_YY,43106
+upplib/file.py,sha256=-IZ8NJq7iaOG0TZbTjpgZcDFNNR-wC0-78Nyt02PReM,8675
+upplib/file_text.py,sha256=qUQZhjovV1N3oDBX14hbPCuuYeUWALiQ6WGC4z9Ksjg,43074
 upplib/format_data.py,sha256=Qxq-OZ8v6HBRJ-tUcNFem1Imbauk3Y5qJTrAGT0CC4I,10153
 upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
-upplib/index.py,sha256=VvQzOzx6vtSLAmFARplPCVNTMq0DKYpMBFRgr7ge1dc,25887
+upplib/index.py,sha256=8m1aDWEFa7_-hvsIToxFKz2VtxMNVrm1GyrQEbFF6aQ,23190
 upplib/mail.py,sha256=pe1ZZlKsah_TiB_Ag3scgiIQegyOznul2awdHur2m4Y,7550
 upplib/mail_html.py,sha256=W2_WT9WhFykmAFageboJ-6E0dnBHBGMG1vQlBb9__M8,4001
 upplib/markdown.py,sha256=YXh2Rtb5gvZ755Ecr3r5FcMoDtd2YcqtOFHFv92jWOQ,5803
 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.2.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-3.2.2.dist-info/METADATA,sha256=2xELIy6Z_vIUT8ilixMTe0IVVQz7W9CMt2eyN0v237g,940
-upplib-3.2.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-upplib-3.2.2.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-3.2.2.dist-info/RECORD,,
+upplib/util.py,sha256=oCQ84njl96A8RGnMqFl3W-2mLZEqcBmpOrK-GDCTmWk,4633
+upplib-3.3.1.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.3.1.dist-info/METADATA,sha256=tv1bswKgtakEzfUBL_e1dFMGFN2wdio0tkisRkxKY6k,940
+upplib-3.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.3.1.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.3.1.dist-info/RECORD,,