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

fix a few warnings

Browse Source
This commit is contained in:
Andreas Huber
2022-08-25 19:19:30 +02:00
parent fcc570d75f
commit 4a082ab8ee
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/logfile/filterwidget.py
View File

@@ -8,7 +8,7 @@ from typing import Optional, Callable
from PySide6.QtCore import QRunnable, QThreadPool, Signal from PySide6.QtCore import QRunnable, QThreadPool, Signal
from PySide6.QtGui import QIcon from PySide6.QtGui import QIcon
from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QPushButton, QComboBox, \ from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QCheckBox, QPushButton, QComboBox, \
QSizePolicy, QProgressBar, QMenu, QMenuBar QSizePolicy, QProgressBar
from src.plugins.domain.raction import RAction from src.plugins.domain.raction import RAction
from src.plugins.logfile.preprocesslineshook import PreProcessLinesHook from src.plugins.logfile.preprocesslineshook import PreProcessLinesHook
@@ -71,13 +71,13 @@ class FilterTask(QRunnable):
with open(self.filter_model.get_file(), "w+b") as target: with open(self.filter_model.get_file(), "w+b") as target:
line_count = 0 line_count = 0
lines_written = 0 lines_written = 0
while l := source.readline(): while line_encoded := source.readline():
line_count = line_count + 1 line_count = line_count + 1
line = l.decode("utf8", errors="ignore") line = line_encoded.decode("utf8", errors="ignore")
if self.regex.findall(line): if self.regex.findall(line):
lines_written = lines_written + 1 lines_written = lines_written + 1
source_line_offset = source.tell() - len(l) source_line_offset = source.tell() - len(line_encoded)
target_line_offset = target.tell() target_line_offset = target.tell()
for listener in self.filter_match_found_listeners: for listener in self.filter_match_found_listeners:
listener(target_line_offset, source_line_offset) listener(target_line_offset, source_line_offset)
@@ -177,9 +177,9 @@ class FilterWidget(QWidget):
filter_bar.layout.addWidget(self.ignore_case) filter_bar.layout.addWidget(self.ignore_case)
filter_bar.layout.addWidget(self.is_regex) filter_bar.layout.addWidget(self.is_regex)
(handle, self.tmpfilename) = tempfile.mkstemp() (handle, self.tmp_filename) = tempfile.mkstemp()
os.close(handle) os.close(handle)
self.filter_model = LogFileModel(self.tmpfilename, self.source_model.settings) self.filter_model = LogFileModel(self.tmp_filename, self.source_model.settings)
self.hits_view = BigText(self.filter_model) self.hits_view = BigText(self.filter_model)
self.layout.addWidget(filter_bar) self.layout.addWidget(filter_bar)
@@ -221,9 +221,8 @@ class FilterWidget(QWidget):
self._reload_save_queries() self._reload_save_queries()
def destruct(self): def destruct(self):
# print("cleanup: ", self.tmpfilename)
self._cancel_search() self._cancel_search()
os.remove(self.tmpfilename) os.remove(self.tmp_filename)
def _cancel_search(self): def _cancel_search(self):
if self.filter_task: if self.filter_task: