andi/krowlog
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

reset search hits when entering empty or invalid query

Browse Source
This commit is contained in:
Andreas Huber
2021-10-28 09:48:38 +02:00
parent 02f1ce3af9
commit a0e6c24098
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filterwidget.py
View File

@@ -123,6 +123,7 @@ class FilterWidget(QWidget):
query = self.query_field.text() query = self.query_field.text()
ignore_case = self.ignore_case.isChecked() ignore_case = self.ignore_case.isChecked()
if len(query) == 0: if len(query) == 0:
self.filter_model.truncate()
return return
# cancel previous search # cancel previous search
@@ -135,7 +136,8 @@ class FilterWidget(QWidget):
else: else:
regex = re.compile(re.escape(query), flags=flags) regex = re.compile(re.escape(query), flags=flags)
except: except:
# query was not a valid regex -> abort # query was not a valid regex -> clear search hits, then abort
self.filter_model.truncate()
return return
self.filter_task = FilterTask( self.filter_task = FilterTask(

22
logFileModel.py
View File

@@ -9,7 +9,7 @@ from settings import Settings
class LogFileModel: class LogFileModel:
def __init__(self, file:str, settings: Settings): def __init__(self, file: str, settings: Settings):
self.settings = settings self.settings = settings
self._file = os.path.realpath(file) self._file = os.path.realpath(file)
self._lock = threading.RLock() self._lock = threading.RLock()
@@ -34,28 +34,29 @@ class LogFileModel:
return bytes.decode("utf8", errors="ignore") return bytes.decode("utf8", errors="ignore")
def data(self, byte_offset, scroll_lines, lines) -> List[Line]: def data(self, byte_offset, scroll_lines, lines) -> List[Line]:
#print("data(%s, %s, %s)" % (byte_offset, scroll_lines, lines)) # print("data(%s, %s, %s)" % (byte_offset, scroll_lines, lines))
lines_before_offset: List[Line] = [] lines_before_offset: List[Line] = []
lines_after_offset: List[Line] = [] lines_after_offset: List[Line] = []
lines_to_find = lines + abs(scroll_lines) lines_to_find = lines + abs(scroll_lines)
lines_to_return = math.ceil(lines) lines_to_return = math.ceil(lines)
#start = time.time() # start = time.time()
with self._lock: with self._lock:
#print("data lock acquision %.4f" % (time.time() -start)) # print("data lock acquision %.4f" % (time.time() -start))
# TODO handle lines longer than 4096 bytes # TODO handle lines longer than 4096 bytes
# TODO abort file open after a few secons: https://docs.python.org/3/library/signal.html#example # TODO abort file open after a few secons: https://docs.python.org/3/library/signal.html#example
with open(self._file, 'rb') as f: with open(self._file, 'rb') as f:
offset = min(byte_offset, self.byte_count()) offset = min(byte_offset, self.byte_count())
offset = max(0, offset - self.settings.max_line_length()) offset = max(0, offset - self.settings.max_line_length())
#print("offset: %s" % (offset)) # print("offset: %s" % (offset))
eof_reached = True eof_reached = True
f.seek(offset) f.seek(offset)
while l := f.readline(): while l := f.readline():
new_offset = f.tell() new_offset = f.tell()
line = Line(offset, new_offset, l.decode("utf8", errors="ignore").replace("\r", "").replace("\n", "")) line = Line(offset, new_offset,
l.decode("utf8", errors="ignore").replace("\r", "").replace("\n", ""))
# print("%s %s" %(line.byte_offset(), line.line())) # print("%s %s" %(line.byte_offset(), line.line()))
if offset < byte_offset: if offset < byte_offset:
lines_before_offset.append(line) lines_before_offset.append(line)
@@ -68,12 +69,12 @@ class LogFileModel:
all_lines = lines_before_offset + lines_after_offset all_lines = lines_before_offset + lines_after_offset
start = max(0, len(lines_before_offset) + scroll_lines) start = max(0, len(lines_before_offset) + scroll_lines)
if start + lines_to_return-1 < len(all_lines): if start + lines_to_return - 1 < len(all_lines):
result = all_lines[start:start+lines_to_return] result = all_lines[start:start + lines_to_return]
else: else:
result = all_lines[-lines_to_return+1:] result = all_lines[-lines_to_return + 1:]
#print("returning %s lines" % (len(result))) # print("returning %s lines" % (len(result)))
return result return result
def byte_count(self) -> int: def byte_count(self) -> int:
@@ -87,5 +88,4 @@ class LogFileModel:
def truncate(self): def truncate(self):
with open(self._file, 'a') as f: with open(self._file, 'a') as f:
print("truncating")
f.truncate(0) f.truncate(0)