fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-03-25 22:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make log.contents() a generator

Browse Source
This commit is contained in:
Laurent Monin
2021-12-05 11:05:24 +01:00
parent 89bda9680f
commit b3e32bdbea
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
picard/log.py
View File

@@ -119,17 +119,15 @@ class TailLogger(QtCore.QObject):
def contents(self, prev=-1):
with self._queue_lock:
# If log queue is empty, return
if not self._log_queue:
return []
offset, length = _calculate_bounds(prev, self._log_queue[0].pos, self._log_queue[-1].pos, len(self._log_queue))
if self._log_queue:
offset, length = _calculate_bounds(prev, self._log_queue[0].pos, self._log_queue[-1].pos, len(self._log_queue))
if offset >= 0:
return (self._log_queue[i] for i in range(offset, length))
# If offset < 0, there is a discontinuity in the queue positions
# Use a slower approach to get the new content.
else:
return (x for x in self._log_queue if x.pos > prev)
if offset >= 0:
yield from (self._log_queue[i] for i in range(offset, length))
# If offset < 0, there is a discontinuity in the queue positions
# Use a slower approach to get the new content.
else:
yield from (x for x in self._log_queue if x.pos > prev)
def clear(self):
with self._queue_lock: