github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-12-22 08:56:17 +00:00
Code Issues Releases Wiki Activity

Potential fix for hypothetical Pony version 0.8

Browse Source
This commit is contained in:
Alban Féron 2020-11-10 11:36:44 +01:00
parent cec216684d
commit 883623c558
No known key found for this signature in database
GPG Key ID: 8CE0313646D16165
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
supysonic/api/albums_songs.py
View File

@ -88,15 +88,15 @@ def album_list():
), ),
) )
elif ltype == "newest": elif ltype == "newest":
query = query.order_by(desc(Folder.created)).distinct() query = query.sort_by(desc(Folder.created)).distinct()
elif ltype == "highest": elif ltype == "highest":
query = query.order_by(lambda f: desc(avg(f.ratings.rating))) query = query.sort_by(lambda f: desc(avg(f.ratings.rating)))
elif ltype == "frequent": elif ltype == "frequent":
query = query.order_by(lambda f: desc(avg(f.tracks.play_count))) query = query.sort_by(lambda f: desc(avg(f.tracks.play_count)))
elif ltype == "recent": elif ltype == "recent":
query = select( query = select(
t.folder for t in Track if max(t.folder.tracks.last_play) is not None t.folder for t in Track if max(t.folder.tracks.last_play) is not None
).order_by(lambda f: desc(max(f.tracks.last_play))) ).sort_by(lambda f: desc(max(f.tracks.last_play)))
elif ltype == "starred": elif ltype == "starred":
query = select( query = select(
s.starred s.starred
@ -104,9 +104,9 @@ def album_list():
if s.user.id == request.user.id and count(s.starred.tracks) > 0 if s.user.id == request.user.id and count(s.starred.tracks) > 0
) )
elif ltype == "alphabeticalByName": elif ltype == "alphabeticalByName":
query = query.order_by(Folder.name).distinct() query = query.sort_by(Folder.name).distinct()
elif ltype == "alphabeticalByArtist": elif ltype == "alphabeticalByArtist":
query = query.order_by(lambda f: f.parent.name + f.name) query = query.sort_by(lambda f: f.parent.name + f.name)
else: else:
raise GenericError("Unknown search type") raise GenericError("Unknown search type")