upplib 3.1.9__py3-none-any.whl → 3.2.0__py3-none-any.whl

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.9.dist-info → upplib-3.2.0.dist-info}/METADATA

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

{upplib-3.1.9.dist-info → upplib-3.2.0.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=XmrIKbAaCW1WdwPxmZWPZL5YwHyQEXxiDQ6MNEf97DE,8349
-upplib/file_text.py,sha256=71sq-epXPzSjMrDVjFLtIG3TrE23eZrzANOX1YutTEg,42502
+upplib/file_text.py,sha256=RQT2owVBEe2bEGG_mvxJaJw2kX81E_P7LXD2dmXYv9g,43021
 upplib/format_data.py,sha256=Qxq-OZ8v6HBRJ-tUcNFem1Imbauk3Y5qJTrAGT0CC4I,10153
 upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
 upplib/index.py,sha256=VvQzOzx6vtSLAmFARplPCVNTMq0DKYpMBFRgr7ge1dc,25887
@@ -16,8 +16,8 @@ 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.1.9.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-3.1.9.dist-info/METADATA,sha256=JWJpbfrLIUF7B8aHc4q7QquSjtPM20b5NP8TC0wNH50,940
-upplib-3.1.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-upplib-3.1.9.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-3.1.9.dist-info/RECORD,,
+upplib-3.2.0.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.2.0.dist-info/METADATA,sha256=2rkrFNQodO146CPqtRIHxldDYmaxtuv9K_RNNPNis88,940
+upplib-3.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.2.0.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.2.0.dist-info/RECORD,,