Wobbl/Wobuzz
Wobbl/Wobuzz
1
0
Fork 1
Code Issues 8 Pull requests Projects 1 Releases 3 Packages Wiki Activity

Added display of track genres.

Browse source
This commit is contained in:
The Wobbler 2025-03-07 19:24:41 +01:00
parent 9e20e21e6f
commit 209335b005
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wobuzz/player/playlist.py
View file

@ -284,7 +284,7 @@ class Playlist:
def save(self): def save(self):
first_view = list(self.views.values())[0] first_view = list(self.views.values())[0]
first_view.sortItems(4, Qt.SortOrder.AscendingOrder) first_view.sortItems(5, Qt.SortOrder.AscendingOrder) # sort by custom sorting
self.sync(first_view) self.sync(first_view)
wbzm3u = WobuzzM3U(self.path) wbzm3u = WobuzzM3U(self.path)
@ -299,7 +299,7 @@ class Playlist:
wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackTitle(track.metadata.title)) wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackTitle(track.metadata.title))
wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackArtist(track.metadata.artist)) wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackArtist(track.metadata.artist))
wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackAlbum(track.metadata.album)) wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackAlbum(track.metadata.album))
# wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackGenre(track.metadata.genre)) wbz_data += wbzm3u.assemble_line(WBZM3UData.TrackMetadata.TrackGenre(track.metadata.genre))
wbz_data += wbzm3u.assemble_line(WBZM3UData.Path(track.path)) wbz_data += wbzm3u.assemble_line(WBZM3UData.Path(track.path))

7
wobuzz/player/track.py
View file

@ -13,6 +13,7 @@ class TrackMetadata:
title: str | None=None title: str | None=None
artist: str | None=None artist: str | None=None
album: str | None=None album: str | None=None
genre: str | None=None
images: TTImages | None=None # tinytag images images: TTImages | None=None # tinytag images
def add_missing(self): def add_missing(self):
@ -26,15 +27,19 @@ class TrackMetadata:
if self.album == "None": if self.album == "None":
self.album = "" self.album = ""
if self.genre == "None":
self.genre = ""
if self.path is None: # can't add missing information without a path if self.path is None: # can't add missing information without a path
return return
if self.title is None or self.artist is None or self.album is None: if self.title is None or self.artist is None or self.album is None or self.genre is None:
tags = TinyTag.get(self.path, ignore_errors=True, duration=False) tags = TinyTag.get(self.path, ignore_errors=True, duration=False)
self.title = tags.title self.title = tags.title
self.artist = tags.artist self.artist = tags.artist
self.album = tags.album self.album = tags.album
self.genre = tags.genre
class Track: class Track:

7
wobuzz/ui/playlist_view.py
View file

@ -30,13 +30,14 @@ class PlaylistView(QTreeWidget):
self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) self.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
self.setColumnCount(4) self.setColumnCount(5)
headers = [ headers = [
"#", "#",
"Title", "Title",
"Artist", "Artist",
"Album", "Album",
"Genre",
"# Custom Sorting" "# Custom Sorting"
] ]
@ -98,7 +99,7 @@ class PlaylistView(QTreeWidget):
track.setText(0, str(i)) # 0 = index track.setText(0, str(i)) # 0 = index
if user_sort: if user_sort:
track.setText(4, str(i)) # 4 = user sort index track.setText(5, str(i)) # 5 = user sort index
if user_sort: if user_sort:
# set last sort to user sort # set last sort to user sort
@ -107,7 +108,7 @@ class PlaylistView(QTreeWidget):
self.playlist.sorting.append(WBZM3UData.SortOrder(WBZM3UData.SortOrder.custom_sorting, True)) self.playlist.sorting.append(WBZM3UData.SortOrder(WBZM3UData.SortOrder.custom_sorting, True))
self.header.setSortIndicator(4, Qt.SortOrder.AscendingOrder) self.header.setSortIndicator(5, Qt.SortOrder.AscendingOrder)
self.playlist.sync(self, user_sort) # sync playlist to this view self.playlist.sync(self, user_sort) # sync playlist to this view

9
wobuzz/ui/track.py
View file

@ -41,26 +41,29 @@ class TrackItem(QTreeWidgetItem):
self.setText(1, track.metadata.title) self.setText(1, track.metadata.title)
self.setText(2, track.metadata.artist) self.setText(2, track.metadata.artist)
self.setText(3, track.metadata.album) self.setText(3, track.metadata.album)
self.setText(4, str(self.index_user_sort + 1)) self.setText(4, track.metadata.genre)
self.setText(5, str(self.index_user_sort + 1))
def mark(self): def mark(self):
self.setIcon(0, self.playing_mark) self.setIcon(0, self.playing_mark)
self.setFont(1, self.bold_font) self.setFont(1, self.bold_font)
self.setFont(2, self.bold_font) self.setFont(2, self.bold_font)
self.setFont(3, self.normal_font) self.setFont(3, self.bold_font)
self.setFont(4, self.bold_font)
def unmark(self): def unmark(self):
self.setIcon(0, QIcon(None)) self.setIcon(0, QIcon(None))
self.setFont(1, self.normal_font) self.setFont(1, self.normal_font)
self.setFont(2, self.normal_font) self.setFont(2, self.normal_font)
self.setFont(3, self.normal_font) self.setFont(3, self.normal_font)
self.setFont(4, self.normal_font)
def __lt__(self, other): def __lt__(self, other):
# make numeric strings get sorted the right way # make numeric strings get sorted the right way
column = self.parent.sortColumn() column = self.parent.sortColumn()
if column == 0 or column == 4: if column == 0 or column == 5:
return int(self.text(column)) < int(other.text(column)) return int(self.text(column)) < int(other.text(column))
else: else: