diff --git a/classes/CustomFormater.py b/classes/CustomFormater.py new file mode 100644 index 0000000..02ad065 --- /dev/null +++ b/classes/CustomFormater.py @@ -0,0 +1,24 @@ +import logging + +class CustomFormatter(logging.Formatter): + + grey = "\x1b[0;35m" + blue = "\x1b[34;20m" + yellow = "\x1b[33;20m" + red = "\x1b[31;20m" + bold_red = "\x1b[31;1m" + reset = "\x1b[0m" + format = "%(levelname)s: %(message)s (%(filename)s:%(lineno)d)" + + FORMATS = { + logging.DEBUG: blue + format + reset, + logging.INFO: grey + format + reset, + logging.WARNING: yellow + format + reset, + logging.ERROR: red + format + reset, + logging.CRITICAL: bold_red + format + reset + } + + def format(self, record): + log_fmt = self.FORMATS.get(record.levelno) + formatter = logging.Formatter(log_fmt) + return formatter.format(record) diff --git a/timer/Timer.py b/classes/Timer.py similarity index 100% rename from timer/Timer.py rename to classes/Timer.py diff --git a/csvprocess.py b/csvprocess.py index f7240d6..d35ea7c 100755 --- a/csvprocess.py +++ b/csvprocess.py @@ -8,30 +8,8 @@ import re import time import logging import argparse as arg -from timer.Timer import Timer - -class CustomFormatter(logging.Formatter): - - grey = "\x1b[0;35m" - blue = "\x1b[34;20m" - yellow = "\x1b[33;20m" - red = "\x1b[31;20m" - bold_red = "\x1b[31;1m" - reset = "\x1b[0m" - format = "%(levelname)s: %(message)s (%(filename)s:%(lineno)d)" - - FORMATS = { - logging.DEBUG: blue + format + reset, - logging.INFO: grey + format + reset, - logging.WARNING: yellow + format + reset, - logging.ERROR: red + format + reset, - logging.CRITICAL: bold_red + format + reset - } - - def format(self, record): - log_fmt = self.FORMATS.get(record.levelno) - formatter = logging.Formatter(log_fmt) - return formatter.format(record) +from classes.Timer import Timer +from classes.CustomFormater import CustomFormatter def parse_args():