MapleX 3.2.0.dev3__tar.gz → 3.2.0.dev4__tar.gz

{maplex-3.2.0.dev3/src/MapleX.egg-info → maplex-3.2.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapleX
-Version: 3.2.0.dev3
+Version: 3.2.0.dev4
 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.2.0.dev3 → maplex-3.2.0.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "MapleX"
-version = "3.2.0.dev3"
+version = "3.2.0.dev4"
 description = """A Python library for simple logging, json file operations, Maple file format operations, and console color utilities."""
 keywords = ["logging", "logger", "json", "file operations", "maple file format", "console colors"]
 readme = "README.md"

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4/src/MapleX.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapleX
-Version: 3.2.0.dev3
+Version: 3.2.0.dev4
 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.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/__init__.py

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

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/library/logger/config.py

@@ -30,6 +30,7 @@ class Formats(BaseModel):
 
     consoleFormat: str | None = None
     fileFormat: str | None = None
+    separator: str | None = None
     timestamp: TimeStamp | None = None
 
 class LoggerConfig(BaseModel):
@@ -70,7 +71,7 @@ class LoggerConfig(BaseModel):
             self.setOutputLogLevels(config.get(CONSOLE_LOG_LEVEL, None), config.get(FILE_LOG_LEVEL, None))
             self.setFileEncoding(config.get(FILE_ENCODING, None))
             self.setTimestampFormat(config.get(PARAM_TIMESTAMP, None))
-            self.setOutputFormat(config.get(CONSOLE_LOG_FORMAT, None), config.get(FILE_LOG_FORMAT, None))
+            self.setOutputFormat(config.get(CONSOLE_LOG_FORMAT, None), config.get(FILE_LOG_FORMAT, None), config.get(SEPARATOR, None))
             self.saveLogSettings(self.logConfInstance)
 
         except Exception as ex:
@@ -361,7 +362,7 @@ class LoggerConfig(BaseModel):
             self.formats.timestamp.timestampFormat = configTimestampFormat
             self.formats.timestamp.digits = configTimestampDigits
 
-    def setOutputFormat(self, consoleFormat: str, fileFormat: str) -> None:
+    def setOutputFormat(self, consoleFormat: str, fileFormat: str, separator: str | None = None) -> None:
 
         """Set output format for console and file logs. Default is "[{level}]{func} {callerFunc}{callerLine}" for console and "({pid}) {timestamp} [{level}]{func} {callerName}{callerFunc}({callerLine})" for file. You can set this in config file with keys "ConsoleLogFormat" and "FileLogFormat"."""
 
@@ -369,6 +370,8 @@ class LoggerConfig(BaseModel):
 
             self.formats = Formats()
 
+        # Console format
+
         if consoleFormat is not None:
 
             self.formats.consoleFormat = consoleFormat
@@ -384,6 +387,8 @@ class LoggerConfig(BaseModel):
                 formatConf[CONSOLE_LOG_FORMAT] = CONSOLE_FORMAT
                 self.logConf[FORMATS] = formatConf
 
+        # File format
+
         if fileFormat is not None:
 
             self.formats.fileFormat = fileFormat
@@ -399,6 +404,23 @@ class LoggerConfig(BaseModel):
                 formatConf[FILE_LOG_FORMAT] = FILE_FORMAT
                 self.logConf[FORMATS] = formatConf
 
+        # Message separator
+
+        if separator is not None:
+
+            self.formats.separator = separator
+
+        else:
+
+            self.formats.separator = self.logConf.get(FORMATS, {}).get(SEPARATOR, None)
+
+            if self.formats.separator is None:
+
+                self.formats.separator = DEFAULT_SEPARATOR
+                formatConf = self.logConf.get(FORMATS, {})
+                formatConf[SEPARATOR] = DEFAULT_SEPARATOR
+                self.logConf[FORMATS] = formatConf
+
     def saveLogSettings(self, logConfInstance: MapleJson | None) -> None:
 
         """ Save current log settings to config file """

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/library/logger/consts/__init__.py

@@ -19,6 +19,7 @@ __all__ = [
     "ALIGN_WIDTH",
     "CONSOLE_LOG_FORMAT",
     "FILE_LOG_FORMAT",
+    "SEPARATOR",
     "NAME_SPACES",
     "NAME_SPACE",
     # Dictionary keys for internal use
@@ -36,6 +37,7 @@ __all__ = [
     # Default values
     "FILE_FORMAT",
     "CONSOLE_FORMAT",
+    "DEFAULT_SEPARATOR",
     "TIMESTAMP_FORMAT",
     "MILLISECOND_DIGITS",
     "FILE_MODE_OVERWRITE",

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/library/logger/consts/config_keys.py

@@ -11,6 +11,7 @@ FILE_ENCODING = "FileEncoding"
 FORMATS = "Formats"
 CONSOLE_LOG_FORMAT = "ConsoleLogFormat"
 FILE_LOG_FORMAT = "FileLogFormat"
+SEPARATOR = "Separator"
 TIMESTAMP = "Timestamp"
 FORMAT = "Format"
 DIGITS = "Digits"

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/library/logger/consts/defaults.py

@@ -1,5 +1,6 @@
 FILE_FORMAT = '({pid}) {timestamp} [{level}]{func} {callerName}{callerFunc}({callerLine})'
 CONSOLE_FORMAT = '[{level}]{func} {callerFunc}{callerLine}'
+DEFAULT_SEPARATOR = ': '
 TIMESTAMP_FORMAT = "%F %X.%f"
 MILLISECOND_DIGITS = None
 FILE_MODE_OVERWRITE = 'overwrite'

{maplex-3.2.0.dev3 → maplex-3.2.0.dev4}/src/maplex/mapleLogger.py

@@ -166,7 +166,7 @@ class Logger:
 
             if loglevel >= self.config.consoleLogLevel:
                 consolePrefix = self.formatter.format_console(loglevel, callerDepth)
-                print(f"{consolePrefix}: {message}")
+                print(f"{consolePrefix}{self.config.formats.separator}{message}")
         
             if loglevel >= self.config.fileLogLevel:
 
@@ -177,7 +177,7 @@ class Logger:
                     try:
 
                         with open(self.config.logfile, "a", encoding=self.config.encoding) as f:
-                            print(f"{prefixString}: {message}", file=f)
+                            print(f"{prefixString}{self.config.formats.separator}{message}", file=f)
 
                         break