fix: case insensitive sorting on sort_tracks

This commit is contained in:
cwilvx
2024-09-08 23:54:41 +03:00
parent ee3c432e9c
commit cd8a617f83
2 changed files with 22 additions and 12 deletions
+8 -9
View File
@@ -1,6 +1,6 @@
from itertools import groupby
import os
from pprint import pprint
from typing import Callable
from app.lib.albumslib import sort_by_track_no
from app.models.folder import Folder
from app.models.track import Track
@@ -14,25 +14,24 @@ def sort_tracks(tracks: list[Track], key: str, reverse: bool = False):
if key == "default":
return tracks
sortfunc = lambda x: getattr(x, key)
sortfunc: Callable[[Track], str] = lambda track: getattr(track, key)
if key == "artists" or key == "albumartists":
sortfunc = lambda x: getattr(x, key)[0]["name"]
sortfunc = lambda track: getattr(track, key)[0]["name"]
if key == "disc":
# INFO: Group tracks into albums, then sort them by disc number.
tracks = sorted(tracks, key=lambda x: x.album)
tracks = sorted(tracks, key=lambda x: x.album.casefold())
groups = groupby(tracks, lambda x: x.albumhash)
return flatten([sort_by_track_no(list(g)) for k, g in groups])
# INFO: sort tracks by title for a fallback value
tracks = sorted(tracks, key=lambda t: t.title)
tracks = sorted(tracks, key=lambda t: t.title.casefold())
if key == "title" and not reverse:
return tracks
return sorted(tracks, key=sortfunc, reverse=reverse)
return sorted(tracks, key=lambda track: sortfunc(track).casefold(), reverse=reverse)
def sort_folders(folders: list[Folder], key: str, reverse: bool = False):
@@ -42,9 +41,9 @@ def sort_folders(folders: list[Folder], key: str, reverse: bool = False):
if key == "default":
return folders
sortfunc = lambda x: getattr(x, key)
sortfunc: Callable[[Folder], str | float] = lambda folder: getattr(folder, key)
if key == "lastmod":
sortfunc = lambda x: os.path.getmtime(x.path)
sortfunc = lambda folder: os.path.getmtime(folder.path)
return sorted(folders, key=sortfunc, reverse=reverse)