Move coloring from logger to read

Author: PabloLec

.gitignore

@@ -1,3 +1,3 @@
-__pycache__
+__pycache__/
 poetry.lock
 dev.py

livelog/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from .logger import Logger
+from livelog.logger import Logger

livelog/__main__.py

@@ -2,7 +2,7 @@
 
 from sys import argv
 from os import _exit
-from .reader import start_reader
+from livelog.reader import start_reader
 
 if __name__ == "__main__":
     if len(argv) == 1:

livelog/logger.py

@@ -32,7 +32,7 @@ def __new__(cls, *args, **kwargs):
     def __init__(
         self,
         output_file: str = None,
-        level: str = "INFO",
+        level: str = "DEBUG",
         enabled: bool = True,
         colors: bool = True,
         erase: bool = True,
@@ -42,7 +42,7 @@ def __init__(
 
         Args:
             output_file (str, optional): Output file path. Defaults to None.
-            level (str, optional): Minimum log level. Defaults to "INFO".
+            level (str, optional): Minimum log level. Defaults to "DEBUG".
             enabled (bool, optional): Is log enabled ? Defaults to True.
             colors (bool, optional): Are colors enabled ? Defaults to True.
             erase (bool, optional): Should preexisting file be erased ? Defaults to True.
@@ -116,7 +116,7 @@ def _clear_file(self):
         with open(self._output_file, "w") as f:
             pass
 
-    def _write(self, content: str):
+    def _write(self, level: str, content: str):
         """Write provided content to output file.
 
         Args:
@@ -126,16 +126,10 @@ def _write(self, content: str):
         if not self._enabled:
             return
 
-        if self._colors:
-            time = Style.DIM + datetime.now().strftime("%H:%M:%S.%f")[:-3]
-            dash = Style.BRIGHT + " - "
-            content = f"{Style.NORMAL}{content}{Style.RESET_ALL}"
-        else:
-            time = datetime.now().strftime("%H:%M:%S.%f")[:-3]
-            dash = " - "
+        time = datetime.now().strftime("%H:%M:%S.%f")[:-3]
 
         with open(self._output_file, "a") as f:
-            f.write(f"{time}{dash}{content}\n")
+            f.write(f"{level} | {time} - {content}\n")
 
     def _is_valid_level(self, level: str):
         """Verify if the given log level should be written.
@@ -156,10 +150,7 @@ def error(self, message: str):
             message (str): Log message
         """
 
-        if self._colors:
-            self._write(content=Fore.RED + message)
-        else:
-            self._write(content="error   | " + message)
+        self._write(level="ERR!", content=message)
 
     def warn(self, message: str):
         """Write warning message.
@@ -170,10 +161,7 @@ def warn(self, message: str):
 
         if not self._is_valid_level("WARNING"):
             return
-        if self._colors:
-            self._write(content=Fore.YELLOW + message)
-        else:
-            self._write(content="warning | " + message)
+        self._write(level="WARN", content=message)
 
     def info(self, message: str):
         """Write info message.
@@ -184,10 +172,7 @@ def info(self, message: str):
 
         if not self._is_valid_level("INFO"):
             return
-        if self._colors:
-            self._write(content=Fore.BLUE + message)
-        else:
-            self._write(content="info    | " + message)
+        self._write(level="INFO", content=message)
 
     def debug(self, message: str):
         """Write debug message.
@@ -198,7 +183,4 @@ def debug(self, message: str):
 
         if not self._is_valid_level("DEBUG"):
             return
-        if self._colors:
-            self._write(content=Fore.WHITE + message)
-        else:
-            self._write(content="debug   | " + message)
+        self._write(level="DBUG", content=message)

livelog/reader.py

@@ -5,7 +5,15 @@
 from shutil import get_terminal_size
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler, DirModifiedEvent, FileModifiedEvent
-from colorama import Style
+from colorama import Style, Fore
+
+CLEAR_CMD = "cls" if name == "nt" else "clear"
+
+
+def clear():
+    """Clear terminal."""
+
+    system(CLEAR_CMD)
 
 
 def tail(file_name: str, lines: int):
@@ -28,7 +36,28 @@ def tail(file_name: str, lines: int):
             finally:
                 rows = list(f)
             pos *= 2
-    print("".join(rows[-lines:]))
+
+    colored_lines = map(color_line, rows[-lines:])
+    clear()
+    print("".join(list(colored_lines)))
+
+
+LEVEL_COLORS = {
+    "ERR!": Fore.RED,
+    "WARN": Fore.YELLOW,
+    "INFO": Fore.BLUE,
+    "DBUG": Fore.WHITE,
+}
+
+
+def color_line(line: str):
+    level = line[:4]
+
+    output = (
+        f"{Style.DIM}{line[7:19]}{Style.BRIGHT} - {Style.NORMAL}"
+        f"{LEVEL_COLORS[level]}{line[26:]}{Style.RESET_ALL}"
+    )
+    return output
 
 
 class ReadFile(FileSystemEventHandler):
@@ -44,22 +73,16 @@ def __init__(self, file: str):
         self._file = file
         self.on_modified(event=None)
 
-    def clear(self):
-        """Clear terminal."""
-
-        _ = system("cls") if name == "nt" else system("clear")
-
     def on_modified(self, event: Union[DirModifiedEvent, FileModifiedEvent, None]):
         """File modification callback.
 
         Args:
             event (Union[DirModifiedEvent, FileModifiedEvent, None]): Watchdog event
         """
 
-        self.clear()
-        print(Style.RESET_ALL)
+        print(Style.RESET_ALL, end="")
         tail(self._file, get_terminal_size(fallback=(120, 50))[1])
-        print(Style.RESET_ALL)
+        print(Style.RESET_ALL, end="")
 
 
 def start_reader(file: str):