MapleX 3.1.0.dev4__py3-none-any.whl → 3.1.0.dev5__py3-none-any.whl

maplex/__init__.py

@@ -52,7 +52,7 @@ __all__ = [
     'winUnHide'
 ]
 
-__version__ = "3.1.0.dev4"
+__version__ = "3.1.0.dev5"
 __author__ = "Ryuji Hazama"
 __license__ = "MIT"
 

maplex/library/logger/__init__.py

@@ -3,11 +3,13 @@ Split mapleLogger.py into multiple files for better organization and maintainabi
 """
 
 from .config import LoggerConfig
+from .file_handler import FileHandler
 from .formatter import Formatter
 from .log_levels import LogLevel
 from .utilities import *
 
 __all__ = [
+    "FileHandler",
     "Formatter",
     "LoggerConfig",
     "LogLevel",

maplex/library/logger/consts.py

@@ -22,4 +22,7 @@ CALLER_NAME = "CallerName"
 PROCESS_ID = "pid"
 
 FILE_FORMAT = '({pid}) {timestamp} [{level}]{func} {callerName}{callerFunc}({callerLine})'
-CONSOLE_FORMAT = '[{level}]{func} {callerFunc}{callerLine}'
+CONSOLE_FORMAT = '[{level}]{func} {callerFunc}{callerLine}'
+
+FILE_MODE_OVERWRITE = 'overwrite'
+FILE_MODE_DAILY = 'daily'

maplex/library/logger/file_handler.py

@@ -1,3 +1,103 @@
+from datetime import datetime
+import os
+import pathlib
+import sys
+
+sys.path.append(str(pathlib.Path(__file__).parent.parent.parent))
+
+from .consts import *
+from mapleExceptions import MapleLoggerException
+
 """
 File handler for logging.
-"""
+"""
+
+class FileHandler:
+    
+    """
+    FileHandler handles log file size management for the Logger class. It checks the size of the log file and creates a new one if the size exceeds the specified limit.
+    """
+
+    def __init__(
+            self,
+            logFilePath: str,
+            maxFileSize: int,
+            fileMode: str
+    ) -> None:
+
+        """
+        Initialize a FileHandler instance.
+
+        :param logFilePath: The path to the log file.
+        :param maxFileSize: The maximum size of the log file in bytes.
+        """
+
+        self.logFilePath = logFilePath
+        self.maxFileSize = maxFileSize
+        self.fileMode = fileMode
+
+    def __file_size_exceeded(self) -> bool:
+
+        """
+        Check if the log file exists and if its size exceeds the maximum file size.
+        :return: True if the file size exceeds the maximum, False otherwise.
+        """
+        
+        if os.path.exists(self.logFilePath):
+            
+            fileSize = os.path.getsize(self.logFilePath)
+            return fileSize >= self.maxFileSize
+
+        return False
+
+    def __overwrite_log_file(self) -> None:
+
+        """
+        Overwrite the log file by swapping the current log file with a new one.
+        The old log file is renamed with "_old" suffix and a new log file is created with the original name.
+        """
+
+        oldLogFilePath = self.logFilePath + "_old"
+
+        if os.path.exists(oldLogFilePath):
+            os.remove(oldLogFilePath)
+
+        os.rename(self.logFilePath, oldLogFilePath)
+
+    async def check_file_size(self) -> None:
+
+        """
+        Check the log file size and create a new log file if the size exceeds the maximum file size.
+        """
+
+        try:
+
+            if self.maxFileSize < 1 or not self.__file_size_exceeded():
+                return
+            
+            if self.fileMode == FILE_MODE_OVERWRITE:
+
+                self.__overwrite_log_file()
+                return
+
+            if self.fileMode == FILE_MODE_DAILY:
+
+                dateStr = ""
+
+            else:
+
+                dateStr = f"_{datetime.now():%Y%m%d_%H%M%S}"
+
+            i = 0
+            logCopyFilePath = f"{self.logFilePath}{dateStr}{i}.log"
+
+            while os.path.exists(logCopyFilePath):
+
+                i += 1
+                logCopyFilePath = f"{self.logFilePath}{dateStr}{i}.log"
+
+            os.rename(self.logFilePath, logCopyFilePath)
+
+        except Exception as e:
+
+            raise MapleLoggerException(f"Failed to manage log file size: {e}")

maplex/mapleLogger.py

@@ -55,6 +55,11 @@ class Logger:
             }
             self.config = LoggerConfig(loggerParams)
             self.formatter = Formatter(self.config.serialize())
+            self.fileHandler = FileHandler(
+                logFilePath=self.config.logfile,
+                maxFileSize=self.config.maxLogSize,
+                fileMode=self.config.fileMode
+            )
             self.DEFAULT_CALLER_DEPTH = 3
 
         except Exception as ex:
@@ -181,51 +186,12 @@ class Logger:
                         if i == 2:
                             raise
 
+            self.fileHandler.check_file_size()
+
         except Exception as ex:
 
             raise MapleLoggerException(f"Failed to write log: {ex}") from ex
 
