fsvlog 0.3.2__tar.gz → 0.4.2__tar.gz

{fsvlog-0.3.2 → fsvlog-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fsvlog
-Version: 0.3.2
+Version: 0.4.2
 Summary: Advanced logging library with colored output, file rotation, and flexible configuration
 Author-email: Fsainv028 <fsainv028@gmail.com>
 Project-URL: Homepage, https://github.com/Fsainv028/FSVLog

{fsvlog-0.3.2 → fsvlog-0.4.2}/fsvlog/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.2"
 
 from typing import Tuple
 from .fsvlog import FSVLog, Colors, create_logger

{fsvlog-0.3.2 → fsvlog-0.4.2}/fsvlog/fsvlog.py

@@ -37,6 +37,15 @@ LOG_LEVELS = {
 
 
 class FSVLog:
+    _instances: Dict[str, 'FSVLog'] = {}
+
+    def __new__(cls, log_folder_path: str = "Logs", **kwargs):
+        key = f"{log_folder_path}_{kwargs.get('filename_time_format', '')}_{kwargs.get('file_only', False)}"
+        if key not in cls._instances:
+            instance = super().__new__(cls)
+            cls._instances[key] = instance
+        return cls._instances[key]
+
     def __init__(self, log_folder_path: str = "Logs", max_logs: int = 10,
                  max_file_size_mb: int = 100, log_format: str = None,
                  time_format: str = None, filename_time_format: str = None,
@@ -46,6 +55,8 @@ class FSVLog:
                  enable_global_exception_logging: bool = True,
                  exception_format: str = "compact"):
 
+        if hasattr(self, '_initialized') and self._initialized:
+            return
         if not isinstance(log_folder_path, str) or log_folder_path == "":
             raise ValueError("log_folder_path must be a non-empty string")
         if not isinstance(max_logs, int) or max_logs <= 0:
@@ -70,7 +81,7 @@ class FSVLog:
         self.max_file_size = max_file_size_mb * 1024 * 1024
         self.log_format = log_format or "{timestamp} [{level}] {message}"
         self.time_format = time_format or "%Y-%m-%dT%H:%M:%S.%f"
-        self.filename_time_format = filename_time_format or "%Y%m%d_%H%M%S_%f"
+        self.filename_time_format = filename_time_format or "%Y%m%d_%H%M%S"
         self.file_only = file_only
         self.console_only = console_only
         self.use_json = use_json
@@ -82,6 +93,7 @@ class FSVLog:
 
         self.colors = Colors()
         self._current_log_file = None
+        self._log_file_path = None
         self._bound_context = {}
         self._original_excepthook = None
 
@@ -96,6 +108,11 @@ class FSVLog:
         if enable_global_exception_logging:
             self.enable_global_exception_logging()
 
+        self._initialized = True
+
+    def __del__(self):
+        self.close()
+
     def _should_log(self, level: str) -> bool:
         return LOG_LEVELS.get(level, 20) >= self.log_level
 
@@ -118,7 +135,9 @@ class FSVLog:
         now = datetime.now()
         result = now.strftime(self.filename_time_format)
         if "%f" in self.filename_time_format:
-            result = result[:-3]
+            micro = now.microsecond
+            micro_str = f"{micro:06d}"[:3]
+            result = result.replace(f"{micro:06d}", micro_str)
         return result
 
     def _get_caller_info(self) -> Dict[str, Any]:
@@ -144,16 +163,29 @@ class FSVLog:
 
     def _open_log_file(self):
         filename = f"log_{self._get_timestamp_for_filename()}.log"
-        self.log_file_path = os.path.join(self.log_folder_path, filename)
-        self._current_log_file = open(self.log_file_path, "a", encoding="utf-8")
+        self._log_file_path = os.path.join(self.log_folder_path, filename)
+        self._current_log_file = open(self._log_file_path, "a", encoding="utf-8")
 
     def _rotate_log_file(self):
         if self._current_log_file:
             self._current_log_file.close()
+            self._current_log_file = None
 
         timestamp = self._get_timestamp_for_filename()
         rotated_name = os.path.join(self.log_folder_path, f"log_{timestamp}.log")
-        os.rename(self.log_file_path, rotated_name)
+
+        if os.path.exists(self._log_file_path):
+            try:
+                counter = 1
+                base_name = rotated_name
+                while os.path.exists(rotated_name):
+                    name, ext = os.path.splitext(base_name)
+                    rotated_name = f"{name}_{counter}{ext}"
+                    counter += 1
+                os.rename(self._log_file_path, rotated_name)
+            except Exception as e:
+                print(f"Failed to rotate log: {e}")
+
         self._open_log_file()
 
     def _manage_log_files(self):
@@ -163,11 +195,16 @@ class FSVLog:
             if os.path.isfile(os.path.join(self.log_folder_path, f)) and f.endswith('.log')
         ]
         log_files.sort(key=os.path.getctime)
+
+        current = self._log_file_path if hasattr(self, '_log_file_path') else None
+
         while len(log_files) > self.max_logs:
-            try:
-                os.remove(log_files.pop(0))
-            except Exception as e:
-                print(f"Failed to remove old log file: {e}")
+            file_to_delete = log_files.pop(0)
+            if file_to_delete != current:
+                try:
+                    os.remove(file_to_delete)
+                except Exception as e:
+                    print(f"Failed to remove old log file: {e}")
 
     def _format_log_entry(self, message: str, level: str, extra: Dict[str, Any] = None) -> str:
         timestamp = self._get_timestamp()
@@ -175,7 +212,9 @@ class FSVLog:
         context = {**self._bound_context}
         if extra:
             context.update(extra)
+
         log_type = context.pop('type', '')
+
         if self.use_json:
             log_data = {
                 "timestamp": timestamp,
@@ -201,10 +240,13 @@ class FSVLog:
         }
         try:
             result = self.log_format.format(**format_vars)
+
             if not log_type:
                 result = result.replace("[{type}]", "").replace("{type}", "").replace("  ", " ").replace("[]", "")
-                while "  " in result:
-                    result = result.replace("  ", " ")
+
+            while "  " in result:
+                result = result.replace("  ", " ")
+
             if not context_str:
                 while "  " in result:
                     result = result.replace("  ", " ")
@@ -217,7 +259,10 @@ class FSVLog:
         if self.console_only:
             return
         try:
-            if os.path.getsize(self.log_file_path) > self.max_file_size:
+            if self._current_log_file is None or self._current_log_file.closed:
+                self._open_log_file()
+
+            if os.path.getsize(self._log_file_path) > self.max_file_size:
                 self._rotate_log_file()
             self._current_log_file.write(log_entry + "\n")
             self._current_log_file.flush()
@@ -280,25 +325,12 @@ class FSVLog:
         self.exception_format = format
 
     def bind(self, **kwargs) -> 'FSVLog':
-        new_logger = FSVLog(
-            log_folder_path=self.log_folder_path,
-            max_logs=self.max_logs,
-            max_file_size_mb=self.max_file_size // (1024 * 1024),
-            log_format=self.log_format,
-            time_format=self.time_format,
-            filename_time_format=self.filename_time_format,
-            file_only=self.file_only,
-            console_only=self.console_only,
-            use_json=self.use_json,
-            log_level=self._get_log_level_name(),
-            enable_metrics=self.enable_metrics,
-            exception_format=self.exception_format
-        )
-        new_logger._bound_context = {**self._bound_context, **kwargs}
-        return new_logger
+        self._bound_context.update(kwargs)
+        return self
 
     def type(self, log_type: str) -> 'FSVLog':
-        return self.bind(type=log_type)
+        self._bound_context['type'] = log_type
+        return self
 
     def _get_log_level_name(self) -> str:
         for name, value in LOG_LEVELS.items():
@@ -361,7 +393,7 @@ class FSVLog:
         return self._log(message, level.upper(), color, extra)
 
     def get_current_log_file(self) -> str:
-        return self.log_file_path
+        return self._log_file_path
 
     def get_metrics(self) -> Dict[str, int]:
         if not self.enable_metrics:
@@ -374,7 +406,11 @@ class FSVLog:
 
     def close(self):
         if hasattr(self, '_current_log_file') and self._current_log_file:
-            self._current_log_file.close()
+            try:
+                self._current_log_file.close()
+            except Exception:
+                pass
+            self._current_log_file = None
 
 
 def create_logger(log_folder_path: str = "Logs", max_logs: int = 10, **kwargs):

{fsvlog-0.3.2 → fsvlog-0.4.2}/fsvlog.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fsvlog
-Version: 0.3.2
+Version: 0.4.2
 Summary: Advanced logging library with colored output, file rotation, and flexible configuration
 Author-email: Fsainv028 <fsainv028@gmail.com>
 Project-URL: Homepage, https://github.com/Fsainv028/FSVLog

{fsvlog-0.3.2 → fsvlog-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fsvlog"
-version = "0.3.2"
+version = "0.4.2"
 authors = [
     {name = "Fsainv028", email = "fsainv028@gmail.com"},
 ]