LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

logger: code style fixes

Browse Source
This commit is contained in:
Nicolas F
2019-03-07 15:33:28 +01:00
parent ef66efd140
commit 94aa49019c
1 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
overviewer_core/logger.py
View File

@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License along # You should have received a copy of the GNU General Public License along
# with the Overviewer. If not, see <http://www.gnu.org/licenses/>. # with the Overviewer. If not, see <http://www.gnu.org/licenses/>.
import sys
import os
import logging
import platform
import ctypes import ctypes
import logging
import os
import platform
import sys
from cStringIO import StringIO from cStringIO import StringIO
# Some cool code for colored logging: # Some cool code for colored logging:
@@ -41,7 +41,6 @@ BACKGROUND_GREEN = 0x20
BACKGROUND_RED = 0x40 BACKGROUND_RED = 0x40
COLORIZE = { COLORIZE = {
#'INFO': WHITe,
'DEBUG': CYAN, 'DEBUG': CYAN,
} }
HIGHLIGHT = { HIGHLIGHT = {
@@ -68,22 +67,24 @@ class WindowsOutputStream(object):
if self.output_handle == 0xFFFFFFFF: if self.output_handle == 0xFFFFFFFF:
raise Exception("Something failed in WindowsColorFormatter") raise Exception("Something failed in WindowsColorFormatter")
# default is white text on a black background # default is white text on a black background
self.currentForeground = FOREGROUND_WHITE self.currentForeground = FOREGROUND_WHITE
self.currentBackground = BACKGROUND_BLACK self.currentBackground = BACKGROUND_BLACK
self.currentBold = 0 self.currentBold = 0
def updateWinColor(self, Fore=None, Back=None, Bold=False): def updateWinColor(self, Fore=None, Back=None, Bold=False):
if Fore != None: self.currentForeground = Fore if Fore is not None:
if Back != None: self.currentBackground = Back self.currentForeground = Fore
if Back is not None:
self.currentBackground = Back
if Bold: if Bold:
self.currentBold = FOREGROUND_BOLD self.currentBold = FOREGROUND_BOLD
else: else:
self.currentBold = 0 self.currentBold = 0
self.SetConsoleTextAttribute(self.output_handle, self.SetConsoleTextAttribute(
ctypes.c_int(self.currentForeground | self.currentBackground | self.currentBold)) self.output_handle,
ctypes.c_int(self.currentForeground | self.currentBackground | self.currentBold))
def write(self, s): def write(self, s):
@@ -91,24 +92,26 @@ class WindowsOutputStream(object):
while (True): while (True):
c = msg_strm.read(1) c = msg_strm.read(1)
if c == '': break if c == '':
break
if c == '\033': if c == '\033':
c1 = msg_strm.read(1) c1 = msg_strm.read(1)
if c1 != '[': # if c1 != '[':
sys.stream.write(c + c1) sys.stream.write(c + c1)
continue continue
c2 = msg_strm.read(2) c2 = msg_strm.read(2)
if c2 == "0m": # RESET_SEQ if c2 == "0m": # RESET_SEQ
self.updateWinColor(Fore=FOREGROUND_WHITE, Back=BACKGROUND_BLACK) self.updateWinColor(Fore=FOREGROUND_WHITE, Back=BACKGROUND_BLACK)
elif c2 == "1;": elif c2 == "1;":
color = "" color = ""
while(True): while(True):
nc = msg_strm.read(1) nc = msg_strm.read(1)
if nc == 'm': break if nc == 'm':
break
color += nc color += nc
color = int(color) color = int(color)
if (color >= 40): # background if (color >= 40): # background
color = color - 40 color = color - 40
if color == BLACK: if color == BLACK:
self.updateWinColor(Back=BACKGROUND_BLACK) self.updateWinColor(Back=BACKGROUND_BLACK)
@@ -125,8 +128,9 @@ class WindowsOutputStream(object):
elif color == CYAN: elif color == CYAN:
self.updateWinColor(Back=BACKGROUND_GREEN | BACKGROUND_BLUE) self.updateWinColor(Back=BACKGROUND_GREEN | BACKGROUND_BLUE)
elif color == WHITE: elif color == WHITE:
self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_GREEN |
elif (color >= 30): # foreground BACKGROUND_BLUE)
elif (color >= 30): # foreground
color = color - 30 color = color - 30
if color == BLACK: if color == BLACK:
self.updateWinColor(Fore=FOREGROUND_BLACK) self.updateWinColor(Fore=FOREGROUND_BLACK)
@@ -144,33 +148,25 @@ class WindowsOutputStream(object):
self.updateWinColor(Fore=FOREGROUND_GREEN | FOREGROUND_BLUE) self.updateWinColor(Fore=FOREGROUND_GREEN | FOREGROUND_BLUE)
elif color == WHITE: elif color == WHITE:
self.updateWinColor(Fore=FOREGROUND_WHITE) self.updateWinColor(Fore=FOREGROUND_WHITE)
elif c2 == "1m": # BOLD_SEQ
elif c2 == "1m": # BOLD_SEQ
pass pass
else: else:
self.stream.write(c) self.stream.write(c)
def flush(self): def flush(self):
self.stream.flush() self.stream.flush()
class HighlightingFormatter(logging.Formatter):
"""Base class of our custom formatter
""" class HighlightingFormatter(logging.Formatter):
"""Base class of our custom formatter"""
datefmt = "%Y-%m-%d %H:%M:%S" datefmt = "%Y-%m-%d %H:%M:%S"
funcName_len = 15 funcName_len = 15
def __init__(self, verbose=False): def __init__(self, verbose=False):
if verbose: if verbose:
fmtstr = '%(fileandlineno)-18s %(pid)s %(asctime)s ' \ fmtstr = '%(fileandlineno)-18s %(pid)s %(asctime)s %(levelname)-8s %(message)s'
'%(levelname)-8s %(message)s'
else: else:
fmtstr = '%(asctime)s ' '%(shortlevelname)-1s%(message)s' fmtstr = '%(asctime)s %(shortlevelname)-1s%(message)s'
logging.Formatter.__init__(self, fmtstr, self.datefmt) logging.Formatter.__init__(self, fmtstr, self.datefmt)
@@ -193,7 +189,8 @@ class HighlightingFormatter(logging.Formatter):
""" """
record.shortlevelname = record.levelname[0] + ' ' record.shortlevelname = record.levelname[0] + ' '
if record.levelname == 'INFO': record.shortlevelname = '' if record.levelname == 'INFO':
record.shortlevelname = ''
record.pid = os.getpid() record.pid = os.getpid()
record.fileandlineno = "%s:%s" % (record.filename, record.lineno) record.fileandlineno = "%s:%s" % (record.filename, record.lineno)
@@ -215,6 +212,7 @@ class HighlightingFormatter(logging.Formatter):
""" """
return logging.Formatter.format(self, record) return logging.Formatter.format(self, record)
class DumbFormatter(HighlightingFormatter): class DumbFormatter(HighlightingFormatter):
"""Formatter for dumb terminals that don't support color, or log files. """Formatter for dumb terminals that don't support color, or log files.
Prints a bunch of stars before a highlighted line. Prints a bunch of stars before a highlighted line.
@@ -223,7 +221,7 @@ class DumbFormatter(HighlightingFormatter):
def highlight(self, record): def highlight(self, record):
if record.levelname in HIGHLIGHT: if record.levelname in HIGHLIGHT:
line = logging.Formatter.format(self, record) line = logging.Formatter.format(self, record)
line = "*" * min(79,len(line)) + "\n" + line line = "*" * min(79, len(line)) + "\n" + line
return line return line
else: else:
return HighlightingFormatter.highlight(self, record) return HighlightingFormatter.highlight(self, record)
@@ -238,22 +236,22 @@ class ANSIColorFormatter(HighlightingFormatter):
# Colorize just the levelname # Colorize just the levelname
# left justify again because the color sequence bumps the length up # left justify again because the color sequence bumps the length up
# above 8 chars # above 8 chars
levelname_color = COLOR_SEQ % (30 + COLORIZE[record.levelname]) + \ levelname_color = (COLOR_SEQ % (30 + COLORIZE[record.levelname])
"%-8s" % record.levelname + RESET_SEQ + "%-8s" % record.levelname + RESET_SEQ)
record.levelname = levelname_color record.levelname = levelname_color
return logging.Formatter.format(self, record) return logging.Formatter.format(self, record)
elif record.levelname in HIGHLIGHT: elif record.levelname in HIGHLIGHT:
# Colorize the entire line # Colorize the entire line
line = logging.Formatter.format(self, record) line = logging.Formatter.format(self, record)
line = COLOR_SEQ % (40 + HIGHLIGHT[record.levelname]) + line + \ line = COLOR_SEQ % (40 + HIGHLIGHT[record.levelname]) + line + RESET_SEQ
RESET_SEQ
return line return line
else: else:
# No coloring if it's not to be highlighted or colored # No coloring if it's not to be highlighted or colored
return logging.Formatter.format(self, record) return logging.Formatter.format(self, record)
def configure(loglevel=logging.INFO, verbose=False, simple=False): def configure(loglevel=logging.INFO, verbose=False, simple=False):
"""Configures the root logger to our liking """Configures the root logger to our liking