upplib 3.2.4__py3-none-any.whl → 3.2.6__py3-none-any.whl

upplib/file_text.py

@@ -365,8 +365,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 +410,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,

upplib/util.py

@@ -1,4 +1,5 @@
 from upplib import *
+from upplib.file_text import to_list_from_txt
 from upplib.clean_up_msg import *
 from datetime import datetime, timezone, timedelta
 from typing import Any, Optional, Union, Callable, List
@@ -50,8 +51,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.4.dist-info → upplib-3.2.6.dist-info}/METADATA

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

{upplib-3.2.4.dist-info → upplib-3.2.6.dist-info}/RECORD

@@ -5,7 +5,7 @@ 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=-IZ8NJq7iaOG0TZbTjpgZcDFNNR-wC0-78Nyt02PReM,8675
-upplib/file_text.py,sha256=JYoRSatwPMVOqXpJ2wszfJ2pVx1Ot2rQ2Jnxm_vj_YY,43106
+upplib/file_text.py,sha256=yfjGk4eXRPCESpkLVzSXtbzVwCjD3qQ5SRjwThiUe1Y,43136
 upplib/format_data.py,sha256=Qxq-OZ8v6HBRJ-tUcNFem1Imbauk3Y5qJTrAGT0CC4I,10153
 upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
 upplib/index.py,sha256=hNCiWTRpIMNdMqgtcHdGdDtI_xS4C3Y8xmaXf1MHHqg,25854
@@ -15,9 +15,9 @@ 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.4.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-3.2.4.dist-info/METADATA,sha256=PDeL7p5A4yFt7i5yGCKrTxf0M6lQvE1HbJ7MlixH13w,940
-upplib-3.2.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-upplib-3.2.4.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-3.2.4.dist-info/RECORD,,
+upplib/util.py,sha256=DM3jzU3x7nDuQBURDOqjzHyzkR0mM91k3h7FPgfNLxs,4682
+upplib-3.2.6.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.2.6.dist-info/METADATA,sha256=qo6lIGqQMdenlz3X_lNAf_9PO1ut7p5LoJA_SUXE7zI,940
+upplib-3.2.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.2.6.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.2.6.dist-info/RECORD,,