LogFly 1.9__tar.gz → 2.0__tar.gz

{logfly-1.9/src/logfly.egg-info → logfly-2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 1.9
+Version: 2.0
 Summary: A simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
@@ -15,20 +15,20 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# logfly  1.9  
-### a simple log tool by python  
+# logfly  2.0  
+### a simple log tool by python.  
 
 ## position  
 log will create in ./logs/[folder_name]/[date] folder.  
-if use hidden, log will also appear in user/.1o9f1y folder  
+if use hidden, log will also appear in user/.1o9f1y folder.  
 
 ## How to  
 ### import  
     import logfly  
-### use1  
+### write log    
     logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes', str_message='yes')  
 
-## Description  
+#### Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
     where: ('CLI', 'fileCLI', 'file') position where log appear.  
             fileCLI means log will appear in command line window and log file.  
@@ -43,15 +43,15 @@ if use hidden, log will also appear in user/.1o9f1y folder
     color: ('yes', 'no') default is 'yes', means log will with color.  
     str_message: ('yes', 'no') default is 'yes', means log will print message with str()  
 
-###use2  
-    lcreate_or_check_file(pathorfile, name, warning='Yes'): 
+### use2  
+    create_or_check_file(pathorfile, name, warning='yes'): 
         create or check file.  
-        pathorfile: (any str) path or file name.  
+        pathorfile: ('file', 'path') choose to create file or path.  
         name: (any str) file or path name.  
-        if warning is 'Yes', will print warning message if file is exist.  
+        if warning is 'yes', will print warning message if file or path is exist.  
 
-##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 *.*  
+#### 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-1.9 → logfly-2.0}/README.md

@@ -1,17 +1,17 @@
-# logfly  1.9  
-### a simple log tool by python  
+# logfly  2.0  
+### a simple log tool by python.  
 
 ## position  
 log will create in ./logs/[folder_name]/[date] folder.  
-if use hidden, log will also appear in user/.1o9f1y folder  
+if use hidden, log will also appear in user/.1o9f1y folder.  
 
 ## How to  
 ### import  
     import logfly  
-### use1  
+### write log    
     logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes', str_message='yes')  
 
-## Description  
+#### Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
     where: ('CLI', 'fileCLI', 'file') position where log appear.  
             fileCLI means log will appear in command line window and log file.  
@@ -26,13 +26,13 @@ if use hidden, log will also appear in user/.1o9f1y folder
     color: ('yes', 'no') default is 'yes', means log will with color.  
     str_message: ('yes', 'no') default is 'yes', means log will print message with str()  
 
-###use2  
-    lcreate_or_check_file(pathorfile, name, warning='Yes'): 
+### use2  
+    create_or_check_file(pathorfile, name, warning='yes'): 
         create or check file.  
-        pathorfile: (any str) path or file name.  
+        pathorfile: ('file', 'path') choose to create file or path.  
         name: (any str) file or path name.  
-        if warning is 'Yes', will print warning message if file is exist.  
+        if warning is 'yes', will print warning message if file or path is exist.  
 
-##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 *.*  
+#### 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-1.9 → logfly-2.0}/setup.py

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

{logfly-1.9 → logfly-2.0}/src/logfly/__init__.py

@@ -1,6 +1,6 @@
 #####################
 # Author: Yuki Sui
-# Date: 2022-1-30
+# Date: 2022-3-4
 #####################
 
 import time
@@ -10,10 +10,10 @@ from pathlib import Path
 from colorama import init
 
 init(autoreset=True)
-__version__ = '1.9'
+__version__ = '2.0'
 
 
-def create_or_check_file(pathorfile, name, warning='Yes'):
+def create_or_check_file(pathorfile, name, warning='yes'):
     try:
         if pathorfile == 'file':
             if not os.path.exists(name):
@@ -34,7 +34,8 @@ def create_or_check_file(pathorfile, name, warning='Yes'):
         else:
             raise ParameterERROR('function create_or_check_file Parameter error! warning must be "yes" or "no"! ')
     except Exception as e:
-        error(e)
+        linenum = e.__traceback__.tb_lineno
+        error(e, linenum)
 
 
 def create_log_folder(folder_name, hidden):
@@ -72,7 +73,27 @@ def get_time(flag):
             raise ParameterERROR('function get_time Parameter error! flag must be "datetime", "date", "times", '
                                  '"datetimefile","timestamp"! ')
     except Exception as e:
-        error(e)
+        linenum = e.__traceback__.tb_lineno
+        error(e, linenum)
+
+
+def time_transfer(time_stamp, flag='timestamp2datetime'):
+    try:
+        if flag == 'timestamp2datetime':
+            if len(str(time_stamp)) == 10:
+                return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time_stamp))
+            elif len(str(time_stamp)) == 13:
+                return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time_stamp / 1000))
+            else:
+                raise ParameterERROR('function time_transfer Parameter error! time_stamp must be 10 bits or 13 bits! ')
+        elif flag == 'datetime2timestamp':
+            return time.mktime(time.strptime(time_stamp, "%Y-%m-%d %H:%M:%S"))
+        else:
+            raise ParameterERROR('function time_transfer Parameter error! flag must be "timestamp2datetime" or '
+                                 '"datetime2timestamp"! ')
+    except Exception as e:
+        linenum = e.__traceback__.tb_lineno
+        error(e, linenum)
 
 
 # noinspection PyTypeChecker
