From 3abb39916d53ece50b821723c3200f5b462e1349 Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Thu, 5 Oct 2017 17:33:58 +0200 Subject: [PATCH] Add LIMIT_ALWAYS option which limits the queue length always --- marietje/marietje/settings.py | 1 + marietje/queues/models.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/marietje/marietje/settings.py b/marietje/marietje/settings.py index f7a7621..577fa9e 100644 --- a/marietje/marietje/settings.py +++ b/marietje/marietje/settings.py @@ -148,4 +148,5 @@ MAIL_FROM = 'marietje@hardcoding.nl' MAX_MINUTES_IN_A_ROW = 20 # Time range (dependent on timezone specified) when MAX_MINUTES_IN_A_ROW is in effect. +LIMIT_ALWAYS = False LIMIT_HOURS = (12, 16) diff --git a/marietje/queues/models.py b/marietje/queues/models.py index 69eb785..2d3c18a 100644 --- a/marietje/queues/models.py +++ b/marietje/queues/models.py @@ -124,9 +124,10 @@ class Queue(models.Model): seconds_in_a_row += playlist_song.song.duration now = timezone.now() - 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 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 order is None: order = 0