Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

This commit is contained in:
Lars van Rhijn
2023-09-14 19:55:51 +02:00
parent 379ababcc0
commit d1a1be7e2e
124 changed files with 4835 additions and 3490 deletions

View File

@ -3,11 +3,13 @@ from django.db.models import Q
from django.conf import settings
from django.utils import timezone
from queues.exceptions import RequestException
from songs.models import Song
class Playlist(models.Model):
def __str__(self):
return 'Playlist #' + str(self.id)
return "Playlist #" + str(self.id)
class PlaylistSong(models.Model):
@ -16,6 +18,7 @@ class PlaylistSong(models.Model):
on_delete=models.SET_NULL,
blank=True,
null=True,
related_name="songs",
)
song = models.ForeignKey(
Song,
@ -37,14 +40,13 @@ class PlaylistSong(models.Model):
# 2: Played.
# 3: Cancelled.
STATECHOICE = (
(0, 'Queued'),
(1, 'Playing'),
(2, 'Played'),
(3, 'Cancelled'),
(0, "Queued"),
(1, "Playing"),
(2, "Played"),
(3, "Cancelled"),
)
state = models.IntegerField(default=0, db_index=True, choices=STATECHOICE)
def move_down(self):
other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__gt=self.id).first()
old_id = self.id
@ -54,17 +56,17 @@ class PlaylistSong(models.Model):
other_song.save()
def __str__(self):
return 'Playlist #' + str(self.playlist_id) + ': ' + str(self.song)
return "Playlist #" + str(self.playlist_id) + ": " + str(self.song)
class Queue(models.Model):
class Meta:
permissions = (
('can_skip', 'Can skip the currently playing song'),
('can_move', 'Can move all songs in the queue'),
('can_cancel', 'Can cancel all songs in the queue'),
('can_control_volume', 'Can control the volume of Marietje'),
('unlimited_queue_length', 'Is unlimited by maximum queue length'),
("can_skip", "Can skip the currently playing song"),
("can_move", "Can move all songs in the queue"),
("can_cancel", "Can cancel all songs in the queue"),
("can_control_volume", "Can control the volume of Marietje"),
("unlimited_queue_length", "Is unlimited by maximum queue length"),
)
name = models.TextField()
@ -75,35 +77,26 @@ class Queue(models.Model):
null=True,
)
random_playlist = models.ForeignKey(
Playlist,
on_delete=models.SET_NULL,
blank=True,
null=True,
related_name='random_playlist_set'
Playlist, on_delete=models.SET_NULL, blank=True, null=True, related_name="random_playlist_set"
)
started_at = models.DateTimeField(blank=True, null=True)
songs = None
player_token = models.TextField(blank=True, null=True)
def get_songs(self):
if self.songs is None:
self.fill_random_queue()
self.songs = PlaylistSong.objects\
.filter(Q(playlist=self.playlist_id) | Q(playlist_id=self.random_playlist_id),
Q(state=0) | Q(state=1))\
.order_by('-state', 'playlist_id', 'id')\
.select_related('song', 'user')
return self.songs
self.fill_random_queue()
return (
PlaylistSong.objects.filter(
Q(playlist=self.playlist_id) | Q(playlist_id=self.random_playlist_id), Q(state=0) | Q(state=1)
)
.order_by("-state", "playlist_id", "id")
.select_related("song", "user")
)
def current_song(self):
songs = self.get_songs()
if not songs:
return None
song = songs[0]
if song.state != 1:
song.state = 1
song.save()
return song
return songs[0]
def queue(self):
songs = self.get_songs()
@ -112,37 +105,38 @@ class Queue(models.Model):
return songs[1:]
def request(self, song, user):
if not user.has_perm('queues.unlimited_queue_length'):
playlist_songs = PlaylistSong.objects.filter(playlist=self.playlist, state=0).order_by('id')
if user is not None and not user.has_perm("queues.unlimited_queue_length"):
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)
msg = 'You cannot request more than ' + str(settings.MAX_MINUTES_IN_A_ROW) + ' minutes in a row.'
msg = "You cannot request more than " + str(settings.MAX_MINUTES_IN_A_ROW) + " minutes in a row."
if settings.LIMIT_ALWAYS:
if seconds_in_a_row > settings.MAX_MINUTES_IN_A_ROW * 60:
return msg
raise RequestException(msg)
else:
now = timezone.now()
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 msg
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]
):
raise RequestException(msg)
if {ps for ps in playlist_songs if ps.song == song}:
return 'This song is already in the queue.'
raise RequestException("This song is already in the queue.")
playlist_song = PlaylistSong(playlist=self.playlist, song=song, user=user)
playlist_song.save()
playlist_song = PlaylistSong.objects.create(playlist=self.playlist, song=song, user=user)
# If the song was auto-queue'd, then remove it from the auto-queue
autolist_songs = PlaylistSong.objects.filter(playlist=self.random_playlist, state=0, song=song)
autolist_songs.delete()
return None
return playlist_song
def fill_random_queue(self):
song_count = PlaylistSong.objects.filter(playlist_id=self.random_playlist_id, state=0).count()
while song_count < 5:
song = Song.objects.filter(deleted=False).order_by('?').first()
song = Song.objects.filter(deleted=False).order_by("?").first()
if song is None:
return
playlist_song = PlaylistSong(playlist=self.random_playlist, song=song, user=None)