upplib 3.1.8__tar.gz → 3.2.0__tar.gz

{upplib-3.1.8 → upplib-3.2.0}/PKG-INFO

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

{upplib-3.1.8 → upplib-3.2.0}/upplib/__init__.py

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

{upplib-3.1.8 → upplib-3.2.0}/upplib/file_text.py

@@ -583,8 +583,8 @@ def to_list_from_txt(file_name: str = 'a.txt',
                      sep_line_with_space_count: int = None,
                      sep_is_front: bool = True,
                      sep_all: str = None,
-                     ignore_start_with: list | int | str | None = None,
-                     ignore_end_with: list | int | str | None = None,
+                     ignore_start_with: list | int | str = None,
+                     ignore_end_with: list | int | str = None,
                      ignore_empty: bool | None = None,
                      line_join: str = None,
                      line_must_start_with: str = None,
@@ -612,6 +612,8 @@ def to_list_from_txt(file_name: str = 'a.txt',
     ignore_start_with          : 忽略以这个为开头的行
     ignore_end_with            : 忽略以这个为结尾的行
     ignore_empty               : 如果这一行为空，就忽略这行
+    line_must_start_with       : 这一行必须以这个字符串为开始
+    line_must_contain          : 这一行必须包含这个字符串
     line_join                  : 将 list(list(str)) 转化成 list(str) 类型的数据
     line_json                  : 将 list(str) 转化成 list(json) 类型的数据, 会自动过滤掉空格行
     start_index                : 从这个地方开始读取,从1开始标号 , 包含这一行
@@ -679,8 +681,17 @@ def to_list_from_txt(file_name: str = 'a.txt',
                 if line.endswith(str(ignore_end_with)):
                     can_add = False
         if ignore_empty is not None and ignore_empty:
+            # 忽略空行
             if len(line) == 0:
                 can_add = False
+        if line_must_start_with is not None:
+            # 必须以这个字符串为开始
+            if not line.startswith(str(line_must_start_with)):
+                can_add = False
+        if line_must_contain is not None:
+            # 必须包含这个字符串
+            if line.count(str(line_must_contain)) == 0:
+                can_add = False
         if can_add:
             data_list.append(line)
 

{upplib-3.1.8 → upplib-3.2.0}/upplib.egg-info/PKG-INFO

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