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

Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"

Browse Source 
This reverts merge request !30
This commit is contained in:
Gerdriaan Mulder
2019-03-28 19:05:09 +01:00
parent e4fcdd7434
commit 102874cc86
5 changed files with 146 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
marietje/api/views.py
View File

@ -168,25 +168,12 @@ def managesongs(request):
@api_auth_required
def queue(request):
queue = request.user.queue
infobar = {"start_personal_queue": 0, "length_personal_queue": 0, "length_total_queue": 0, "end_personal_queue": 0}
for song in queue.queue():
infobar["length_total_queue"] += song.song.duration
if song.user == request.user:
infobar["length_personal_queue"] += song.song.duration
infobar["end_personal_queue"] = infobar["length_total_queue"]
if infobar["start_personal_queue"] == 0:
infobar["start_personal_queue"] = infobar["length_total_queue"] - song.song.duration
json = {
return JsonResponse({
'current_song': playlist_song_to_dict(queue.current_song()),
'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(queue.started_at.timestamp()),
'current_time': int(time.time()),
'user_name': request.user.name,
'infobar': infobar,
}
return JsonResponse(json)
'current_time': int(time.time())
})
@api_auth_required
@ -229,10 +216,10 @@ def request(request):
err = queue.request(song, request.user)
if err != None:
return JsonResponse({'success': False, 'message': err})
return JsonResponse({ 'success': False, 'message': err })
request_counter.labels(queue=queue.name).inc()
return JsonResponse({'success': True})
return JsonResponse({ 'success': True })
@require_http_methods(["POST"])
@ -243,8 +230,7 @@ def report(request):
msg = request.POST.get('msg')
err = song.report(request.user, msg)
return JsonResponse({'success': True})
return JsonResponse({ 'success': True })
@require_http_methods(["POST"])