From 83780bfb685b524e56b2580c5dc8be0be2ee91ed Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sun, 13 Apr 2025 15:38:09 +0100 Subject: [PATCH] Clean up unused signals --- app/classes.py | 14 ++++++++++++-- app/playlistmodel.py | 25 ------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/app/classes.py b/app/classes.py index a567ff2..b51575b 100644 --- a/app/classes.py +++ b/app/classes.py @@ -123,6 +123,10 @@ class AudioMetadata(NamedTuple): class Col(Enum): + """ + Columns in playlist + """ + START_GAP = 0 TITLE = auto() ARTIST = auto() @@ -142,6 +146,10 @@ class FileErrors(NamedTuple): @dataclass class Filter: + """ + Filter used in queries to select tracks + """ + version: int = 1 path_type: str = "contains" path: str = "" @@ -172,6 +180,10 @@ class PlaylistStyle(QProxyStyle): class QueryCol(Enum): + """ + Columns in querylist + """ + TITLE = 0 ARTIST = auto() DURATION = auto() @@ -221,9 +233,7 @@ class MusicMusterSignals(QObject): - https://stackoverflow.com/questions/62654525/emit-a-signal-from-another-class-to-main-class """ - begin_reset_model_signal = pyqtSignal(int) enable_escape_signal = pyqtSignal(bool) - end_reset_model_signal = pyqtSignal(int) next_track_changed_signal = pyqtSignal() resize_rows_signal = pyqtSignal(int) search_songfacts_signal = pyqtSignal(str) diff --git a/app/playlistmodel.py b/app/playlistmodel.py index c7e8b29..2112bfe 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -92,8 +92,6 @@ class PlaylistModel(QAbstractTableModel): self.played_tracks_hidden = False # Connect signals - self.signals.begin_reset_model_signal.connect(self.begin_reset_model) - self.signals.end_reset_model_signal.connect(self.end_reset_model) self.signals.signal_add_track_to_header.connect(self.add_track_to_header) self.signals.signal_begin_insert_rows.connect(self.begin_insert_rows) self.signals.signal_end_insert_rows.connect(self.end_insert_rows) @@ -239,16 +237,6 @@ class PlaylistModel(QAbstractTableModel): return QBrush() - # @log_call - def begin_reset_model(self, playlist_id: int) -> None: - """ - Reset model if playlist_id is ours - """ - - if playlist_id != self.playlist_id: - return - super().beginResetModel() - def columnCount(self, parent: QModelIndex = QModelIndex()) -> int: """Standard function for view""" @@ -463,19 +451,6 @@ class PlaylistModel(QAbstractTableModel): return "" - # @log_call - def end_reset_model(self, playlist_id: int) -> None: - """ - End model reset if this is our playlist - """ - - if playlist_id != self.playlist_id: - return - self.refresh_data() - super().endResetModel() - self.track_sequence.update() - self.update_track_times() - def _edit_role(self, row: int, column: int, plr: PlaylistRow) -> str | int: """ Return value for editing