diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1f38e1c..3342de0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,14 @@
+
+
+
+
+
+
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a4c89ba..31c7ac3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+NewLifeUtils 5.1.6:
+ - Fix: LM - rea() print up (-------)
+ - Fix: batch install global option (-------)
+ - Fix: cstm fix (-------)
+ - Removal: batch uninstall global option (-------)
+ - Change: parse_args regex change (-------
+ )
NewLifeUtils 5.1.5:
- Fix: LM - rea() not working (-------)
diff --git a/NewLifeUtils.egg-info/PKG-INFO b/NewLifeUtils.egg-info/PKG-INFO
index 8afe38a..6eb3e8e 100644
--- a/NewLifeUtils.egg-info/PKG-INFO
+++ b/NewLifeUtils.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: NewLifeUtils
-Version: 5.1.5
+Version: 5.1.6
Summary: View changelog.txt at https://raw.githubusercontent.com/NewLife1324/NewLifeUtils-Dev/main/CHANGELOG.txt
Home-page: https://github.com/NewLife1324/NewLifeUtils-Dev
Author: New Life
diff --git a/NewLifeUtils/LoggerModule.py b/NewLifeUtils/LoggerModule.py
index 599334d..9b2ae15 100644
--- a/NewLifeUtils/LoggerModule.py
+++ b/NewLifeUtils/LoggerModule.py
@@ -1062,7 +1062,6 @@ def to_format(pattern, args):
def out(text):
-
now = datetime.datetime.now()
if enable_file_fog:
if not file_exist("log"):
@@ -1099,7 +1098,7 @@ def out(text):
{"message": message, "tag": tag_check(tag, tip_default_tag)},
)
)
-cstm = lambda pattern, text, args: out(to_format(pattern, **args))
+cstm = lambda pattern, args: out(to_format(pattern, args))
rea = lambda message, tag="", completion=None: read(message, tag, completion)
@@ -1210,7 +1209,7 @@ def smart_input(text="", completes=None, end="\n"):
readed = input()
out(
- MCC.up(2)
+ MCC.up()
+ ACC.RESET
+ MCC.ERASE_ALL_LINE
+ to_format(
diff --git a/NewLifeUtils/StringUtilModule.py b/NewLifeUtils/StringUtilModule.py
index c8cc89d..cb8c2d1 100644
--- a/NewLifeUtils/StringUtilModule.py
+++ b/NewLifeUtils/StringUtilModule.py
@@ -33,10 +33,12 @@ def parse_args(readed):
# [\"\'][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,-]*[\"\']|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,-]+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-]+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
- # [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+ (NOW)
+ # [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
+ # [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№]+
+ # [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+ (NOW)
res = re.findall(
- r"[\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?*\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'-/]+",
+ r"[\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+",
readed,
re.MULTILINE,
)
diff --git a/NewLifeUtils/__init__.py b/NewLifeUtils/__init__.py
index 18f06b0..e7dda09 100644
--- a/NewLifeUtils/__init__.py
+++ b/NewLifeUtils/__init__.py
@@ -1 +1 @@
-__version__ = "5.1.5"
+__version__ = "5.1.6"
diff --git a/NewLifeUtils/__pycache__/__init__.cpython-39.pyc b/NewLifeUtils/__pycache__/__init__.cpython-39.pyc
index 8794df7..d7285f2 100644
Binary files a/NewLifeUtils/__pycache__/__init__.cpython-39.pyc and b/NewLifeUtils/__pycache__/__init__.cpython-39.pyc differ
diff --git a/build/lib/NewLifeUtils/LoggerModule.py b/build/lib/NewLifeUtils/LoggerModule.py
index 599334d..9b2ae15 100644
--- a/build/lib/NewLifeUtils/LoggerModule.py
+++ b/build/lib/NewLifeUtils/LoggerModule.py
@@ -1062,7 +1062,6 @@ def to_format(pattern, args):
def out(text):
-
now = datetime.datetime.now()
if enable_file_fog:
if not file_exist("log"):
@@ -1099,7 +1098,7 @@ def out(text):
{"message": message, "tag": tag_check(tag, tip_default_tag)},
)
)
-cstm = lambda pattern, text, args: out(to_format(pattern, **args))
+cstm = lambda pattern, args: out(to_format(pattern, args))
rea = lambda message, tag="", completion=None: read(message, tag, completion)
@@ -1210,7 +1209,7 @@ def smart_input(text="", completes=None, end="\n"):
readed = input()
out(
- MCC.up(2)
+ MCC.up()
+ ACC.RESET
+ MCC.ERASE_ALL_LINE
+ to_format(
diff --git a/build/lib/NewLifeUtils/StringUtilModule.py b/build/lib/NewLifeUtils/StringUtilModule.py
index c8cc89d..cb8c2d1 100644
--- a/build/lib/NewLifeUtils/StringUtilModule.py
+++ b/build/lib/NewLifeUtils/StringUtilModule.py
@@ -33,10 +33,12 @@ def parse_args(readed):
# [\"\'][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,-]*[\"\']|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,-]+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-]+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
- # [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+ (NOW)
+ # [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
+ # [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№]+
+ # [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+ (NOW)
res = re.findall(
- r"[\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?*\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'-/]+",
+ r"[\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+",
readed,
re.MULTILINE,
)
diff --git a/build/lib/NewLifeUtils/__init__.py b/build/lib/NewLifeUtils/__init__.py
index 18f06b0..e7dda09 100644
--- a/build/lib/NewLifeUtils/__init__.py
+++ b/build/lib/NewLifeUtils/__init__.py
@@ -1 +1 @@
-__version__ = "5.1.5"
+__version__ = "5.1.6"
diff --git a/dist/NewLifeUtils-5.1.6-py3-none-any.whl b/dist/NewLifeUtils-5.1.6-py3-none-any.whl
new file mode 100644
index 0000000..86e9be8
Binary files /dev/null and b/dist/NewLifeUtils-5.1.6-py3-none-any.whl differ
diff --git a/dist/NewLifeUtils-5.1.6-py3.9.egg b/dist/NewLifeUtils-5.1.6-py3.9.egg
new file mode 100644
index 0000000..c29ab66
Binary files /dev/null and b/dist/NewLifeUtils-5.1.6-py3.9.egg differ
diff --git a/dist/NewLifeUtils-5.1.6.tar.gz b/dist/NewLifeUtils-5.1.6.tar.gz
new file mode 100644
index 0000000..c652ca6
Binary files /dev/null and b/dist/NewLifeUtils-5.1.6.tar.gz differ
diff --git a/menu.bat b/menu.bat
index b41a8c5..3f2ee2a 100644
--- a/menu.bat
+++ b/menu.bat
@@ -13,7 +13,7 @@ ECHO + 2 - Start compile for Tests + CTEST +
ECHO + 3 - Publish to real + PREAL +
ECHO + 4 - Publish to test + PTEST +
ECHO + 5 - Install to global + INGLB +
-ECHO + 6 - Uninstall from global + UNGLB +
+ECHO + - Uninstall from global + UNGLB +
ECHO + 7 - Install to env + INENV +
ECHO + 8 - Uninstall from env + UNENV +
ECHO + 9 - Run test from env + RTEST +
@@ -29,7 +29,6 @@ IF %M%==2 GOTO CTEST
IF %M%==3 GOTO PREAL
IF %M%==4 GOTO PTEST
IF %M%==5 GOTO INGLB
-IF %M%==6 GOTO UNGLB
IF %M%==7 GOTO INENV
IF %M%==8 GOTO UNENV
IF %M%==9 GOTO RTEST
@@ -38,6 +37,11 @@ IF %M%==- GOTO INEWE
IF %M%=='' GOTO EOF
GOTO MENU
:CPIPY
+ECHO STARTING CLEAR ----------------------
+RD dist /s /q
+RD build /s /q
+RD "NewLifeUtils.egg-info" /s /q
+ECHO FINISHING CLEAR ---------------------
python setup.py sdist bdist_wheel
GOTO MENU
:CTEST
@@ -50,16 +54,12 @@ GOTO MENU
twine upload --repository testpypi dist/*
GOTO MENU
:INGLB
+pip uninstall newlifeutils --yes
+ECHO FINISHING UNINSTALL -----------------
python setup.py install
GOTO MENU
-:UNGLB
-python setup.py uninstall
-GOTO MENU
:INENV
-env\Scripts\python setup.py install
-GOTO MENU
-:UNENV
-env\Scripts\python setup.py uninstall
+env\Scripts\python setup.py install --upgrade
GOTO MENU
:RTEST
env\Scripts\python test.py