From 48dcf3bd9d5b19207eb8275ff4abfedbcc3200fb Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Wed, 7 Feb 2024 14:07:36 +0100 Subject: [PATCH] Refactors en stemmen werkt --- playlist/models/__init__.py | 1 + playlist/models/track.py | 2 +- playlist/models/utils/__init__.py | 1 - playlist/models/utils/json.py | 8 ------ playlist/templates/Base.html | 2 +- playlist/templates/SpotifyEmbed.html | 35 ++++++++++++++++++++++--- playlist/templates/Vote.html | 8 ++---- playlist/views.py | 38 ++++++++++++++++++---------- 8 files changed, 61 insertions(+), 34 deletions(-) delete mode 100644 playlist/models/utils/__init__.py delete mode 100644 playlist/models/utils/json.py diff --git a/playlist/models/__init__.py b/playlist/models/__init__.py index 5adb237..9db89c7 100644 --- a/playlist/models/__init__.py +++ b/playlist/models/__init__.py @@ -1,3 +1,4 @@ from .track import Track from .artist import Artist from .album import Album +from .vote import Vote diff --git a/playlist/models/track.py b/playlist/models/track.py index 8a1557a..d41fe57 100644 --- a/playlist/models/track.py +++ b/playlist/models/track.py @@ -1,7 +1,7 @@ from django.db import models +from random import choice from .album import Album from .artist import Artist -from .utils import from_json class TrackManager(models.Manager): def get_queryset(self): diff --git a/playlist/models/utils/__init__.py b/playlist/models/utils/__init__.py deleted file mode 100644 index 9956987..0000000 --- a/playlist/models/utils/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .json import from_json diff --git a/playlist/models/utils/json.py b/playlist/models/utils/json.py deleted file mode 100644 index 85988f5..0000000 --- a/playlist/models/utils/json.py +++ /dev/null @@ -1,8 +0,0 @@ -def from_json(cls, json): - try: - return cls.objects.get(pk=json["id"]) - except cls.DoesNotExist: - keys = [f.name for f in cls._meta.get_fields()] - subset = {key:json[key] for key in set(keys) & set(json.keys())} - return cls.objects.create(**subset) - diff --git a/playlist/templates/Base.html b/playlist/templates/Base.html index f3d963e..dddb075 100644 --- a/playlist/templates/Base.html +++ b/playlist/templates/Base.html @@ -3,7 +3,7 @@ {% load static %} - +