upplib 3.2.4__tar.gz → 3.2.6__tar.gz

{upplib-3.2.4 → upplib-3.2.6}/PKG-INFO

@@ -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 → upplib-3.2.6}/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-3.2.4 → upplib-3.2.6}/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 → upplib-3.2.6}/upplib.egg-info/PKG-INFO

@@ -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