From 71b3f7f0652940c18e339c4f86f427b44f5f56e7 Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 19 Jul 2022 12:43:17 +0200 Subject: [PATCH] chore: remove schedule unused independent_event --- legacy/application/models/Schedule.php | 13 ------------- playout/libretime_playout/player/liquidsoap.py | 3 +-- playout/libretime_playout/player/schedule.py | 5 ----- playout/libretime_playout/testpypoliqqueue.py | 2 -- playout/tests/player/schedule_test.py | 5 ----- 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/legacy/application/models/Schedule.php b/legacy/application/models/Schedule.php index 85f34c6cf..62110428a 100644 --- a/legacy/application/models/Schedule.php +++ b/legacy/application/models/Schedule.php @@ -851,7 +851,6 @@ SQL; $data['media'][$kick_start]['end'] = $kick_start; $data['media'][$kick_start]['event_type'] = 'kick_out'; $data['media'][$kick_start]['type'] = 'event'; - $data['media'][$kick_start]['independent_event'] = true; if ($kick_time !== $switch_off_time) { $switch_start = self::AirtimeTimeToPypoTime($switch_off_time); @@ -859,7 +858,6 @@ SQL; $data['media'][$switch_start]['end'] = $switch_start; $data['media'][$switch_start]['event_type'] = 'switch_off'; $data['media'][$switch_start]['type'] = 'event'; - $data['media'][$switch_start]['independent_event'] = true; } } } @@ -881,12 +879,6 @@ SQL; $start = self::AirtimeTimeToPypoTime($item['start']); $end = self::AirtimeTimeToPypoTime($item['end']); - [,,, $start_hour] = explode('-', $start); - [,,, $end_hour] = explode('-', $end); - - $same_hour = $start_hour == $end_hour; - $independent_event = !$same_hour; - $replay_gain = is_null($item['replay_gain']) ? '0' : $item['replay_gain']; $replay_gain += Application_Model_Preference::getReplayGainModifier(); @@ -914,7 +906,6 @@ SQL; 'end' => $end, 'show_name' => $item['show_name'], 'replay_gain' => $replay_gain, - 'independent_event' => $independent_event, 'filesize' => $filesize, ]; @@ -941,7 +932,6 @@ SQL; 'uri' => $uri, 'row_id' => $item['id'], 'type' => 'stream_buffer_start', - 'independent_event' => true, ]; self::appendScheduleItem($data, $start, $schedule_item); @@ -954,7 +944,6 @@ SQL; 'start' => $start, 'end' => $end, 'show_name' => $item['show_name'], - 'independent_event' => true, ]; self::appendScheduleItem($data, $start, $schedule_item); @@ -971,7 +960,6 @@ SQL; 'uri' => $uri, 'type' => 'stream_buffer_end', 'row_id' => $item['id'], - 'independent_event' => true, ]; self::appendScheduleItem($data, $stream_end, $schedule_item); @@ -980,7 +968,6 @@ SQL; 'end' => $stream_end, 'uri' => $uri, 'type' => 'stream_output_end', - 'independent_event' => true, ]; self::appendScheduleItem($data, $stream_end, $schedule_item); } diff --git a/playout/libretime_playout/player/liquidsoap.py b/playout/libretime_playout/player/liquidsoap.py index cfee0afee..118982751 100644 --- a/playout/libretime_playout/player/liquidsoap.py +++ b/playout/libretime_playout/player/liquidsoap.py @@ -117,8 +117,7 @@ class PypoLiquidsoap: uri: "http://stream2.radioblackout.org:80/blackout.ogg", start: "2013-03-21-22-56-00", end: "2013-03-21-23-26-00", - show_name: "Untitled Show", - independent_event: true + show_name: "Untitled Show" }, """ diff --git a/playout/libretime_playout/player/schedule.py b/playout/libretime_playout/player/schedule.py index c1dcf6094..37cefa087 100644 --- a/playout/libretime_playout/player/schedule.py +++ b/playout/libretime_playout/player/schedule.py @@ -68,7 +68,6 @@ def generate_file_events( events[schedule_start_event_key] = { "type": EventKind.FILE, - "independent_event": False, "row_id": schedule["id"], "start": schedule_start_event_key, "end": schedule_end_event_key, @@ -108,7 +107,6 @@ def generate_webstream_events( events[schedule_start_event_key] = { "type": EventKind.STREAM_BUFFER_START, - "independent_event": True, "row_id": schedule["id"], "start": datetime_to_event_key(schedule["starts_at"] - timedelta(seconds=5)), "end": datetime_to_event_key(schedule["starts_at"] - timedelta(seconds=5)), @@ -118,7 +116,6 @@ def generate_webstream_events( events[f"{schedule_start_event_key}_0"] = { "type": EventKind.STREAM_OUTPUT_START, - "independent_event": True, "row_id": schedule["id"], "start": schedule_start_event_key, "end": schedule_end_event_key, @@ -132,7 +129,6 @@ def generate_webstream_events( # the schedule end. events[schedule_end_event_key] = { "type": EventKind.STREAM_BUFFER_END, - "independent_event": True, "row_id": schedule["id"], "start": schedule_end_event_key, "end": schedule_end_event_key, @@ -142,7 +138,6 @@ def generate_webstream_events( events[f"{schedule_end_event_key}_0"] = { "type": EventKind.STREAM_OUTPUT_END, - "independent_event": True, "row_id": schedule["id"], "start": schedule_end_event_key, "end": schedule_end_event_key, diff --git a/playout/libretime_playout/testpypoliqqueue.py b/playout/libretime_playout/testpypoliqqueue.py index 7ab235c2f..516dd37cc 100644 --- a/playout/libretime_playout/testpypoliqqueue.py +++ b/playout/libretime_playout/testpypoliqqueue.py @@ -67,7 +67,6 @@ media_schedule[start_dt] = { "end": end_dt, "show_name": "Untitled", "replay_gain": 0, - "independent_event": True, } @@ -88,7 +87,6 @@ media_schedule[start_dt] = { "end": end_dt, "show_name": "Untitled", "replay_gain": 0, - "independent_event": True, } pypoLiq_q.put(media_schedule) diff --git a/playout/tests/player/schedule_test.py b/playout/tests/player/schedule_test.py index a5ac749bf..688f31201 100644 --- a/playout/tests/player/schedule_test.py +++ b/playout/tests/player/schedule_test.py @@ -76,7 +76,6 @@ def test_get_schedule(): "media": { "2022-03-04-15-30-00": { "type": "file", - "independent_event": False, "row_id": 17, "start": "2022-03-04-15-30-00", "end": "2022-03-04-15-33-50", @@ -100,7 +99,6 @@ def test_get_schedule(): }, "2022-03-04-15-33-50": { "type": "stream_buffer_start", - "independent_event": True, "row_id": 18, "start": "2022-03-04-15-33-45", "end": "2022-03-04-15-33-45", @@ -109,7 +107,6 @@ def test_get_schedule(): }, "2022-03-04-15-33-50_0": { "type": "stream_output_start", - "independent_event": True, "row_id": 18, "start": "2022-03-04-15-33-50", "end": "2022-03-04-16-03-50", @@ -119,7 +116,6 @@ def test_get_schedule(): }, "2022-03-04-16-03-50": { "type": "stream_buffer_end", - "independent_event": True, "row_id": 18, "start": "2022-03-04-16-03-50", "end": "2022-03-04-16-03-50", @@ -128,7 +124,6 @@ def test_get_schedule(): }, "2022-03-04-16-03-50_0": { "type": "stream_output_end", - "independent_event": True, "row_id": 18, "start": "2022-03-04-16-03-50", "end": "2022-03-04-16-03-50",