From fa136fad9700b09b10ea567934414630cfb1c542 Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 1 Jul 2022 10:01:40 +0200 Subject: [PATCH] chore: explicit schedule file metadata dict values --- legacy/application/models/Schedule.php | 6 +++++- playout/libretime_playout/schedule.py | 6 +++++- playout/tests/schedule_test.py | 9 ++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/legacy/application/models/Schedule.php b/legacy/application/models/Schedule.php index 3d88576be..02b3ff4e4 100644 --- a/legacy/application/models/Schedule.php +++ b/legacy/application/models/Schedule.php @@ -899,7 +899,11 @@ SQL; $schedule_item = [ 'id' => $media_id, 'type' => 'file', - 'metadata' => $fileMetadata, + 'metadata' => [ + 'track_title' => $fileMetadata['track_title'], + 'artist_name' => $fileMetadata['artist_name'], + 'mime' => $fileMetadata['mime'], + ], 'row_id' => $item['id'], 'uri' => $uri, 'fade_in' => Application_Model_Schedule::WallTimeToMillisecs($item['fade_in']), diff --git a/playout/libretime_playout/schedule.py b/playout/libretime_playout/schedule.py index f804bec90..235357e23 100644 --- a/playout/libretime_playout/schedule.py +++ b/playout/libretime_playout/schedule.py @@ -78,7 +78,11 @@ def generate_file_events( "fade_out": time_in_milliseconds(time_fromisoformat(schedule["fade_out"])), "cue_in": time_in_seconds(time_fromisoformat(schedule["cue_in"])), "cue_out": time_in_seconds(time_fromisoformat(schedule["cue_out"])), - "metadata": file, + "metadata": { + "track_title": file["track_title"], + "artist_name": file["artist_name"], + "mime": file["mime"], + }, "replay_gain": file["replay_gain"], "filesize": file["size"], } diff --git a/playout/tests/schedule_test.py b/playout/tests/schedule_test.py index a99a2af9c..bea84c6ad 100644 --- a/playout/tests/schedule_test.py +++ b/playout/tests/schedule_test.py @@ -94,6 +94,9 @@ class ApiClientServicesMock: "url": None, "replay_gain": "-8.77", "size": 9505222, + "artist_name": "Bag Raiders", + "track_title": "Shooting Stars", + "mime": "audio/mp3", } @staticmethod @@ -137,7 +140,11 @@ def test_get_schedule(): "fade_out": 500.0, "cue_in": 1.31066, "cue_out": 231.985, - "metadata": ApiClientServicesMock.file_url(), + "metadata": { + "artist_name": "Bag Raiders", + "track_title": "Shooting Stars", + "mime": "audio/mp3", + }, "replay_gain": "-8.77", "filesize": 9505222, },