From 7feb776a55d87917fd8662b1e14982bb7d736a0c Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Thu, 29 Oct 2020 20:21:50 +0100
Subject: [PATCH] Fixed planned playlist assignment.
---
src/models.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/models.py b/src/models.py
index b3023e7..43f3497 100644
--- a/src/models.py
+++ b/src/models.py
@@ -436,9 +436,9 @@ class ClockInfo(db.Model):
info["current_track"] = track_schema.dump(current_track)
if data.current_playlist:
info["planned_playlist"] = json.loads(data.current_playlist)
- current_playlist_id = data.current_playlist.playlist_id
- for next_entry in data.current_playlist.entries:
- if next_entry.start_date > datetime.now():
+ current_playlist_id = info["planned_playlist"]["playlist_id"]
+ for next_entry in info["planned_playlist"]["entries"]:
+ if next_entry.get("start_date") and next_entry.get("start_date") > datetime.datetime.now():
updated_playlist["entries"].append(next_entry)
if data.current_timeslot:
@@ -474,6 +474,7 @@ class ClockInfoSchema(ma.SQLAlchemySchema):
"log_source",
"log_time",
"current_track",
+ "planned_playlist",
"current_playlist",
"current_timeslot",
"next_timeslot"
--
GitLab