From f0b9ab4256c572291c4593ca556ecb9bb295c366 Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Wed, 9 Mar 2022 21:40:47 +0000
Subject: [PATCH] Fix up remove track from playlist

---
 app/models.py     |  1 -
 app/playlists.py  |  3 ++-
 test_playlists.py | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/models.py b/app/models.py
index 4407451..07b2275 100644
--- a/app/models.py
+++ b/app/models.py
@@ -357,7 +357,6 @@ class Playlists(Base):
             PlaylistTracks.playlist_id == self.id,
             PlaylistTracks.row == row
         ).delete()
-        session.commit()
 
 
 class PlaylistTracks(Base):
diff --git a/app/playlists.py b/app/playlists.py
index 05c9e10..2a80c44 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -975,12 +975,13 @@ class PlaylistTab(QTableWidget):
 
             # delete in reverse row order so row numbers don't
             # change
+            playlist = Playlists.get_by_id(session, self.playlist_id)
             for row in sorted(rows_to_delete, reverse=True):
                 if row in note_rows:
                     note: Notes = self._get_row_notes_object(row, session)
                     note.delete_note(session)
                 else:
-                    self.remove_track(session, row)
+                    playlist.remove_track(session, row)
                 self.removeRow(row)
 
                 self.save_playlist(session)
diff --git a/test_playlists.py b/test_playlists.py
index 0d27857..c99d929 100644
--- a/test_playlists.py
+++ b/test_playlists.py
@@ -168,7 +168,7 @@ def test_clear_next(qtbot, session):
 def test_get_selected_row(qtbot, session):
 
     # Create playlist
-    playlist = Playlists(session, "my playlist")
+    playlist = Playlists(session, "test playlist")
     playlist_tab = PlaylistTab(None, session, playlist.id)
 
     # Add some tracks
@@ -189,3 +189,34 @@ def test_get_selected_row(qtbot, session):
     qtbot.mouseClick(
         playlist_tab.viewport(), Qt.LeftButton, pos=rect.center()
     )
+
+
+def test_set_next(qtbot, session):
+
+    # Create testing playlist
+    playlist = Playlists(session, "test playlist")
+    playlist_tab = PlaylistTab(None, session, playlist.id)
+
+    # Add some tracks
+    track1_path = "testdata/isa.mp3"
+    track1 = Tracks(session, track1_path)
+    playlist_tab.insert_track(session, track1)
+    track2_path = "mom.mp3"
+    track2 = Tracks(session, track2_path)
+    playlist_tab.insert_track(session, track2)
+
+    window = Window()
+    qtbot.addWidget(playlist_tab)
+    with qtbot.waitExposed(window):
+        window.show()
+    row0_item2 = playlist_tab.item(0, 2)
+    assert row0_item2 is not None
+    rect = playlist_tab.visualItemRect(row0_item2)
+    qtbot.mouseClick(
+        playlist_tab.viewport(), Qt.LeftButton, pos=rect.center()
+    )
+    qtbot.wait(10000)
+    qtbot.keyPress(playlist_tab.viewport(), "N",
+                   modifier=Qt.ControlModifier)
+    qtbot.wait(2000)
+    pass