mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

debug-viewer: Ignore broken utf8 errors

Browse source 
Not much we can do if the input file is not perfectly valid UTF8
but we should just do as good as we can.
This commit is contained in:
Thibault Saunier 2018-04-19 22:13:03 -03:00
parent 29e421ad0a
commit 78698808d2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug-viewer/GstDebugViewer/Data.py
View file

@ -344,7 +344,7 @@ class LineCache (Producer):
yield True yield True
offset = tell() offset = tell()
line = readline().decode('utf-8') line = readline().decode('utf-8', errors='replace')
if not line: if not line:
break break
match = rexp_match(line) match = rexp_match(line)
@ -384,7 +384,7 @@ class LogLine (list):
@classmethod @classmethod
def parse_full(cls, line_string): def parse_full(cls, line_string):
match = cls._line_regex.match(line_string.decode('utf8')) match = cls._line_regex.match(line_string.decode('utf8', errors='replace'))
if match is None: if match is None:
# raise ValueError ("not a valid log line (%r)" % (line_string,)) # raise ValueError ("not a valid log line (%r)" % (line_string,))
groups = [0, 0, 0, 0, "", "", 0, "", "", 0] groups = [0, 0, 0, 0, "", "", 0, "", "", 0]

2
debug-viewer/GstDebugViewer/GUI/columns.py
View file

@ -346,7 +346,7 @@ class MessageColumn (TextColumn):
def message_data_func(column, cell, model, tree_iter, user_data): def message_data_func(column, cell, model, tree_iter, user_data):
msg = model.get_value(tree_iter, id_).decode("utf8") msg = model.get_value(tree_iter, id_).decode("utf8", errors="replace")
if not highlighters: if not highlighters:
cell.props.text = msg cell.props.text = msg

2
debug-viewer/GstDebugViewer/GUI/window.py
View file

@ -690,7 +690,7 @@ class Window (object):
line_text = model.access_offset(line_offset).strip() line_text = model.access_offset(line_offset).strip()
line_text = Data.strip_escape(line_text) line_text = Data.strip_escape(line_text)
self.clipboard.set_text(line_text.decode('utf8'), -1) self.clipboard.set_text(line_text.decode('utf8', errors='replace'), -1)
@action @action
def handle_edit_copy_message_action_activate(self, action): def handle_edit_copy_message_action_activate(self, action):