From dfd4752dea54a0219e2642341b2a4b9f580866ac Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Mon, 9 Apr 2018 18:06:12 +0200 Subject: [PATCH] Use southern style queue limit --- marietje/marietje/settings.py | 4 ++-- marietje/queues/models.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/marietje/marietje/settings.py b/marietje/marietje/settings.py index a2b8b5d..f365330 100644 --- a/marietje/marietje/settings.py +++ b/marietje/marietje/settings.py @@ -112,12 +112,12 @@ LOGOUT_REDIRECT_URL = '/' BERTHA_HOST = ('bach.science.ru.nl', 1234) MAIL_FROM = 'marietje@marietje.science.ru.nl' -MAX_MINUTES_IN_A_ROW = 20 +MAX_MINUTES_IN_A_ROW = 45 # Time range (dependent on timezone specified) when MAX_MINUTES_IN_A_ROW is in effect. LIMIT_HOURS = (12, 13) LIMIT_MINUTES = (15, 45) -LIMIT_ALWAYS = 45 +LIMIT_ALWAYS = True CONTACT_EMAIL = 'marietje@science.ru.nl' diff --git a/marietje/queues/models.py b/marietje/queues/models.py index 75bb015..9f8c5db 100644 --- a/marietje/queues/models.py +++ b/marietje/queues/models.py @@ -112,13 +112,7 @@ class Queue(models.Model): def request(self, song, user): playlist_songs = PlaylistSong.objects.filter(playlist=self.playlist, state=0).order_by('id') - - seconds_in_a_row = 0 - for playlist_song in playlist_songs: - if playlist_song.user != user: - seconds_in_a_row = 0 - else: - seconds_in_a_row += playlist_song.song.duration + seconds_in_a_row = sum(ps.song.duration for ps in playlist_songs if ps.user == user) now = timezone.now() if not user.is_superuser: