LogFly 2.3__tar.gz → 2.5__tar.gz

{logfly-2.3/src/logfly.egg-info → logfly-2.5}/PKG-INFO

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 2.3
+Version: 2.5
 Summary: A simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
 Author-email: orisui@icloud.com
-License: UNKNOWN
 Project-URL: Github, https://github.com/tinqlo/logfly
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -15,7 +13,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# logfly  2.3  
+# logfly  2.4  
 ### a simple log tool by python.  
 
 ## position  
@@ -53,5 +51,3 @@ if use hidden, log will also appear in user/.1o9f1y folder.
 #### Description  
     pathfile is the file path that you want to create, must fill with '//'  
     filenname is the file name that you want to create, must is with '*.*'  
-
-

{logfly-2.3 → logfly-2.5}/README.md

@@ -1,4 +1,4 @@
-# logfly  2.3  
+# logfly  2.4  
 ### a simple log tool by python.  
 
 ## position  

{logfly-2.3 → logfly-2.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="logfly",
-    version="2.3",
+    version="2.5",
     author="Yuan Sui",
     author_email="orisui@icloud.com",
     description="A simple log tool by python",

{logfly-2.3 → logfly-2.5}/src/logfly/__init__.py

@@ -1,25 +1,28 @@
 #####################
 # Author: Yuki Sui
-# Date: 2022-4-1
+# Date: 2023-8-7
 #####################
 
 import time
 import shutil
 import os
 from pathlib import Path
+import subprocess
+
 try:
     from colorama import init
+
     __colorama_init__ = True
-except Exception:
+except ModuleNotFoundError:
     __colorama_init__ = False
     pass
 
-if __colorama_init__ == True:
+if __colorama_init__:
     init(autoreset=True)
 else:
     pass
 
-__version__ = '2.3'
+__version__ = '2.5'
 
 
 def create_or_check_file(pathorfile, name, warning='yes'):
@@ -145,13 +148,15 @@ def write_log(name, position, level, message, mode='add',
             elif color == 'yes':
                 LogFlyMessage = name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + \
                                 '\r\n '
-                if __colorama_init__ == True:
+                if __colorama_init__:
                     if str.upper(level) == 'INFO':
                         print(f'\033[0;34m{LogFlyMessage}\033[0m')
                     elif str.upper(level) == 'WARNING':
                         print(f'\033[0;33m{LogFlyMessage}\033[0m')
                     elif str.upper(level) == 'ERROR':
                         print(f'\033[0;31m{LogFlyMessage}\033[0m')
+                    elif str.upper(level) == 'PASS':
+                        print(f'\033[0;32m{LogFlyMessage}\033[0m')
                     else:
                         print(f'\033[0;37m{LogFlyMessage}\033[0m')
                 else:
@@ -170,6 +175,8 @@ def write_log(name, position, level, message, mode='add',
                     File = open(LOGFILE2, 'a', newline='', encoding='utf-8')
                     File.write(get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
                     File.close()
+                elif hidden == 'no':
+                    pass
                 else:
                     mesg = str(message) + '\r\n\r\n'
                     print(mesg)
@@ -195,13 +202,15 @@ def write_log(name, position, level, message, mode='add',
             elif color == 'yes':
                 LogFlyMessage = name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + \
                                 '\r\n '
-                if __colorama_init__ == True:
+                if __colorama_init__:
                     if str.upper(level) == 'INFO':
                         print(f'\033[0;34m{LogFlyMessage}\033[0m')
                     elif str.upper(level) == 'WARNING':
                         print(f'\033[0;33m{LogFlyMessage}\033[0m')
                     elif str.upper(level) == 'ERROR':
                         print(f'\033[0;31m{LogFlyMessage}\033[0m')
+                    elif str.upper(level) == 'PASS':
+                        print(f'\033[0;32m{LogFlyMessage}\033[0m')
                     else:
                         print(f'\033[0;37m{LogFlyMessage}\033[0m')
                 else:
@@ -255,7 +264,25 @@ def mv_file(original_file_name, new_file_name, folder_name='mv_file'):
     write_log('logfly-log', 'CLI', 'error', message, folder_name=folder_name)
 
 
-def error(exp,linenum, mode='logfly'):
+def run_cmd(cmd):
+    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    while True:
+        result = p.stdout.readline()  # 默认获取到的是二进制内容
+        if result != b'':  # 获取内容不为空时
+            try:
+                print(result.decode('gbk').strip('\r\n'))  # 处理GBK编码的输出，去掉结尾换行
+                write_log('logfly-log', 'file', 'info', message=result.decode('gbk').strip('\r\n'))
+                return result.decode('gbk').strip('\r\n')
+            except Exception as e:
+                print(e)
+                print(result.decode('utf-8').strip('\r\n'))  # 如果GBK解码失败再尝试UTF-8解码
+                write_log('logfly-log', 'file', 'info', message=result.decode('utf-8').strip('\r\n'))
+                return result.decode('utf-8').strip('\r\n')
+        else:
+            break
+
+
+def error(exp, linenum, mode='logfly'):
     if mode == 'logfly':
         logflyErrorMessage = 'ERROR occurred! at row ' + str(linenum) + '\r\n\r\n' + str(
             exp) + "\r\n\r\nplease re-check it! \r\nAnd you can see the " \
@@ -274,4 +301,5 @@ class ParameterERROR(Exception):
 
 
 if __name__ == '__main__':
-    write_log('logfly-log', 'CLI', 'error', 'test', hidden='yes')
+    # write_log('logfly-log', 'CLI', 'pass', 'test', hidden='yes')
+    run_cmd("echo 111111")

{logfly-2.3 → logfly-2.5/src/logfly.egg-info}/PKG-INFO

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 2.3
+Version: 2.5
 Summary: A simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
 Author-email: orisui@icloud.com
-License: UNKNOWN
 Project-URL: Github, https://github.com/tinqlo/logfly
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -15,7 +13,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# logfly  2.3  
+# logfly  2.4  
 ### a simple log tool by python.  
 
 ## position  
@@ -53,5 +51,3 @@ if use hidden, log will also appear in user/.1o9f1y folder.
 #### Description  
     pathfile is the file path that you want to create, must fill with '//'  
     filenname is the file name that you want to create, must is with '*.*'  
-
-