LogFly 1.2__tar.gz → 1.3__tar.gz

logfly-1.3/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Yukikawa
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{logfly-1.2 → logfly-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 1.2
+Version: 1.3
 Summary: Aa simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
@@ -13,8 +13,9 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
 
-# logfly  1.1  
+# logfly  1.3  
 ### a simple log tool by python  
 
 ## position  
@@ -25,7 +26,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
 ### import  
     import logfly  
 ### use  
-    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no')  
+    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes')  
 
 ## Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
@@ -39,6 +40,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
             'new' means logfile will create when program every once.
     folder_name: (any str) custom logfly folder name, default is 'logflys'.  
     hidden: ('yes', 'no') default is 'no', means logfile will save a copy in user/.1o9f1y folder  
+    color: ('yes', 'no') default is 'yes', means log will with color.  
 
 ## Example:  
 

{logfly-1.2 → logfly-1.3}/README.md

@@ -1,4 +1,4 @@
-# logfly  1.1  
+# logfly  1.3  
 ### a simple log tool by python  
 
 ## position  
@@ -9,7 +9,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
 ### import  
     import logfly  
 ### use  
-    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no')  
+    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes')  
 
 ## Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
@@ -23,6 +23,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
             'new' means logfile will create when program every once.
     folder_name: (any str) custom logfly folder name, default is 'logflys'.  
     hidden: ('yes', 'no') default is 'no', means logfile will save a copy in user/.1o9f1y folder  
+    color: ('yes', 'no') default is 'yes', means log will with color.  
 
 ## Example:  
 

{logfly-1.2 → logfly-1.3}/setup.py

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

{logfly-1.2 → logfly-1.3}/src/logfly/__init__.py

@@ -1,12 +1,15 @@
 #####################
 # Author: Yuki Sui
-# Date: 2021-11-14
-# Version: 1.2
+# Date: 2021-12-05
+# Version: 1.3
 #####################
 
 import time
 import os
 from pathlib import Path
+from colorama import init
+
+init(autoreset=True)
 
 
 def create_log_folder(folder_name, hidden):
@@ -39,7 +42,7 @@ def get_time(flag):
         return time.strftime("%Y%m%d%H%M%S", time.localtime())
 
 
-def write_log(name, position, level, message, mode='add', folder_name='logflys', hidden='no'):
+def write_log(name, position, level, message, mode='add', folder_name='logflys', hidden='no', color='yes'):
     global LOGFILE, LOGFILE2, logfolder, logfolder_hidden, LOGFILE_hidden
     if hidden == "no":
         logfolder = '.\\logs\\' + folder_name + '\\' + get_time('date') + '\\'
@@ -52,10 +55,26 @@ def write_log(name, position, level, message, mode='add', folder_name='logflys',
     elif mode == 'new':
         LOGFILE_hidden = name + '-' + get_time('datetimefile') + '.log'
         LOGFILE = logfolder + name + '-' + get_time('datetimefile') + '.log'
+    else:
+        error()
     create_log_folder(folder_name, hidden)
     if position == 'CLI':
-        print(name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
-    if position == 'file':
+        if color == 'no':
+            print(name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
+        elif color == 'yes':
+            LogFlyMessage = name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + \
+                            '\r\n '
+            if level == 'info':
+                print(f'\033[0;34m{LogFlyMessage}\033[0m')
+            elif level == 'warning':
+                print(f'\033[0;33m{LogFlyMessage}\033[0m')
+            elif level == 'error':
+                print(f'\033[0;31m{LogFlyMessage}\033[0m')
+            else:
+                print(f'\033[0;37m{LogFlyMessage}\033[0m')
+        else:
+            error()
+    elif position == 'file':
         if mode == 'add':
             File = open(LOGFILE, 'a', newline='')
             File.write(get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
@@ -74,8 +93,24 @@ def write_log(name, position, level, message, mode='add', folder_name='logflys',
                 File = open(LOGFILE2, 'a', newline='')
                 File.write(get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
                 File.close()
-    if position == 'fileCLI':
-        print(name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
+        else:
+            error()
+    elif position == 'fileCLI':
+        if color == 'no':
+            print(name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
+        elif color == 'yes':
+            LogFlyMessage = name + ' ' + get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + \
+                            '\r\n '
+            if level == 'info':
+                print(f'\033[0;34m{LogFlyMessage}\033[0m')
+            elif level == 'warning':
+                print(f'\033[0;33m{LogFlyMessage}\033[0m')
+            elif level == 'error':
+                print(f'\033[0;31m{LogFlyMessage}\033[0m')
+            else:
+                print(f'\033[0;37m{LogFlyMessage}\033[0m')
+        else:
+            error()
         if mode == 'add':
             File = open(LOGFILE, 'a', newline='')
             File.write(get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
@@ -94,10 +129,21 @@ def write_log(name, position, level, message, mode='add', folder_name='logflys',
                 File = open(LOGFILE2, 'a', newline='')
                 File.write(get_time('datetime') + ' ' + '[' + str.upper(level) + ']' + ' ' + message + '\r\n')
                 File.close()
+        else:
+            error()
+    else:
+        error()
+
+
+def error():
+    logflyErrorMessage = 'your parameter is wrong, please re-check it!'
+    write_log('logfly-log', 'CLI', 'error', logflyErrorMessage)
 
 
 if __name__ == '__main__':
     write_log('Doctor Who', 'CLI', 'info', "this is Doctor's log, only in CLI.")
+    write_log('Doctor Who', 'CLI', 'warning', "this is Doctor's log, only in CLI.")
+    write_log('Doctor Who', 'CLI', 'error', "this is Doctor's log, only in CLI.")
     write_log('Doctor Who', 'fileCLI', 'info', "this is Doctor's log, in file and CLI.", mode='add')
     write_log('Doctor Who', 'file', 'info', "this is Doctor's log, only in file.")
     write_log('Tardis', 'CLI', 'info', "this is Tardis's log, only in CLI.")

{logfly-1.2 → logfly-1.3}/src/logfly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 1.2
+Version: 1.3
 Summary: Aa simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
@@ -13,8 +13,9 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
 
-# logfly  1.1  
+# logfly  1.3  
 ### a simple log tool by python  
 
 ## position  
@@ -25,7 +26,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
 ### import  
     import logfly  
 ### use  
-    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no')  
+    logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes')  
 
 ## Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
@@ -39,6 +40,7 @@ if use hidden, log will also appear in user/.1o9f1y folder
             'new' means logfile will create when program every once.
     folder_name: (any str) custom logfly folder name, default is 'logflys'.  
     hidden: ('yes', 'no') default is 'no', means logfile will save a copy in user/.1o9f1y folder  
+    color: ('yes', 'no') default is 'yes', means log will with color.  
 
 ## Example:  
 

{logfly-1.2 → logfly-1.3}/src/logfly.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 setup.py