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

maplex/__init__.py

@@ -7,7 +7,7 @@ MapleExceptions: A set of custom exceptions for handling specific error cases in
 """
 
 from .mapleColors import ConsoleColors
-from .json import MapleJson, getMapleJson
+from .jsonHandler import MapleJson, getMapleJson
 from .mapleLogger import Logger, getLogger, getDailyLogger
 from .mapleExceptions import (
     InvalidMapleFileFormatException,
@@ -52,7 +52,7 @@ __all__ = [
     'winUnHide'
 ]
 
-__version__ = "3.1.0.dev3"
+__version__ = "3.1.0.dev5"
 __author__ = "Ryuji Hazama"
 __license__ = "MIT"
 

maplex/jsonHandler.py

@@ -1,8 +1,13 @@
-import datetime
-import json
 import os
 import base64
 from cryptography.fernet import Fernet
+import datetime
+import json
+import pathlib
+import sys
+
+sys.path.append(str(pathlib.Path(__file__).parent))
+
 from mapleExceptions import *
 
 class MapleJson:
@@ -149,6 +154,13 @@ class MapleJson:
         
     def write(self, data: object, *keys: str) -> None:
 
+        """
+        Writes data to the JSON file. If keys are provided, the data will be nested accordingly.
+
+        :param data: The data to write.
+        :param keys: Optional keys to nest the data under.
+        """
+
         try:
 
             if len(keys) > 0:

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

@@ -1,12 +1,10 @@
 from datetime import datetime
-import inspect
 import os
 from os import path
 import sys
 import traceback
 from typing import Literal
 
-from .json import MapleJson
 from .library.logger import *
 from .mapleExceptions import *
 
@@ -57,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:
@@ -183,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.dev3.dist-info → maplex-3.1.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapleX
-Version: 3.1.0.dev3
+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.dev5.dist-info/RECORD

@@ -0,0 +1,19 @@
+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=rhSAFkrFt5vsHigvmyXaMp7kOi7LLA_oS5di6uIrYco,10380
+maplex/mapleTreeEditor.py,sha256=5596bARJWHXyGUeXWRYx9lKSfaZdBmGQLvkF_OiKzZ0,29249
+maplex/utils.py,sha256=TcUdfn9uhk9zwMTxtWgsZ1ZKdc2_i0ysgrksMbzvX1I,603
+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=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.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,,

maplex/json.py

@@ -1,297 +0,0 @@
-import datetime
-import json
-import os
-import base64
-from cryptography.fernet import Fernet
-from . import mapleExceptions as mExc
-
-class MapleJson:
-
-    """
-    MapleJson is a utility class for handling JSON files with optional encryption support. It provides methods to read and write JSON data, as well as manage encryption keys.
-    """
-
-    def __init__(self,
-                 filePath: str,
-                 fileEncoding: str = 'utf-8',
-                 indent: int = 4,
-                 ensureAscii: bool = False,
-                 encrypt: bool = False,
-                 key: bytes = None
-                 ) -> None:
-
-        """
-        Initialize a MapleJson instance.
-
-        :param filePath: Path to the JSON file.
-        :param fileEncoding: Encoding of the JSON file.
-        :param indent: Indentation level for JSON formatting.
-        :param ensureAscii: Whether to ensure ASCII characters in JSON.
-        :param encrypt: Whether to encrypt the JSON file.
-        :param key: Encryption key for the JSON file.
-        """
-
-        self.filePath = filePath
-        self.fileEncoding = fileEncoding
-        self.indent = indent
-        self.ensureAscii = ensureAscii
-        self.encrypt = encrypt
-        self.key = key
-        self.fernet = Fernet(key) if encrypt and key else None
-
-    #
-    #####################
-    # Getter / Setter
-
-    def getFilePath(self) -> str:
-
-        return self.filePath
-    
-    def setFilePath(self, filePath: str) -> None:
-
-        self.filePath = filePath
-
-    def getFileEncoding(self) -> str:
-
-        return self.fileEncoding
-    
-    def setFileEncoding(self, fileEncoding: str) -> None:
-
-        self.fileEncoding = fileEncoding
-
-    def getIndent(self) -> int:
-
-        return self.indent
-    
-    def setIndent(self, indent: int) -> None:
-
-        self.indent = indent
-
-    def getEnsureAscii(self) -> bool:
-
-        return self.ensureAscii
-    
-    def setEnsureAscii(self, ensureAscii: bool) -> None:
-
-        self.ensureAscii = ensureAscii
-
-    def isEncrypted(self) -> bool:
-
-        return self.encrypt
-    
-    def setEncryption(self, encrypt: bool, key: bytes | None = None) -> None:
-
-        self.encrypt = encrypt
-
-        if encrypt and not key:
-
-            raise mExc.KeyEmptyException(self.filePath)
-
-        self.key = key
-        self.fernet = Fernet(key) if encrypt and key else None
-
-    def getKey(self) -> bytes | None:
-
-        return self.key
-
-    def setKey(self, key: bytes) -> None:
-
-        self.key = key
-        self.fernet = Fernet(key) if self.encrypt and key else None
-
-    #
-    #####################
-    # Basic File Operations
-
-    def read(self, *keys: str) -> object | None:
-
-        try:
-
-            with open(self.filePath, 'rb') as file:
-
-                data = file.read()
-
-                if self.encrypt and self.fernet:
-
-                    decryptedData = self.fernet.decrypt(data)
-                    jsonData = json.loads(decryptedData.decode(self.fileEncoding))
-
-                else:
-
-                    jsonData = json.loads(data.decode(self.fileEncoding))
-
-            # Navigate through keys if provided
-
-            if keys:
-
-                for jsonKey in keys:
-
-                    if jsonData is None:
-
-                        return None
-
-                    jsonData = jsonData.get(jsonKey, None)
-
-            return jsonData
-            
-        except FileNotFoundError:
-
-            raise mExc.MapleFileNotFoundException(self.filePath)
-        
-        except Exception as e:
-
-            raise mExc.MapleException(f"Error reading JSON file: {e}")
-
-    def readOrDefault(self, default: object, *keys: str) -> object:
-
-        result = self.read(*keys)
-        return result if result is not None else default
-        
-    def write(self, data: object, *keys: str) -> None:
-
-        """
-        Writes data to the JSON file. If keys are provided, the data will be nested accordingly.
-
-        :param data: The data to write.
-        :param keys: Optional keys to nest the data under.
-        """
-
-        try:
-
-            if len(keys) > 0:
-
-                # Read existing data to preserve other keys
-
-                existingData = self.read() or {}
-
-                # Navigate to the correct location in the nested structure
-
-                currentLevel = existingData
-
-                for i, jsonKey in enumerate(keys):
-
-                    if i == len(keys) - 1:
-
-                        currentLevel[jsonKey] = data
-
-                    else:
-
-                        if jsonKey not in currentLevel or not isinstance(currentLevel[jsonKey], dict):
-
-                            currentLevel[jsonKey] = {}
-
-                        currentLevel = currentLevel[jsonKey]
-
-                dataToWrite = existingData
-
-            else:
-
-                dataToWrite = data
-
-            jsonData = json.dumps(
-                dataToWrite,
-                indent=self.indent,
-                ensure_ascii=self.ensureAscii,
-                default=self.datetimeSerializer
-            ).encode(self.fileEncoding)
-
-            if self.encrypt and self.fernet:
-
-                encryptedData = self.fernet.encrypt(jsonData)
-
-                with open(self.filePath, 'wb') as file:
-
-                    file.write(encryptedData)
-
-            else:
-
-                with open(self.filePath, 'wb') as file:
-
-                    file.write(jsonData)
-
-        except Exception as e:
-
-            raise mExc.MapleException(f"Error writing JSON file: {e}")
-
-    #
-    #####################
-    # Utility Methods
-
-    #####################
-    # Generate Encryption Key
-
-    def generateKey(self, setAsCurrent: bool = False) -> bytes:
-
-        """
-        Generates a new Fernet encryption key.
-        Args:
-            setAsCurrent (bool): If True, sets the generated key as the current key for the instance.
-        Returns:
-            bytes: The generated encryption key.
-        """
-
-        key = Fernet.generate_key()
-
-        if setAsCurrent:
-
-            self.key = key
-            self.fernet = Fernet(key)
-            self.encrypt = True
-
-        return key
-
-    def datetimeSerializer(self, obj: object) -> str:
-
-        if isinstance(obj, (datetime.datetime, datetime.date)):
-
-            return obj.isoformat()
-
-        raise TypeError(f"Type {type(obj)} not serializable")
-
-    def datetimeDeserializer(self, obj: str) -> datetime.datetime | datetime.date | str:
-
-        try:
-
-            return datetime.datetime.fromisoformat(obj)
-
-        except ValueError:
-
-            try:
-
-                return datetime.date.fromisoformat(obj)
-
-            except ValueError:
-
-                return obj
-
-_json: dict[str, MapleJson] = {}
-
-# Get or create a MapleJson instance
-
-def getMapleJson(filePath: str,
-                  fileEncoding: str = 'utf-8',
-                  indent: int = 4,
-                  ensureAscii: bool = False,
-                  encrypt: bool = False,
-                  key: bytes = None
-                  ) -> MapleJson:
-
-    if filePath not in _json:
-
-        _json[filePath] = MapleJson(filePath,
-                                    fileEncoding,
-                                    indent,
-                                    ensureAscii,
-                                    encrypt,
-                                    key)
-
-    return _json[filePath]
-
-""" * * * * * * * * * * * * * """
-"""
-ToDo list:
-
-* Json *
-
-"""
-""" * * * * * * * * * * * * * """

maplex-3.1.0.dev3.dist-info/RECORD

@@ -1,20 +0,0 @@
-maplex/__init__.py,sha256=KKQAEzHHxQQKsPx25n46VC_A0Rskamo5NARDofUkkjE,1874
-maplex/json.py,sha256=K8znWB4N0bAKAZLuMRWvjtbAGsFZibGAp151wEwyGlY,7393
-maplex/jsonHandler.py,sha256=K1iqcwp9pGJTHu4E4TmYyeIB2Er4yMdG8Nkc5EaIryc,7143
-maplex/mapleColors.py,sha256=ASg-GstHkyXsq4mVMuFz8Qaq3nQeFayQWcCy9iHzjTs,1543
-maplex/mapleExceptions.py,sha256=zN-GLYNGSWalQ8GiFH-BxRzYhSfbv6V-1O3cA46yAUo,4924
-maplex/mapleLogger.py,sha256=8HgyE83Y9ApodPEs_DwLfDYoAPeoG_QN8YhF2MU5eSk,11415
-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/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/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.dev3.dist-info/licenses/LICENSE,sha256=M7R85ReZ2srvowIPO_c9sHI3DV7QmxnLH93esXVhwGI,1068
-maplex-3.1.0.dev3.dist-info/METADATA,sha256=SnDmFrDTqD3Jmi4qXgSzU-bdXWB6yxQBJtE5aQvRDy8,7389
-maplex-3.1.0.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-maplex-3.1.0.dev3.dist-info/top_level.txt,sha256=ME8uFV82K0y0KYJrHVTMgc0hEBV67iXXUKsvom7BO5g,7
-maplex-3.1.0.dev3.dist-info/RECORD,,