technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 23:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to delete or move their requested songs down.

Browse Source
This commit is contained in:
Jim Driessen
2017-01-24 17:42:35 +01:00
parent b04a547b34
commit 6601aaeffd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marietje/api/views.py
View File

@ -103,7 +103,7 @@ def queue(request):
queue = request.user.queue queue = request.user.queue
return JsonResponse({ return JsonResponse({
'current_song': playlist_song_to_dict(queue.current_song()), 'current_song': playlist_song_to_dict(queue.current_song()),
'queue': [playlist_song_to_dict(playlist_song) for playlist_song in queue.queue()], 'queue': [playlist_song_to_dict(playlist_song, user=request.user) for playlist_song in queue.queue()],
'started_at': 0 if queue.started_at is None else int(time.mktime(queue.started_at.timetuple())), 'started_at': 0 if queue.started_at is None else int(time.mktime(queue.started_at.timetuple())),
'current_time': int(time.time()) 'current_time': int(time.time())
}) })

5
marietje/marietje/utils.py
View File

@ -19,11 +19,12 @@ def song_to_dict(song, hash=False, user=False):
return data return data
def playlist_song_to_dict(playlist_song, hash=False): def playlist_song_to_dict(playlist_song, hash=False, user=None):
return { return {
'id': playlist_song.id, 'id': playlist_song.id,
'requested_by': 'Marietje' if playlist_song.user is None else playlist_song.user.name, 'requested_by': 'Marietje' if playlist_song.user is None else playlist_song.user.name,
'song': song_to_dict(playlist_song.song, hash=hash) 'song': song_to_dict(playlist_song.song, hash=hash),
'can_move_down': playlist_song.user is not None and playlist_song.user == user
} }