Add message filtering by priority and subject, with CRITICAL always visible

- Implement MessagesProxyModel for client-side filtering
- Add priority filter buttons (LOW 0-3, NORMAL 4-8, HIGH 9, CRITICAL 10 always shown)
- Add subject filter menu with checkable actions for message titles
- Add Remove Filters button to reset all filters
- Restore priority 10 persistent notification setting in options
- Fix settings dialog errors and update UI layouts
- Ensure CRITICAL priority messages cannot be filtered out but can toggle persistent pop-ups
This commit is contained in:
kdusek
2025-12-01 18:02:05 +01:00
parent 09f85c5902
commit 4c3b6925e5
11 changed files with 422 additions and 221 deletions

View File

@@ -1,5 +1,4 @@
import enum
from typing import cast
from PyQt6 import QtCore, QtGui
from gotify_tray import gotify
@@ -28,7 +27,7 @@ class MessagesModel(QtGui.QStandardItemModel):
self.update_last_id(message.id)
message_item = MessagesModelItem(message)
self.insertRow(row, message_item)
def append_message(self, message: gotify.GotifyMessageModel):
self.update_last_id(message.id)
message_item = MessagesModelItem(message)
@@ -39,3 +38,58 @@ class MessagesModel(QtGui.QStandardItemModel):
def itemFromIndex(self, index: QtCore.QModelIndex) -> MessagesModelItem:
return cast(MessagesModelItem, super(MessagesModel, self).itemFromIndex(index))
class MessagesProxyModel(QtCore.QSortFilterProxyModel):
unique_titles_updated = QtCore.pyqtSignal(set)
def __init__(self, parent=None):
super().__init__(parent)
self.allowed_priorities = set(range(11)) # 0-10
self.allowed_titles = set() # empty means all
self.unique_titles = set()
def set_allowed_priorities(self, priorities: set[int]):
self.allowed_priorities = priorities
self.invalidateFilter()
def set_allowed_titles(self, titles: set[str]):
print("Proxy setting allowed titles:", titles)
self.allowed_titles = titles
self.invalidateFilter()
def update_unique_titles(self):
if not self.sourceModel():
return
titles = set()
for row in range(self.sourceModel().rowCount()):
index = self.sourceModel().index(row, 0)
item = self.sourceModel().itemFromIndex(index)
message = item.data(MessageItemDataRole.MessageRole)
if message.title:
titles.add(message.title)
print("Unique titles found:", titles)
for row in range(self.sourceModel().rowCount()):
index = self.sourceModel().index(row, 0)
item = self.sourceModel().itemFromIndex(index)
message = item.data(MessageItemDataRole.MessageRole)
print(f"Message {row}: title={message.title}, priority={message.priority}")
self.unique_titles = titles
self.unique_titles_updated.emit(self.unique_titles)
def filterAcceptsRow(
self, source_row: int, source_parent: QtCore.QModelIndex
) -> bool:
index = self.sourceModel().index(source_row, 0, source_parent)
item = self.sourceModel().itemFromIndex(index)
message = item.data(MessageItemDataRole.MessageRole)
priority = message.priority if message.priority is not None else 0
if self.allowed_priorities and priority not in self.allowed_priorities:
return False
if (
self.allowed_titles
and message.title is not None
and message.title not in self.allowed_titles
):
return False
return True

View File

@@ -5,4 +5,9 @@ from .ApplicationModel import (
ApplicationProxyModel,
ApplicationItemDataRole,
)
from .MessagesModel import MessagesModelItem, MessagesModel, MessageItemDataRole
from .MessagesModel import (
MessagesModelItem,
MessagesModel,
MessagesProxyModel,
MessageItemDataRole,
)