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

make the original file name known to the filter view

Browse Source
This commit is contained in:
Andreas Huber
2024-03-26 18:12:42 +01:00
parent 66d6a728cc
commit b8b4b4e790
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ class FilterWidget(QWidget):
(handle, self.tmp_filename) = tempfile.mkstemp() (handle, self.tmp_filename) = tempfile.mkstemp()
os.close(handle) os.close(handle)
self.filter_model = LogFileModel(self.tmp_filename, self.source_model.settings) self.filter_model = LogFileModel(self.tmp_filename, self.source_model.settings, source_model.get_file())
self.hits_view = BigText(self.filter_model, show_range_slider=False) self.hits_view = BigText(self.filter_model, show_range_slider=False)
self.layout.addWidget(filter_bar) self.layout.addWidget(filter_bar)

13
src/ui/bigtext/logFileModel.py
View File

@@ -21,10 +21,16 @@ class LogFileModel:
range_start = 0 range_start = 0
range_end = -1 range_end = -1
def __init__(self, file: str, settings: Settings): def __init__(self, file: str, settings: Settings, original_file: str = False):
"""
:param file:
:param settings:
:param original_file: used in the filter widget to denote the original file, the one being filtered, because 'file' points to the tmp file
"""
self.settings = settings self.settings = settings
self._file = os.path.realpath(file) self._file = os.path.realpath(file)
self._file_name = os.path.basename(self._file) self._original_file = os.path.realpath(original_file) if original_file else self._file
self._file_name = os.path.basename(self._original_file)
def highlighters(self): def highlighters(self):
all_highlighters = Highlighting.read_config(self.settings) all_highlighters = Highlighting.read_config(self.settings)
@@ -37,6 +43,9 @@ class LogFileModel:
def get_file(self): def get_file(self):
return self._file return self._file
def get_original_file(self):
return self._original_file
def __str__(self): def __str__(self):
return self._file return self._file