From fb482930217c3491de29a0db9bbbaf8fbdd2aa06 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Mon, 8 Jun 2020 13:06:24 +0200
Subject: [PATCH] Wire playlist storage to PlaylistType.
---
modules/scheduling/calendar.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index 2d0e184b..106b4f75 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -31,6 +31,7 @@ import logging
from mutagen.flac import FLAC
from datetime import datetime, timedelta
+from modules.base.enum import PlaylistType
from modules.base.utils import SimpleUtil
from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.communication.redis.messenger import RedisMessenger
@@ -135,13 +136,13 @@ class AuraCalendarService(threading.Thread):
schedule_db = self.store_schedule(schedule)
# Store playlists to play
- self.store_playlist(schedule_db, schedule_db.playlist_id, schedule["playlist"], 0)
+ self.store_playlist(schedule_db, schedule_db.playlist_id, schedule["playlist"], PlaylistType.DEFAULT.id)
if schedule_db.schedule_fallback_id:
- self.store_playlist(schedule_db, schedule_db.schedule_fallback_id, schedule["schedule_fallback"], 1)
+ self.store_playlist(schedule_db, schedule_db.schedule_fallback_id, schedule["schedule_fallback"], PlaylistType.TIMESLOT.id)
if schedule_db.show_fallback_id:
- self.store_playlist(schedule_db, schedule_db.show_fallback_id, schedule["show_fallback"], 2)
+ self.store_playlist(schedule_db, schedule_db.show_fallback_id, schedule["show_fallback"], PlaylistType.SHOW.id)
if schedule_db.station_fallback_id:
- self.store_playlist(schedule_db, schedule_db.station_fallback_id, schedule["station_fallback"], 3)
+ self.store_playlist(schedule_db, schedule_db.station_fallback_id, schedule["station_fallback"], PlaylistType.STATION.id)
@@ -209,7 +210,7 @@ class AuraCalendarService(threading.Thread):
Stores the Playlist to the database.
"""
if not playlist_id or not fetched_playlist:
- self.logger.warn("Cannot store invalid playlist with ID '%s'!" % playlist_id)
+ self.logger.debug("Playlist type %s with ID '%s' is not available!" % (fallbackplaylist_type, playlist_id))
return
playlist_db = Playlist.select_playlist_for_schedule(schedule_db.schedule_start, playlist_id)
--
GitLab