From 434e45b0803c085127bdc4604912143c895f41af Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sun, 21 Jul 2024 08:58:49 +0100 Subject: [PATCH] Reduce complexity of playlistmodel:headerData --- app/dialogs.py | 1 - app/playlistmodel.py | 34 ++++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/dialogs.py b/app/dialogs.py index 57a21b0..a5ef62a 100644 --- a/app/dialogs.py +++ b/app/dialogs.py @@ -10,7 +10,6 @@ from PyQt6.QtWidgets import ( QListWidgetItem, QMainWindow, QTableWidgetItem, - QWidget, ) # Third party imports diff --git a/app/playlistmodel.py b/app/playlistmodel.py index 56befb8..c925354 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -606,28 +606,22 @@ class PlaylistModel(QAbstractTableModel): Return text for headers """ + display_dispatch_table = { + Col.START_GAP.value: QVariant(Config.HEADER_START_GAP), + Col.INTRO.value: QVariant(Config.HEADER_INTRO), + Col.TITLE.value: QVariant(Config.HEADER_TITLE), + Col.ARTIST.value: QVariant(Config.HEADER_ARTIST), + Col.DURATION.value: QVariant(Config.HEADER_DURATION), + Col.START_TIME.value: QVariant(Config.HEADER_START_TIME), + Col.END_TIME.value: QVariant(Config.HEADER_END_TIME), + Col.LAST_PLAYED.value: QVariant(Config.HEADER_LAST_PLAYED), + Col.BITRATE.value: QVariant(Config.HEADER_BITRATE), + Col.NOTE.value: QVariant(Config.HEADER_NOTE), + } + if role == Qt.ItemDataRole.DisplayRole: if orientation == Qt.Orientation.Horizontal: - if section == Col.START_GAP.value: - return QVariant(Config.HEADER_START_GAP) - if section == Col.INTRO.value: - return QVariant(Config.HEADER_INTRO) - elif section == Col.TITLE.value: - return QVariant(Config.HEADER_TITLE) - elif section == Col.ARTIST.value: - return QVariant(Config.HEADER_ARTIST) - elif section == Col.DURATION.value: - return QVariant(Config.HEADER_DURATION) - elif section == Col.START_TIME.value: - return QVariant(Config.HEADER_START_TIME) - elif section == Col.END_TIME.value: - return QVariant(Config.HEADER_END_TIME) - elif section == Col.LAST_PLAYED.value: - return QVariant(Config.HEADER_LAST_PLAYED) - elif section == Col.BITRATE.value: - return QVariant(Config.HEADER_BITRATE) - elif section == Col.NOTE.value: - return QVariant(Config.HEADER_NOTE) + return display_dispatch_table[section] else: if Config.ROWS_FROM_ZERO: return QVariant(str(section))