Implemented sorting by track title, artist name etc...

(Sorting order is not getting saved.)
This commit is contained in:
The Wobbler 2025-02-23 16:38:56 +01:00
parent 1b69321c05
commit 3dd9123332
3 changed files with 100 additions and 21 deletions

View file

@ -1,7 +1,7 @@
#!/usr/bin/python3
from PyQt6.QtCore import pyqtSignal
from PyQt6.QtGui import QDropEvent, QIcon, QFont
from PyQt6.QtCore import Qt, pyqtSignal
from PyQt6.QtGui import QDropEvent, QIcon
from PyQt6.QtWidgets import QTreeWidget, QAbstractItemView
from .track import TrackItem
@ -20,6 +20,9 @@ class PlaylistView(QTreeWidget):
self.app = playlist.app
self.header = self.header()
self.header.setSectionsClickable(True)
playlist.views[id(dock)] = self
self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
@ -37,30 +40,58 @@ class PlaylistView(QTreeWidget):
self.setHeaderLabels(headers)
self.itemActivated.connect(self.on_track_activation)
self.header.sectionClicked.connect(self.on_header_click)
def on_user_sort(self):
def on_header_click(self, section_index: int):
if section_index == 0: # this would just invert the current sorting
return
sorting = self.playlist.sorting
last_sort_section_index, order = sorting[4]
if last_sort_section_index == section_index:
order = not order # invert order
self.playlist.sorting[4] = (section_index, order) # set sorting
# convert True/False to Qt.SortOrder.AscendingOrder/Qt.SortOrder.DescendingOrder
qorder = Qt.SortOrder.AscendingOrder if order else Qt.SortOrder.DescendingOrder
self.header.setSortIndicator(section_index, qorder)
else:
del sorting[0] # remove first sort
sorting.append((section_index, True)) # last sort is this section index, ascending
self.header.setSortIndicator(section_index, Qt.SortOrder.AscendingOrder)
self.sort()
def sort(self):
for index, order in self.playlist.sorting:
# convert True/False to Qt.SortOrder.AscendingOrder/Qt.SortOrder.DescendingOrder
qorder = Qt.SortOrder.AscendingOrder if order else Qt.SortOrder.DescendingOrder
self.sortItems(index, qorder)
self.on_sort()
def on_sort(self, user_sort: bool=False):
num_tracks = self.topLevelItemCount()
i = 0
while i < num_tracks:
track_item = self.topLevelItem(i)
track = track_item.track
track_item.index_user_sort = i
track_item.index = i
track_item.setText(5, str(i + 1))
self.playlist.tracks[i] = track
track.set_occurrences()
track = self.topLevelItem(i)
i += 1
# make sure the next track is cached (could be moved by user)
if self.app.player.current_playlist == self.playlist and self.app.player.current_playlist.has_tracks():
self.app.player.cache_next_track()
track.setText(0, str(i)) # 0 = index
if user_sort:
track.setText(4, str(i)) # 4 = user sort index
self.playlist.sync(self, user_sort) # sync playlist to this view
def dropEvent(self, event: QDropEvent):
# receive items that were dropped and create new items from its tracks (new items bc. widgets can only have
@ -88,7 +119,7 @@ class PlaylistView(QTreeWidget):
event.accept()
self.on_user_sort()
self.on_sort(True)
def dragEnterEvent(self, event):
# store dragged items in gui.dropped, so the other playlist can receive it