From 9474886d859973a33dcfde5cd2387b9324bd9bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Stadler?= Date: Fri, 21 Sep 2012 19:11:40 +0200 Subject: [PATCH] Data: add support for colored log files Adds a ~5% penalty for loading stripped files. --- debug-viewer/GstDebugViewer/Data.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/debug-viewer/GstDebugViewer/Data.py b/debug-viewer/GstDebugViewer/Data.py index 9b8022e8cf..041214fb6b 100644 --- a/debug-viewer/GstDebugViewer/Data.py +++ b/debug-viewer/GstDebugViewer/Data.py @@ -144,18 +144,21 @@ def default_log_line_regex_ (): TIME = r"(\d+:\d\d:\d\d\.\d+)\s+" CATEGORY = "([A-Za-z0-9_-]+)\s+" # "GST_REFCOUNTING ", "flacdec " # " 3089 " - PID = r"(\d+)\s+" + PID = r"(\d+)\s*" FILENAME = r"([^:]*):" LINE = r"(\d+):" FUNCTION = "([A-Za-z0-9_]*):" # FIXME: When non-g(st)object stuff is logged with *_OBJECT (like # buffers!), the address is printed *without* <> brackets! - OBJECT = "(?:<([^>]+)> )?" + OBJECT = "(?:<([^>]+)>)?" MESSAGE = "(.+)" + ANSI = "(?:\x1b\\[[0-9;]*m\\s*)*\\s*" + # New log format: - expressions = [TIME, PID, THREAD, LEVEL, CATEGORY, FILENAME, LINE, FUNCTION, - OBJECT, MESSAGE] + expressions = [TIME, ANSI, PID, ANSI, THREAD, ANSI, LEVEL, ANSI, + CATEGORY, FILENAME, LINE, FUNCTION, ANSI, + OBJECT, ANSI, MESSAGE] # Old log format: ## expressions = [LEVEL, THREAD, TIME, CATEGORY, PID, FILENAME, LINE, ## FUNCTION, OBJECT, MESSAGE] @@ -290,7 +293,11 @@ class LineCache (Producer): "L" : debug_level_log, "D" : debug_level_debug, "I" : debug_level_info, "W" : debug_level_warning, "E" : debug_level_error, " " : debug_level_none} - rexp = re.compile (r"\d:\d\d:\d\d\.\d+\s+\d+\s+0x[0-9a-f]+\s+([TFLDIEW ])") + ANSI = "(?:\x1b\\[[0-9;]*m)?" + rexp = re.compile (r"\d:\d\d:\d\d\.\d+ " + ANSI + + r" *\d+" + ANSI + + r" +0x[0-9a-f]+ +" + ANSI + + r"([TFLDIEW ])") # Moving attribute lookups out of the loop: readline = self.__fileobj.readline