From db7943cedbc7923c5ddc204fe291d6fbe0b0b045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Stadler?= Date: Mon, 3 Dec 2007 16:38:29 +0200 Subject: [PATCH] Unbreak filtering again --- debug-viewer/GstDebugViewer/GUI.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py index f83473af49..4b65eb7531 100755 --- a/debug-viewer/GstDebugViewer/GUI.py +++ b/debug-viewer/GstDebugViewer/GUI.py @@ -208,7 +208,7 @@ class LogModelBase (gtk.GenericTreeModel): def iter_rows_offset (self): for i, offset in enumerate (self.line_offsets): - self.ensure_cached (i) + self.ensure_cached (offset) row = self.line_cache[offset] row[self.COL_LEVEL] = self.line_levels[i] # FIXME yield (row, offset,) @@ -260,7 +260,7 @@ class LogModelBase (gtk.GenericTreeModel): return self.line_levels[line_index] line_offset = self.line_offsets[line_index] - self.ensure_cached (line_index) + self.ensure_cached (line_offset) value = self.line_cache[line_offset][col_id] if col_id == self.COL_MESSAGE: @@ -339,9 +339,7 @@ class LazyLogModel (LogModelBase): self.__fileobj.seek (offset) return self.__fileobj.readline () - def ensure_cached (self, line_index): - - line_offset = self.line_offsets[line_index] + def ensure_cached (self, line_offset): if line_offset in self.line_cache: return @@ -349,12 +347,8 @@ class LazyLogModel (LogModelBase): if len (self.line_cache) > 10000: self.line_cache.clear () - if line_index == len (self.line_offsets) - 1: - self.__fileobj.seek (line_offset) - line = self.__fileobj.readline () - else: - next_offset = self.line_offsets[line_index + 1] - line = self.__fileobj[line_offset:next_offset] + self.__fileobj.seek (line_offset) + line = self.__fileobj.readline () self.line_cache[line_offset] = Data.LogLine.parse_full (line)