From daf8069de2c3dbeabc0772cb49e3da5754427b6e Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Sun, 1 Jan 2023 09:19:34 +0000
Subject: [PATCH] Tidy up moving to PlaylistTrack object

---
 app/helpers.py     | 4 ++--
 app/music.py       | 2 +-
 app/musicmuster.py | 7 -------
 app/playlists.py   | 9 ++-------
 pyproject.toml     | 4 ++++
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/helpers.py b/app/helpers.py
index 2c47c4c..579cc11 100644
--- a/app/helpers.py
+++ b/app/helpers.py
@@ -97,8 +97,8 @@ def get_tags(path: str) -> Dict[str, Union[str, int]]:
     )
 
 
-def get_relative_date(past_date: datetime, reference_date: datetime = None) \
-        -> str:
+def get_relative_date(past_date: datetime,
+                      reference_date: Optional[datetime] = None) -> str:
     """
     Return how long before reference_date past_date is as string.
 
diff --git a/app/music.py b/app/music.py
index 2ac337a..0c42118 100644
--- a/app/music.py
+++ b/app/music.py
@@ -1,6 +1,6 @@
 # import os
 import threading
-import vlc
+import vlc                          # type: ignore
 #
 from config import Config
 from datetime import datetime
diff --git a/app/musicmuster.py b/app/musicmuster.py
index 395c01c..570d429 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -671,7 +671,6 @@ class Window(QMainWindow, Ui_MainWindow):
 
             # Get list of track rows for this playlist
             plrs = PlaylistRows.get_rows_with_tracks(session, playlist_id)
-            import ipdb; ipdb.set_trace()
             with open(path, "w") as f:
                 # Required directive on first line
                 f.write("#EXTM3U\n")
@@ -1444,12 +1443,6 @@ class Window(QMainWindow, Ui_MainWindow):
             if self.playing:
                 self.stop_playing()
 
-    def update_next_track(self, track):
-        """Update next track with passed details"""
-
-        self.next_track = TrackData(track)
-        self.update_headers()
-
     def update_headers(self) -> None:
         """
         Update last / current / next track headers
diff --git a/app/playlists.py b/app/playlists.py
index c973f46..0eb854b 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -682,7 +682,7 @@ class PlaylistTab(QTableWidget):
             userdata_item.setData(self.ROW_TRACK_ID, 0)
 
         if repaint:
-            self.update_display(session, clear_selection=False)
+            self.update_display(session)
 
     def insert_track(self, session: Session, track: Tracks,
                      note: str = None, repaint: bool = True) -> None:
@@ -981,22 +981,17 @@ class PlaylistTab(QTableWidget):
         self.resizeRowsToContents()
         self.setColumnWidth(len(columns) - 1, 0)
 
-    def update_display(self, session, clear_selection: bool = True) -> None:
+    def update_display(self, session: Session) -> None:
         """
         Set row colours, fonts, etc
 
         Actions required:
-        - Clear selection if required
         - Render notes in correct colour
         - Render current, next and unplayable tracks in correct colour
         - Set start and end times
         - Show unplayed tracks in bold
         """
 
-        # Clear selection if required
-        if clear_selection:
-            self.clear_selection()
-
         current_row: Optional[int] = self._get_current_track_row()
         next_row: Optional[int] = self._get_next_track_row()
         played = [
diff --git a/pyproject.toml b/pyproject.toml
index 8fa9d1d..47c6dd6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,3 +41,7 @@ flakehell = "^0.9.0"
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.mypy]
+mypy_path = "/home/kae/.cache/pypoetry/virtualenvs/musicmuster-oWgGw1IG-py3.9:/home/kae/git/musicmuster/app"
+plugins = "sqlalchemy.ext.mypy.plugin"
+