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

Merge branch 'marietje-zuid' of marietje-zuid.science.ru.nl:/srv/MarietjeDjango into marietje-zuid

Browse Source
This commit is contained in:
Daan Sprenkels
2018-04-09 19:20:36 +02:00
parent 644e654fef dfd4752dea
commit f06e782846
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
marietje/marietje/settings.py
View File

@ -112,12 +112,12 @@ LOGOUT_REDIRECT_URL = '/'
BERTHA_HOST = ('bach.science.ru.nl', 1234) BERTHA_HOST = ('bach.science.ru.nl', 1234)
MAIL_FROM = 'marietje@marietje.science.ru.nl' 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. # Time range (dependent on timezone specified) when MAX_MINUTES_IN_A_ROW is in effect.
LIMIT_HOURS = (12, 13) LIMIT_HOURS = (12, 13)
LIMIT_MINUTES = (15, 45) LIMIT_MINUTES = (15, 45)
LIMIT_ALWAYS = 45 LIMIT_ALWAYS = True
CONTACT_EMAIL = 'marietje@science.ru.nl' CONTACT_EMAIL = 'marietje@science.ru.nl'

18
marietje/queues/migrations/0006_state_db_index.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.0.4 on 2018-04-09 15:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('queues', '0005_playlistsong_played_at'),
]
operations = [
migrations.AlterField(
model_name='playlistsong',
name='state',
field=models.IntegerField(db_index=True, default=0),
),
]

10
marietje/queues/models.py
View File

@ -35,7 +35,7 @@ class PlaylistSong(models.Model):
# 1: Playing. # 1: Playing.
# 2: Played. # 2: Played.
# 3: Cancelled. # 3: Cancelled.
state = models.IntegerField(default=0) state = models.IntegerField(default=0, db_index=True)
def move_up(self): def move_up(self):
other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__lt=self.id)\ other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__lt=self.id)\
@ -112,13 +112,7 @@ class Queue(models.Model):
def request(self, song, user): def request(self, song, user):
playlist_songs = PlaylistSong.objects.filter(playlist=self.playlist, state=0).order_by('id') playlist_songs = PlaylistSong.objects.filter(playlist=self.playlist, state=0).order_by('id')
seconds_in_a_row = sum(ps.song.duration for ps in playlist_songs if ps.user == user)
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
now = timezone.now() now = timezone.now()
if not user.is_superuser: if not user.is_superuser: