fix(api_client): comply to legacy schedule events
- remove 5 seconds to stream_buffer_start start event key, - use explicit variables names, - split schedule events into multiple functions - stream_output_start ends at the end of the scheduled period (fix #1556).
This commit is contained in:
jo
Kyle Robbertze
parent
f2b9bd6fed
commit
81f38fc9c6
2 changed files with 312 additions and 113 deletions
|
|
@ -25,62 +25,176 @@ class MockRequestProvider:
|
|||
def schedule_url(_post_data=None, params=None, **kwargs):
|
||||
return [
|
||||
{
|
||||
"id": 1,
|
||||
"starts": "2021-07-05T11:00:00Z",
|
||||
"ends": "2021-07-05T11:01:00.5000Z",
|
||||
"instance_id": 2,
|
||||
"file": "http://localhost/api/v2/file/3",
|
||||
"file_id": 3,
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/schedule/17/",
|
||||
"id": 17,
|
||||
"starts": "2022-03-04T15:30:00Z",
|
||||
"ends": "2022-03-04T15:33:50.674340Z",
|
||||
"file": "http://192.168.10.100:8081/api/v2/files/1/",
|
||||
"file_id": 1,
|
||||
"stream": None,
|
||||
"clip_length": "00:03:50.674340",
|
||||
"fade_in": "00:00:00.500000",
|
||||
"fade_out": "00:00:01",
|
||||
"cue_in": "00:00:00.142404",
|
||||
"cue_out": "01:58:04.463583",
|
||||
"fade_out": "00:00:00.500000",
|
||||
"cue_in": "00:00:01.310660",
|
||||
"cue_out": "00:03:51.985000",
|
||||
"media_item_played": False,
|
||||
"instance": "http://192.168.10.100:8081/api/v2/show-instances/3/",
|
||||
"instance_id": 3,
|
||||
"playout_status": 1,
|
||||
"broadcasted": 0,
|
||||
"position": 0,
|
||||
},
|
||||
{
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/schedule/18/",
|
||||
"id": 18,
|
||||
"starts": "2022-03-04T15:33:50.674340Z",
|
||||
"ends": "2022-03-04T16:03:50.674340Z",
|
||||
"file": None,
|
||||
"stream": "http://192.168.10.100:8081/api/v2/webstreams/1/",
|
||||
"stream_id": 1,
|
||||
"clip_length": "00:30:00",
|
||||
"fade_in": "00:00:00.500000",
|
||||
"fade_out": "00:00:00.500000",
|
||||
"cue_in": "00:00:00",
|
||||
"cue_out": "00:30:00",
|
||||
"media_item_played": False,
|
||||
"instance": "http://192.168.10.100:8081/api/v2/show-instances/3/",
|
||||
"instance_id": 3,
|
||||
"playout_status": 1,
|
||||
"broadcasted": 0,
|
||||
"position": 1,
|
||||
},
|
||||
]
|
||||
|
||||
@staticmethod
|
||||
def show_instance_url(_post_data=None, params=None, **kwargs):
|
||||
return {
|
||||
"show_id": 4,
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/show-instances/3/",
|
||||
"id": 3,
|
||||
"description": "",
|
||||
"starts": "2022-03-04T15:30:00Z",
|
||||
"ends": "2022-03-04T16:30:00Z",
|
||||
"record": 0,
|
||||
"rebroadcast": 0,
|
||||
"time_filled": "00:33:50.674340",
|
||||
"created": "2022-03-04T15:05:36Z",
|
||||
"last_scheduled": "2022-03-04T15:05:46Z",
|
||||
"modified_instance": False,
|
||||
"autoplaylist_built": False,
|
||||
"show": "http://192.168.10.100:8081/api/v2/shows/3/",
|
||||
"show_id": 3,
|
||||
"instance": None,
|
||||
"file": None,
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def show_url(_post_data=None, params=None, **kwargs):
|
||||
return {
|
||||
"name": "Test show",
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/shows/3/",
|
||||
"id": 3,
|
||||
"name": "Test",
|
||||
"url": "",
|
||||
"genre": "",
|
||||
"description": "",
|
||||
"color": "",
|
||||
"background_color": "",
|
||||
"linked": False,
|
||||
"is_linkable": True,
|
||||
"image_path": "",
|
||||
"has_autoplaylist": False,
|
||||
"autoplaylist_repeat": False,
|
||||
"autoplaylist": None,
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def file_url(_post_data=None, params=None, **kwargs):
|
||||
return {
|
||||
"item_url": "http://localhost/api/v2/files/3/",
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/files/1/",
|
||||
"id": 1,
|
||||
"name": "",
|
||||
"mime": "audio/mp3",
|
||||
"ftype": "audioclip",
|
||||
"filepath": "imported/1/test.mp3",
|
||||
"filepath": "imported/1/Bag Raiders/Bag Raiders/03 - Bag Raiders - Shooting Stars.mp3",
|
||||
"import_status": 0,
|
||||
"currently_accessing": 0,
|
||||
"mtime": "2021-07-01T23:13:43Z",
|
||||
"utime": "2021-07-01T23:12:46Z",
|
||||
"md5": "202ae33a642ce475bd8b265ddb11c139",
|
||||
"track_title": "Test file.mp3",
|
||||
"mtime": "2022-03-04T13:03:13Z",
|
||||
"utime": "2022-03-04T13:03:11Z",
|
||||
"lptime": "2022-03-04T14:26:18Z",
|
||||
"md5": "65c497bdc702881be607c7961ae814fa",
|
||||
"track_title": "Shooting Stars",
|
||||
"artist_name": "Bag Raiders",
|
||||
"bit_rate": 320000,
|
||||
"sample_rate": 44100,
|
||||
"length": "01:58:04.463600",
|
||||
"genre": "Test",
|
||||
"format": None,
|
||||
"length": "00:03:55.859578",
|
||||
"album_title": "Bag Raiders",
|
||||
"genre": "Electro",
|
||||
"comments": None,
|
||||
"year": "2010",
|
||||
"track_number": 3,
|
||||
"channels": 2,
|
||||
"url": None,
|
||||
"bpm": None,
|
||||
"rating": None,
|
||||
"encoded_by": None,
|
||||
"disc_number": None,
|
||||
"mood": None,
|
||||
"label": None,
|
||||
"composer": None,
|
||||
"encoder": None,
|
||||
"checksum": None,
|
||||
"lyrics": None,
|
||||
"orchestra": None,
|
||||
"conductor": None,
|
||||
"lyricist": None,
|
||||
"original_lyricist": None,
|
||||
"radio_station_name": None,
|
||||
"info_url": None,
|
||||
"artist_url": None,
|
||||
"audio_source_url": None,
|
||||
"radio_station_url": None,
|
||||
"buy_this_url": None,
|
||||
"isrc_number": None,
|
||||
"catalog_number": None,
|
||||
"original_artist": None,
|
||||
"copyright": None,
|
||||
"report_datetime": None,
|
||||
"report_location": None,
|
||||
"report_organization": None,
|
||||
"subject": None,
|
||||
"contributor": None,
|
||||
"language": None,
|
||||
"file_exists": True,
|
||||
"replay_gain": "-5.68",
|
||||
"cuein": "00:00:00.142404",
|
||||
"cueout": "01:58:04.463583",
|
||||
"replay_gain": "-8.77",
|
||||
"cuein": "00:00:01.310660",
|
||||
"cueout": "00:03:51.985000",
|
||||
"silan_check": False,
|
||||
"hidden": False,
|
||||
"is_scheduled": True,
|
||||
"is_playlist": False,
|
||||
"filesize": 283379568,
|
||||
"track_type": "MUS",
|
||||
"directory": "http://localhost/api/v2/music-dirs/1/",
|
||||
"owner": "http://localhost/api/v2/users/1/",
|
||||
"filesize": 9505222,
|
||||
"description": None,
|
||||
"artwork": "imported/1/artwork/03 - Bag Raiders - Shooting Stars",
|
||||
"track_type": "TEST",
|
||||
"directory": "http://192.168.10.100:8081/api/v2/music-dirs/1/",
|
||||
"edited_by": None,
|
||||
"owner": "http://192.168.10.100:8081/api/v2/users/1/",
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def webstream_url(_post_data=None, params=None, **kwargs):
|
||||
return {
|
||||
"item_url": "http://192.168.10.100:8081/api/v2/webstreams/1/",
|
||||
"id": 1,
|
||||
"name": "Test",
|
||||
"description": "",
|
||||
"url": "http://some-other-radio:8800/main.ogg",
|
||||
"length": "00:30:00",
|
||||
"creator_id": 1,
|
||||
"mtime": "2022-03-04T13:11:20Z",
|
||||
"utime": "2022-03-04T13:11:20Z",
|
||||
"lptime": None,
|
||||
"mime": "application/ogg",
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -90,22 +204,62 @@ def test_get_schedule(monkeypatch, config_filepath):
|
|||
schedule = client.get_schedule()
|
||||
assert schedule == {
|
||||
"media": {
|
||||
"2021-07-05-11-00-00": {
|
||||
"id": 3,
|
||||
"2022-03-04-15-30-00": {
|
||||
"type": "file",
|
||||
"metadata": MockRequestProvider.file_url(),
|
||||
"row_id": 1,
|
||||
"uri": "http://localhost/api/v2/file/3",
|
||||
"fade_in": 500.0,
|
||||
"fade_out": 1000.0,
|
||||
"cue_in": 0.142404,
|
||||
"cue_out": 7084.463583,
|
||||
"start": "2021-07-05-11-00-00",
|
||||
"end": "2021-07-05-11-01-00",
|
||||
"show_name": "Test show",
|
||||
"replay_gain": "-5.68",
|
||||
"independent_event": False,
|
||||
"filesize": 283379568,
|
||||
"row_id": 17,
|
||||
"start": "2022-03-04-15-30-00",
|
||||
"end": "2022-03-04-15-33-50",
|
||||
# NOTE: The legacy schedule generator creates an url,
|
||||
# but playout download the file using the file id, so
|
||||
# we can safely ignore it here.
|
||||
"uri": None,
|
||||
"id": 1,
|
||||
"show_name": "Test",
|
||||
"fade_in": 500.0,
|
||||
"fade_out": 500.0,
|
||||
"cue_in": 1.31066,
|
||||
"cue_out": 231.985,
|
||||
"metadata": MockRequestProvider.file_url(),
|
||||
"replay_gain": "-8.77",
|
||||
"filesize": 9505222,
|
||||
},
|
||||
},
|
||||
"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",
|
||||
"uri": "http://some-other-radio:8800/main.ogg",
|
||||
"id": 1,
|
||||
},
|
||||
"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",
|
||||
"uri": "http://some-other-radio:8800/main.ogg",
|
||||
"id": 1,
|
||||
"show_name": "Test",
|
||||
},
|
||||
"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",
|
||||
"uri": "http://some-other-radio:8800/main.ogg",
|
||||
"id": 1,
|
||||
},
|
||||
"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",
|
||||
"uri": "http://some-other-radio:8800/main.ogg",
|
||||
"id": 1,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue