Renamed the console.py classes, renamed _class to _object, added names to MultiLogger.py

This commit is contained in:
Didier Slof 2022-07-29 03:22:31 +02:00
parent b35363e9ca
commit 1cce98502f
Signed by: didier
GPG Key ID: 01E71F18AA4398E5
6 changed files with 114 additions and 102 deletions

View File

@ -5,7 +5,7 @@ from .LogLevels import Level
class Log:
def __init__(self, level: Level, text: str, *args, _class=None, _file=inspect.stack()[1].filename):
def __init__(self, level: Level, text: str, *args, _object=None, _file=inspect.stack()[1].filename):
"""
Create a log message.
"""
@ -14,17 +14,17 @@ class Log:
self.args = args
self.created_on = time.time()
self.file = _file
self._class = _class
self._object = _object
def format_time(self, fmt: str):
return datetime.datetime.fromtimestamp(self.created_on).strftime(fmt)
def class_str(self):
if self._class:
prefix = f'{type(self._class).__name__}'
if hasattr(self._class, 'name'):
if self._object:
prefix = f'{type(self._object).__name__}'
if hasattr(self._object, 'name'):
prefix += ":"
prefix += self._class.name
prefix += self._object.name
return prefix
else:
return None

View File

@ -1,7 +1,7 @@
from . import console
class Level:
def __init__(self, name: str, weight: int, short_name: str or None = None, _color: str = console.fg.white):
def __init__(self, name: str, weight: int, short_name: str or None = None, _color: str = console.FG.white):
"""
Create a logging level.
"""
@ -15,9 +15,9 @@ class Level:
basic_levels = {
'FATAL': Level('FATAL', 10, _color=(console.fg.red + console.util.bold)),
'ERROR': Level('ERROR', 3, _color=console.fg.red),
'WARNING': Level('WARNING', 2, _color=(console.fg.yellow + console.util.bold + console.util.underline)),
'INFO': Level('INFO', 1, _color=console.fg.blue),
'DEBUG': Level('DEBUG', 0, _color=console.fg.green)
'FATAL': Level('FATAL', 10, _color=(console.FG.red + console.Utils.bold)),
'ERROR': Level('ERROR', 3, _color=console.FG.red),
'WARNING': Level('WARNING', 2, _color=(console.FG.yellow + console.Utils.bold + console.Utils.underline)),
'INFO': Level('INFO', 1, _color=console.FG.blue),
'DEBUG': Level('DEBUG', 0, _color=console.FG.green)
}

View File

@ -1,7 +1,7 @@
import sys
from .Log import Log
from .LogLevels import basic_levels, Level
from .console import util
from .console import Utils
import inspect
@ -18,24 +18,24 @@ class Logger:
l_pre = f"{log.level.short} [{log.format_time('%Y-%m-%d %H:%M:%S')}] <{log.class_str() or log.file}>"
l_str = f"{log.format_text()}"
if self.do_colors:
self._print(f"{log.level.color}{l_pre}{util.reset} {l_str}")
self._print(f"{log.level.color}{l_pre}{Utils.reset} {l_str}")
else:
self._print(f'{l_pre} {l_str}')
def custom(self, level: Level, text: str, *args, _class=None, _file=inspect.stack()[1].filename):
self._log(Log(level, text, *args, _class=None, _file=inspect.stack()[1].filename))
def custom(self, level: Level, text: str, *args, _object=None, _file=inspect.stack()[1].filename):
self._log(Log(level, text, *args, _object=None, _file=inspect.stack()[1].filename))
def debug(self, text: str, *args, _class=None):
self._log(Log(basic_levels['DEBUG'], text, *args, _class=_class, _file=inspect.stack()[1].filename))
def debug(self, text: str, *args, _object=None):
self._log(Log(basic_levels['DEBUG'], text, *args, _object=_object, _file=inspect.stack()[1].filename))
def info(self, text: str, *args, _class=None):
self._log(Log(basic_levels['INFO'], text, *args, _class=_class, _file=inspect.stack()[1].filename))
def info(self, text: str, *args, _object=None):
self._log(Log(basic_levels['INFO'], text, *args, _object=_object, _file=inspect.stack()[1].filename))
def warn(self, text: str, *args, _class=None):
self._log(Log(basic_levels['WARNING'], text, *args, _class=_class, _file=inspect.stack()[1].filename))
def warn(self, text: str, *args, _object=None):
self._log(Log(basic_levels['WARNING'], text, *args, _object=_object, _file=inspect.stack()[1].filename))
def err(self, text: str, *args, _class=None):
self._log(Log(basic_levels['ERROR'], text, *args, _class=_class, _file=inspect.stack()[1].filename))
def err(self, text: str, *args, _object=None):
self._log(Log(basic_levels['ERROR'], text, *args, _object=_object, _file=inspect.stack()[1].filename))
def fatal(self, text: str, *args, _class=None):
self._log(Log(basic_levels['FATAL'], text, *args, _class=_class, _file=inspect.stack()[1].filename))
def fatal(self, text: str, *args, _object=None):
self._log(Log(basic_levels['FATAL'], text, *args, _object=_object, _file=inspect.stack()[1].filename))

View File

@ -3,8 +3,8 @@ from .Log import Log
class MultiLogger(Logger):
def __init__(self, sub_loggers: list[Logger]):
super().__init__()
def __init__(self, sub_loggers: list[Logger], _name="Generic_MultiLogger"):
super().__init__(name=_name)
self._sub_loggers = sub_loggers
def _log(self, log: Log):

View File

@ -1,93 +1,95 @@
from sys import stdout, stdin
from time import sleep
class fg:
black = "\u001b[30m"
red = "\u001b[31m"
green = "\u001b[32m"
yellow = "\u001b[33m"
blue = "\u001b[34m"
magenta = "\u001b[35m"
cyan = "\u001b[36m"
white = "\u001b[37m"
def rgb(r, g, b): return f"\u001b[38;2;{r};{g};{b}m"
class FG:
black = "\u001b[30m"
red = "\u001b[31m"
green = "\u001b[32m"
yellow = "\u001b[33m"
blue = "\u001b[34m"
magenta = "\u001b[35m"
cyan = "\u001b[36m"
white = "\u001b[37m"
class bg:
black = "\u001b[40m"
red = "\u001b[41m"
green = "\u001b[42m"
yellow = "\u001b[43m"
blue = "\u001b[44m"
magenta = "\u001b[45m"
cyan = "\u001b[46m"
white = "\u001b[47m"
def rgb(r, g, b): return f"\u001b[48;2;{r};{g};{b}m"
def rgb(r, g, b): return f"\u001b[38;2;{r};{g};{b}m"
class util:
reset = "\u001b[0m"
bold = "\u001b[1m"
underline = "\u001b[4m"
reverse = "\u001b[7m"
class BG:
black = "\u001b[40m"
red = "\u001b[41m"
green = "\u001b[42m"
yellow = "\u001b[43m"
blue = "\u001b[44m"
magenta = "\u001b[45m"
cyan = "\u001b[46m"
white = "\u001b[47m"
clear = "\u001b[2J"
clearline = "\u001b[2K"
def rgb(r, g, b): return f"\u001b[48;2;{r};{g};{b}m"
up = "\u001b[1A"
down = "\u001b[1B"
right = "\u001b[1C"
left = "\u001b[1D"
nextline = "\u001b[1E"
prevline = "\u001b[1F"
class Utils:
reset = "\u001b[0m"
bold = "\u001b[1m"
underline = "\u001b[4m"
reverse = "\u001b[7m"
top = "\u001b[0;0H"
clear = "\u001b[2J"
clear_line = "\u001b[2K"
def to(x, y):
return f"\u001b[{y};{x}H"
up = "\u001b[1A"
down = "\u001b[1B"
right = "\u001b[1C"
left = "\u001b[1D"
def write(text="\n"):
stdout.write(text)
stdout.flush()
nextline = "\u001b[1E"
prevline = "\u001b[1F"
def writew(text="\n", wait=0.5):
for char in text:
stdout.write(char)
stdout.flush()
sleep(wait)
top = "\u001b[0;0H"
def read(begin=""):
text = ""
def to(x, y):
return f"\u001b[{y};{x}H"
stdout.write(begin)
stdout.flush()
def write(text="\n"):
stdout.write(text)
stdout.flush()
while True:
char = ord(stdin.read(1))
def writew(text="\n", wait=0.5):
for char in text:
stdout.write(char)
stdout.flush()
sleep(wait)
if char == 3:
return
elif char in (10, 13):
return text
else:
text += chr(char)
def read(begin=""):
text = ""
def readw(begin="", wait=0.5):
text = ""
stdout.write(begin)
stdout.flush()
for char in begin:
stdout.write(char)
stdout.flush()
sleep(wait)
while True:
char = ord(stdin.read(1))
while True:
char = ord(stdin.read(1))
if char == 3:
return
elif char in (10, 13):
return text
else:
text += chr(char)
if char == 3:
return
elif char in (10, 13):
return text
else:
text += chr(char)
def readw(begin="", wait=0.5):
text = ""
for char in begin:
stdout.write(char)
stdout.flush()
sleep(wait)
while True:
char = ord(stdin.read(1))
if char == 3:
return
elif char in (10, 13):
return text
else:
text += chr(char)

View File

@ -6,12 +6,22 @@ from lib import console
_LOGGER = Logger("Generic")
_LOGGER.warn("This is a simple log {}", "message.")
_LOGGER.info("This is a simple log {}", "message.")
custom_level = Level("FAULTY_LEVEL", 100, "*", (console.util.underline + console.util.bold + console.fg.cyan))
custom_level = Level("FAULTY_LEVEL", 100, "*", (console.Utils.underline + console.Utils.bold + console.FG.cyan))
_LOGGER.custom(custom_level, "ok")
_temp_logger = Logger("tmp_logger", False, open("logs.log", 'a+'))
_MultiLogger = MultiLogger([_LOGGER, _temp_logger])
_MultiLogger = MultiLogger([_LOGGER, _temp_logger], "Potato")
_MultiLogger.warn("OK")
class User:
name = "faulty"
pass
u = User()
_LOGGER.info("logged in.", _object=u)