@@ -188,7 +209,8 @@ def write_log(name, position, level, message, mode='add',
         else:
             raise ParameterERROR('function write_log Parameter error! position must be "file" or "fileCLI"! ')
     except Exception as e:
-        error(e, 'only print')
+        linenum = e.__traceback__.tb_lineno
+        error(e, linenum, 'only print')
 
 
 def mv_file(original_file_name, new_file_name, folder_name='mv_file'):
@@ -197,9 +219,9 @@ 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, mode='logfly'):
+def error(exp,linenum, mode='logfly'):
     if mode == 'logfly':
-        logflyErrorMessage = 'ERROR occurred!\r\n\r\n' + str(
+        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 " \
                    "manual at " \
                    "https://github.com/tinqlo/logfly "
@@ -213,4 +235,3 @@ def error(exp, mode='logfly'):
 class ParameterERROR(Exception):
     def __init__(self, message):
         self.message = message
-

{logfly-1.9 → logfly-2.0/src/logfly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logfly
-Version: 1.9
+Version: 2.0
 Summary: A simple log tool by python
 Home-page: https://about.guki.me
 Author: Yuan Sui
@@ -15,20 +15,20 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# logfly  1.9  
-### a simple log tool by python  
+# logfly  2.0  
+### a simple log tool by python.  
 
 ## position  
 log will create in ./logs/[folder_name]/[date] folder.  
-if use hidden, log will also appear in user/.1o9f1y folder  
+if use hidden, log will also appear in user/.1o9f1y folder.  
 
 ## How to  
 ### import  
     import logfly  
-### use1  
+### write log    
     logfly.write_log('name', 'where', 'info', 'message', mode='add', folder_name='logflys', hidden='no', color='yes', str_message='yes')  
 
-## Description  
+#### Description  
     name: (any str) logfile name, you can use diffrent string to create diffrent logfile.  
     where: ('CLI', 'fileCLI', 'file') position where log appear.  
             fileCLI means log will appear in command line window and log file.  
@@ -43,15 +43,15 @@ if use hidden, log will also appear in user/.1o9f1y folder
     color: ('yes', 'no') default is 'yes', means log will with color.  
     str_message: ('yes', 'no') default is 'yes', means log will print message with str()  
 
-###use2  
-    lcreate_or_check_file(pathorfile, name, warning='Yes'): 
+### use2  
+    create_or_check_file(pathorfile, name, warning='yes'): 
         create or check file.  
-        pathorfile: (any str) path or file name.  
+        pathorfile: ('file', 'path') choose to create file or path.  
         name: (any str) file or path name.  
-        if warning is 'Yes', will print warning message if file is exist.  
+        if warning is 'yes', will print warning message if file or path is exist.  
 
-##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 *.*  
+#### 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 '*.*'