LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

changed windows logging to be a special output stream

Browse Source
This commit is contained in:
Andrew Brown
2011-11-01 00:03:32 -04:00
parent 6a67841b44
commit 470440563c
2 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
overviewer.py
View File

@@ -107,20 +107,25 @@ helptext = """
%prog [OPTIONS] <World # / Name / Path to World> <tiles dest dir>""" %prog [OPTIONS] <World # / Name / Path to World> <tiles dest dir>"""
def configure_logger(): def configure_logger():
# Configure the root logger to our liking "Configures the root logger to our liking"
logger = logging.getLogger()
handler = util.OverviewerHandler(sys.stdout) outstream = sys.stderr
if platform.system() == 'Windows': if platform.system() == 'Windows':
# Our custom OverviewerHandler knows how to deal with select # Our custom output stream processor knows how to deal with select ANSI
# ANSI color escape sequences # color escape sequences
outstream = util.WindowsOutputStream()
formatter = util.ANSIColorFormatter() formatter = util.ANSIColorFormatter()
elif sys.stderr.isatty(): elif sys.stderr.isatty():
# terminal logging with ANSI color # terminal logging with ANSI color
formatter = util.ANSIColorFormatter() formatter = util.ANSIColorFormatter()
else: else:
# Let's not assume anything. Just text. # Let's not assume anything. Just text.
formatter = util.DumbFormatter() formatter = util.DumbFormatter()
logger = logging.getLogger()
handler = logging.StreamHandler(outstream)
handler.setFormatter(formatter) handler.setFormatter(formatter)
logger.addHandler(handler) logger.addHandler(handler)
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)

156
overviewer_core/util.py
View File

@@ -113,19 +113,22 @@ HIGHLIGHT = {
} }
class OverviewerHandler(logging.Handler): class WindowsOutputStream(object):
def __init__(self, stream=sys.stderr): """A file-like object that proxies sys.stderr and interprets simple ANSI
logging.Handler.__init__(self) escape codes for color, translating them to the appropriate Windows calls.
self.stream = stream
"""
def __init__(self, stream=None):
assert platform.system() == 'Windows'
self.stream = stream or sys.stderr
# go go gadget ctypes # go go gadget ctypes
if platform.system() == 'Windows': self.GetStdHandle = ctypes.windll.kernel32.GetStdHandle
self.GetStdHandle = ctypes.windll.kernel32.GetStdHandle self.SetConsoleTextAttribute = ctypes.windll.kernel32.SetConsoleTextAttribute
self.SetConsoleTextAttribute = ctypes.windll.kernel32.SetConsoleTextAttribute self.STD_OUTPUT_HANDLE = ctypes.c_int(0xFFFFFFF5)
self.STD_OUTPUT_HANDLE = ctypes.c_int(0xFFFFFFF5) self.output_handle = self.GetStdHandle(self.STD_OUTPUT_HANDLE)
self.output_handle = self.GetStdHandle(self.STD_OUTPUT_HANDLE) 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
@@ -144,78 +147,73 @@ class OverviewerHandler(logging.Handler):
self.SetConsoleTextAttribute(self.output_handle, self.SetConsoleTextAttribute(self.output_handle,
ctypes.c_int(self.currentForeground | self.currentBackground | self.currentBold)) ctypes.c_int(self.currentForeground | self.currentBackground | self.currentBold))
def emit(self, record): def write(self, s):
msg = str(self.format(record))
msg_strm = StringIO(msg) msg_strm = StringIO(s)
# only on Windows do we do this fancy ANSI parsing magic while (True):
if platform.system() == 'Windows': c = msg_strm.read(1)
while (True): if c == '': break
c = msg_strm.read(1) if c == '\033':
if c == '': break c1 = msg_strm.read(1)
if c == '\033': if c1 != '[': #
c1 = msg_strm.read(1) sys.stream.write(c + c1)
if c1 != '[': # continue
sys.stream.write(c + c1) c2 = msg_strm.read(2)
continue if c2 == "0m": # RESET_SEQ
c2 = msg_strm.read(2) self.updateWinColor(Fore=FOREGROUND_WHITE, Back=BACKGROUND_BLACK)
if c2 == "0m": # RESET_SEQ
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)
if color == RED: if color == RED:
self.updateWinColor(Back=BACKGROUND_RED) self.updateWinColor(Back=BACKGROUND_RED)
elif color == GREEN: elif color == GREEN:
self.updateWinColor(Back=BACKGROUND_GREEN) self.updateWinColor(Back=BACKGROUND_GREEN)
elif color == YELLOW: elif color == YELLOW:
self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_GREEN) self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_GREEN)
elif color == BLUE: elif color == BLUE:
self.updateWinColor(Back=BACKGROUND_BLUE) self.updateWinColor(Back=BACKGROUND_BLUE)
elif color == MAGENTA: elif color == MAGENTA:
self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_BLUE) self.updateWinColor(Back=BACKGROUND_RED | BACKGROUND_BLUE)
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 | BACKGROUND_BLUE)
elif (color >= 30): # foreground 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)
if color == RED: if color == RED:
self.updateWinColor(Fore=FOREGROUND_RED) self.updateWinColor(Fore=FOREGROUND_RED)
elif color == GREEN: elif color == GREEN:
self.updateWinColor(Fore=FOREGROUND_GREEN) self.updateWinColor(Fore=FOREGROUND_GREEN)
elif color == YELLOW: elif color == YELLOW:
self.updateWinColor(Fore=FOREGROUND_RED | FOREGROUND_GREEN) self.updateWinColor(Fore=FOREGROUND_RED | FOREGROUND_GREEN)
elif color == BLUE: elif color == BLUE:
self.updateWinColor(Fore=FOREGROUND_BLUE) self.updateWinColor(Fore=FOREGROUND_BLUE)
elif color == MAGENTA: elif color == MAGENTA:
self.updateWinColor(Fore=FOREGROUND_RED | FOREGROUND_BLUE) self.updateWinColor(Fore=FOREGROUND_RED | FOREGROUND_BLUE)
elif color == CYAN: elif color == CYAN:
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
pass
else: elif c2 == "1m": # BOLD_SEQ
self.stream.write(c) pass
else:
self.stream.write(msg) else:
self.stream.write(c)
self.stream.write("\n") self.stream.write("\n")
@@ -284,7 +282,7 @@ class DumbFormatter(HighlightingFormatter):
class ANSIColorFormatter(HighlightingFormatter): class ANSIColorFormatter(HighlightingFormatter):
"""Highlights and colorizes log entries with ANSI escape sequences """Uses ANSI escape sequences to enable GLORIOUS EXTRA-COLOR!
""" """
def highlight(self, record): def highlight(self, record):