upplib 3.1.9__tar.gz → 3.2.1__tar.gz

{upplib-3.1.9 → upplib-3.2.1}/PKG-INFO

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

{upplib-3.1.9 → upplib-3.2.1}/upplib/file_text.py

@@ -583,9 +583,9 @@ 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_empty: bool | None = None,
+                     line_ignore_start_with: list | int | str = None,
+                     line_ignore_end_with: list | int | str = None,
+                     line_ignore_empty: bool | None = None,
                      line_join: str = None,
                      line_must_start_with: str = None,
                      line_must_contain: str = None,
@@ -609,9 +609,11 @@ def to_list_from_txt(file_name: str = 'a.txt',
     sep_line_suffix            : 这一行是一个分隔符,以这个分隔符作为后缀的, 将 list(str) 转化为 list(list(str))
     sep_is_front               : 这一行，分割行，是包含到前面，还是包含到
     sep_all                    : 将文件转化成一个字符串,然后对这个字符串,再次总体分割 将 list(str) 转化为 str , 然后再次转化成 list(str)
-    ignore_start_with          : 忽略以这个为开头的行
-    ignore_end_with            : 忽略以这个为结尾的行
-    ignore_empty               : 如果这一行为空，就忽略这行
+    line_ignore_start_with     : 忽略以这个为开头的行
+    line_ignore_end_with       : 忽略以这个为结尾的行
+    line_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开始标号 , 包含这一行
@@ -662,25 +664,34 @@ def to_list_from_txt(file_name: str = 'a.txt',
             continue
         c += 1
         can_add = True
-        if ignore_start_with is not None:
-            if isinstance(ignore_start_with, list) or isinstance(ignore_start_with, set):
-                for ss in ignore_start_with:
+        if line_ignore_start_with is not None:
+            if isinstance(line_ignore_start_with, list) or isinstance(line_ignore_start_with, set):
+                for ss in line_ignore_start_with:
                     if line.startswith(str(ss)):
                         can_add = False
-            elif isinstance(ignore_start_with, str):
-                if line.startswith(str(ignore_start_with)):
+            elif isinstance(line_ignore_start_with, str):
+                if line.startswith(str(line_ignore_start_with)):
                     can_add = False
-        if ignore_end_with is not None:
-            if isinstance(ignore_end_with, list) or isinstance(ignore_end_with, set):
-                for ss in ignore_end_with:
+        if line_ignore_end_with is not None:
+            if isinstance(line_ignore_end_with, list) or isinstance(line_ignore_end_with, set):
+                for ss in line_ignore_end_with:
                     if line.endswith(str(ss)):
                         can_add = False
-            elif isinstance(ignore_end_with, str):
-                if line.endswith(str(ignore_end_with)):
+            elif isinstance(line_ignore_end_with, str):
+                if line.endswith(str(line_ignore_end_with)):
                     can_add = False
-        if ignore_empty is not None and ignore_empty:
+        if line_ignore_empty is not None and line_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.9 → upplib-3.2.1}/upplib.egg-info/PKG-INFO

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