Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(api): rename schedule models fields

Browse source
This commit is contained in:
jo 2022-07-17 22:27:57 +02:00 • committed by Kyle Robbertze
parent 8ceb1419a0
commit 57046e2a9d
8 changed files with 224 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

26
playout/libretime_playout/schedule.py
View file

@ -27,16 +27,17 @@ def get_schedule(api_client: ApiClient):
schedule = api_client.services.schedule_url(
params={
"ends__range": (f"{current_time_str}Z,{end_time_str}Z"),
"is_valid": True,
"playout_status__gt": 0,
"ends_after": f"{current_time_str}Z",
"ends_before": f"{end_time_str}Z",
"overbooked": False,
"position_status__gt": 0,
}
)
events = {}
for item in schedule:
item["starts"] = isoparse(item["starts"])
item["ends"] = isoparse(item["ends"])
item["starts_at"] = isoparse(item["starts_at"])
item["ends_at"] = isoparse(item["ends_at"])
show_instance = api_client.services.show_instance_url(id=item["instance_id"])
show = api_client.services.show_url(id=show_instance["show_id"])
@ -62,8 +63,8 @@ def generate_file_events(
"""
events = {}
schedule_start_event_key = datetime_to_event_key(schedule["starts"])
schedule_end_event_key = datetime_to_event_key(schedule["ends"])
schedule_start_event_key = datetime_to_event_key(schedule["starts_at"])
schedule_end_event_key = datetime_to_event_key(schedule["ends_at"])
events[schedule_start_event_key] = {
"type": EventKind.FILE,
@ -102,15 +103,15 @@ def generate_webstream_events(
"""
events = {}
schedule_start_event_key = datetime_to_event_key(schedule["starts"])
schedule_end_event_key = datetime_to_event_key(schedule["ends"])
schedule_start_event_key = datetime_to_event_key(schedule["starts_at"])
schedule_end_event_key = datetime_to_event_key(schedule["ends_at"])
events[schedule_start_event_key] = {
"type": EventKind.STREAM_BUFFER_START,
"independent_event": True,
"row_id": schedule["id"],
"start": datetime_to_event_key(schedule["starts"] - timedelta(seconds=5)),
"end": datetime_to_event_key(schedule["starts"] - timedelta(seconds=5)),
"start": datetime_to_event_key(schedule["starts_at"] - timedelta(seconds=5)),
"end": datetime_to_event_key(schedule["starts_at"] - timedelta(seconds=5)),
"uri": webstream["url"],
"id": webstream["id"],
}
@ -127,7 +128,8 @@ def generate_webstream_events(
"show_name": show["name"],
}
# NOTE: stream_*_end were previously triggerered 1 second before the schedule end.
# NOTE: stream_*_end were previously triggered 1 second before
# the schedule end.
events[schedule_end_event_key] = {
"type": EventKind.STREAM_BUFFER_END,
"independent_event": True,

68
playout/tests/schedule_test.py
View file

@ -3,92 +3,50 @@ from libretime_playout.schedule import get_schedule
class ApiClientServicesMock:
@staticmethod
def schedule_url(_post_data=None, params=None, **kwargs):
def schedule_url(*args, **kwargs):
return [
{
"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",
"starts_at": "2022-03-04T15:30:00Z",
"ends_at": "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: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",
"starts_at": "2022-03-04T15:33:50.674340Z",
"ends_at": "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):
def show_instance_url(*args, **kwargs):
return {
"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):
def show_url(*args, **kwargs):
return {
"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):
def file_url(*args, **kwargs):
return {
"id": 1,
"url": None,
@ -100,19 +58,11 @@ class ApiClientServicesMock:
}
@staticmethod
def webstream_url(_post_data=None, params=None, **kwargs):
def webstream_url(*args, **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",
}