-        if self.config.maxLogSize > 0:
-
-            # Check file size
-
-            try:
-
-                if path.exists(self.config.logfile) and path.getsize(self.config.logfile) > self.config.maxLogSize:
-
-                    # Rename log file
-
-                    if self.config.fileMode == "overwrite":
-
-                        if path.isfile(f"{self.config.logfile}_old.log"):
-
-                            os.remove(f"{self.config.logfile}_old.log")
-
-                        os.rename(self.config.logfile, f"{self.config.logfile}_old.log")
-                        return
-
-                    elif self.config.fileMode == "daily":
-
-                        dateStr = ""
-
-                    else:
-
-                        dateStr = f"_{datetime.now():%Y%m%d_%H%M%S}"
-                    
-                    i = 0
-                    logCopyFile = f"{self.config.logfile}{dateStr}{i}.log"
-
-                    while path.isfile(logCopyFile):
-
-                        i += 1
-                        logCopyFile = f"{self.config.logfile}{dateStr}{i}.log"
-
-                    os.rename(self.config.logfile, logCopyFile)
-
-            except Exception as ex:
-
-                raise MapleLoggerException(f"Failed to rotate log file: {ex}") from ex
-
     #
     ################################
     # Trace

{maplex-3.1.0.dev4.dist-info → maplex-3.1.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapleX
-Version: 3.1.0.dev4
+Version: 3.1.0.dev5
 Summary: A Python library for simple logging, json file operations, Maple file format operations, and console color utilities.
 Author: Ryuji Hazama
 Project-URL: PyPI, https://pypi.org/project/MapleX/

{maplex-3.1.0.dev4.dist-info → maplex-3.1.0.dev5.dist-info}/RECORD

@@ -1,19 +1,19 @@
-maplex/__init__.py,sha256=B55Sqtn9dymtvUZzDkmG9ptchfvetRl9m9Ji6hgZDIs,1881
+maplex/__init__.py,sha256=H0C9rORHtlwLhVbk4DEXHCYeBIWRqPpioh1OWSRmuqc,1881
 maplex/jsonHandler.py,sha256=HZ4uCUMzs2oaAYWgInc6gzo960q46e7IOk7tTMzqdAE,7445
 maplex/mapleColors.py,sha256=ASg-GstHkyXsq4mVMuFz8Qaq3nQeFayQWcCy9iHzjTs,1543
 maplex/mapleExceptions.py,sha256=zN-GLYNGSWalQ8GiFH-BxRzYhSfbv6V-1O3cA46yAUo,4924
-maplex/mapleLogger.py,sha256=IVzcJqch07sZ4ah6CuyeLvkInILQiPoqk10JIlaewZA,11372
+maplex/mapleLogger.py,sha256=rhSAFkrFt5vsHigvmyXaMp7kOi7LLA_oS5di6uIrYco,10380
 maplex/mapleTreeEditor.py,sha256=5596bARJWHXyGUeXWRYx9lKSfaZdBmGQLvkF_OiKzZ0,29249
 maplex/utils.py,sha256=TcUdfn9uhk9zwMTxtWgsZ1ZKdc2_i0ysgrksMbzvX1I,603
-maplex/library/logger/__init__.py,sha256=WsPn25mg8JzMHuPy94E7BapO0Z0SB5hQGiyYoAaB_1c,362
+maplex/library/logger/__init__.py,sha256=TzK7rP_gnljIa_cSpApJgxQBD4huQO9qS5HJGcyuXAI,419
 maplex/library/logger/config.py,sha256=l7YYUv3ZpO3q8Z_7SHGQ6rql8nd1-s5g9SBeZ6gZGi8,10924
-maplex/library/logger/consts.py,sha256=rRGxrzXw5WRdGI0_AK2JtXoZWQTH-EniCz0wgMQjG9M,719
-maplex/library/logger/file_handler.py,sha256=TbIgMTlZ8eR3bTP5UB9OBVF0_s1Pi299S2joRZfuRTc,33
+maplex/library/logger/consts.py,sha256=b7fn9TYjJhPgaNPCtYP6f-8SoMGclbRY7TjuyR44kMI,780
+maplex/library/logger/file_handler.py,sha256=MJpguK3oj3v3igGAQCHwtcxtLyC9bVDlUxs1ZekHPS4,2746
 maplex/library/logger/formatter.py,sha256=aThfUV9vxtcSkNNFp9ukCtZFJbuHIuZsAQjpXc03cFc,7260
 maplex/library/logger/log_levels.py,sha256=q4NpokbM6vEabLC7OS-JHZgnhbDROk0yHa5-uM3t_Uw,186
 maplex/library/logger/utilities.py,sha256=-IIPsvrebE4K2fP0fIHT-D55463Zkq3M4SlD0dEZINI,2874
-maplex-3.1.0.dev4.dist-info/licenses/LICENSE,sha256=M7R85ReZ2srvowIPO_c9sHI3DV7QmxnLH93esXVhwGI,1068
-maplex-3.1.0.dev4.dist-info/METADATA,sha256=0h2912Bm42h6kwIu1BzN9MggHgyXU99liFuMCM9yvnY,7389
-maplex-3.1.0.dev4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-maplex-3.1.0.dev4.dist-info/top_level.txt,sha256=ME8uFV82K0y0KYJrHVTMgc0hEBV67iXXUKsvom7BO5g,7
-maplex-3.1.0.dev4.dist-info/RECORD,,
+maplex-3.1.0.dev5.dist-info/licenses/LICENSE,sha256=M7R85ReZ2srvowIPO_c9sHI3DV7QmxnLH93esXVhwGI,1068
+maplex-3.1.0.dev5.dist-info/METADATA,sha256=QYh9oUNUMi-YQxFGHlyXvJA7H4Zf7x8cgVuIhwN5xyY,7389
+maplex-3.1.0.dev5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+maplex-3.1.0.dev5.dist-info/top_level.txt,sha256=ME8uFV82K0y0KYJrHVTMgc0hEBV67iXXUKsvom7BO5g,7
+maplex-3.1.0.dev5.dist-info/RECORD,,