From 9110a1d9e9a5bf9c4d47dffa2def58afb2ef0016 Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Thu, 2 Nov 2017 19:23:30 +0100 Subject: [PATCH] Implement traditional queue length restrictions --- marietje/queues/models.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/marietje/queues/models.py b/marietje/queues/models.py index a67ca89..8944dfa 100644 --- a/marietje/queues/models.py +++ b/marietje/queues/models.py @@ -121,10 +121,15 @@ class Queue(models.Model): seconds_in_a_row += playlist_song.song.duration now = timezone.now() - if not settings.LIMIT_ALWAYS: - if seconds_in_a_row > 0 and seconds_in_a_row + song.duration > settings.MAX_MINUTES_IN_A_ROW * 60\ - and not user.is_superuser and settings.LIMIT_HOURS[0] <= now.hour < settings.LIMIT_HOURS[1]: - return False + if not user.is_superuser: + if settings.LIMIT_ALWAYS: + if seconds_in_a_row > settings.MAX_MINUTES_IN_A_ROW * 60: + return False + else: + if seconds_in_a_row > 0 and \ + seconds_in_a_row + song.duration > settings.MAX_MINUTES_IN_A_ROW * 60 and \ + settings.LIMIT_HOURS[0] <= now.hour < settings.LIMIT_HOURS[1]: + return False playlist_song = PlaylistSong(playlist=self.playlist, song=song, user=user) playlist_song.save()