enable sorting in playlist

core/repositories.py

@@ -130,6 +130,37 @@ class SessionTrackRepository(Repository):
             .order_by(SessionTrack.order)\
             .all()
 
+    def set_session_track_order(self, session_track, new_order, commit=False):
+        if new_order == session_track.order:
+            return
+
+        session_tracks = self.session.query(SessionTrack)\
+            .filter(SessionTrack.session_id == session_track.session_id)\
+            .order_by(SessionTrack.order)\
+            .all()
+
+        max_order = max(st.order for st in session_tracks)
+
+        new_order = max([new_order, 1])
+        new_order = min([new_order, max_order])
+
+        for other in session_tracks:
+            if new_order > session_track.order and new_order >= other.order > session_track.order:
+                other.order -= 1
+            elif new_order < session_track.order and new_order <= other.order < session_track.order:
+                other.order += 1
+
+        if new_order < 1:
+            new_order = 1
+        elif new_order > max_order:
+            new_order = max_order
+
+        session_track.order = new_order
+
+        if commit:
+            self.commit()
+
+
 class SessionFolderRepository(Repository):
     MODEL_CLS = SessionFolder
 

ui/qt/main.ui

@@ -1394,7 +1394,7 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QToolButton" name="btnPlaylistMoveToBelow">
+                   <widget class="QToolButton" name="btnPlaylistMoveDown">
                     <property name="minimumSize">
                      <size>
                       <width>28</width>

ui/qt/main_ui.py

@@ -523,14 +523,14 @@ class Ui_mainWindow(object):
         self.btnPlaylistMoveUp.setIcon(icon8)
         self.btnPlaylistMoveUp.setObjectName("btnPlaylistMoveUp")
         self.horizontalLayout_22.addWidget(self.btnPlaylistMoveUp)
-        self.btnPlaylistMoveToBelow = QtWidgets.QToolButton(self.page_3)
-        self.btnPlaylistMoveToBelow.setMinimumSize(QtCore.QSize(28, 28))
-        self.btnPlaylistMoveToBelow.setMaximumSize(QtCore.QSize(28, 288))
+        self.btnPlaylistMoveDown = QtWidgets.QToolButton(self.page_3)
+        self.btnPlaylistMoveDown.setMinimumSize(QtCore.QSize(28, 28))
+        self.btnPlaylistMoveDown.setMaximumSize(QtCore.QSize(28, 288))
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-down.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistMoveToBelow.setIcon(icon9)
-        self.btnPlaylistMoveToBelow.setObjectName("btnPlaylistMoveToBelow")
-        self.horizontalLayout_22.addWidget(self.btnPlaylistMoveToBelow)
+        self.btnPlaylistMoveDown.setIcon(icon9)
+        self.btnPlaylistMoveDown.setObjectName("btnPlaylistMoveDown")
+        self.horizontalLayout_22.addWidget(self.btnPlaylistMoveDown)
         self.btnPlaylistMoveToBottom = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistMoveToBottom.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistMoveToBottom.setMaximumSize(QtCore.QSize(28, 28))
@@ -755,7 +755,7 @@ class Ui_mainWindow(object):
         item.setText(_translate("mainWindow", "Label"))
         self.btnPlaylistMoveToTop.setText(_translate("mainWindow", "..."))
         self.btnPlaylistMoveUp.setText(_translate("mainWindow", "..."))
-        self.btnPlaylistMoveToBelow.setText(_translate("mainWindow", "..."))
+        self.btnPlaylistMoveDown.setText(_translate("mainWindow", "..."))
         self.btnPlaylistMoveToBottom.setText(_translate("mainWindow", "..."))
         self.btnPlaylistRemove.setText(_translate("mainWindow", "..."))
         self.label.setText(_translate("mainWindow", "Page 4"))

ui/qt/widgets/playlist_table.py

@@ -88,3 +88,28 @@ class PlaylistTable(DragDropTableWidget):
             else:
                 icon = QIcon()
             self.item(i, 2).setIcon(icon)
+
+    def update_session_track_order(self, session_track, new_order):
+        session_track_repo = SessionTrackRepository()
+        session_track_repo.set_session_track_order(session_track, new_order, True)
+        self.populate()
+
+    def move_selected_up(self, track):
+        session_track = self.selected_session_track()
+        if session_track:
+            self.update_session_track_order(session_track, session_track.order - 1)
+
+    def move_selected_down(self, track):
+        session_track = self.selected_session_track()
+        if session_track:
+            self.update_session_track_order(session_track, session_track.order + 1)
+
+    def move_selected_to_top(self, track):
+        session_track = self.selected_session_track()
+        if session_track:
+            self.update_session_track_order(session_track, 0)
+
+    def move_selected_to_bottom(self, track):
+        session_track = self.selected_session_track()
+        if session_track:
+            self.update_session_track_order(session_track, 99999999)

ui/window.py

@@ -93,11 +93,15 @@ class MainWindow(QMainWindow):
 
         self.ui.explorerAddToPlaylist.clicked.connect(self.add_to_playlist)
 
-        self.ui.btnPlaylistRemove.clicked.connect(self.remove_from_playlist)
-
         self.ui.explorerPlaylist.trackSelected.connect(self.newTrackSelected)
         self.ui.explorerPlaylist.trackDoubleClicked.connect(self.play_playlist)
 
+        self.ui.btnPlaylistMoveToTop.clicked.connect(self.ui.explorerPlaylist.move_selected_to_top)
+        self.ui.btnPlaylistMoveUp.clicked.connect(self.ui.explorerPlaylist.move_selected_up)
+        self.ui.btnPlaylistMoveDown.clicked.connect(self.ui.explorerPlaylist.move_selected_down)
+        self.ui.btnPlaylistMoveToBottom.clicked.connect(self.ui.explorerPlaylist.move_selected_to_bottom)
+        self.ui.btnPlaylistRemove.clicked.connect(self.remove_from_playlist)
+
         # Page 5 - settings
         self.ui.settingsMusicFoldersTable.setColumnHidden(0, 1)
         self.ui.musicFoldersAddButton.clicked.connect(self.add_music_folder)