From 6ef941b3f27c6a160e139654fe1dc24be3f8f33b Mon Sep 17 00:00:00 2001
From: Jonas L <jooola@users.noreply.github.com>
Date: Sat, 25 Jun 2022 17:10:59 +0200
Subject: [PATCH] chore(shared): explicit function name time_fromisoformat
(#1917)
---
playout/libretime_playout/schedule.py | 10 +++++-----
shared/libretime_shared/datetime.py | 2 +-
shared/tests/datetime_test.py | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/playout/libretime_playout/schedule.py b/playout/libretime_playout/schedule.py
index 34db28cd3..91e82e17c 100644
--- a/playout/libretime_playout/schedule.py
+++ b/playout/libretime_playout/schedule.py
@@ -4,7 +4,7 @@ from typing import Dict
from dateutil.parser import isoparse
from libretime_api_client.version2 import AirtimeApiClient as ApiClient
from libretime_shared.datetime import (
- fromisoformat,
+ time_fromisoformat,
time_in_milliseconds,
time_in_seconds,
)
@@ -74,10 +74,10 @@ def generate_file_events(
# Show data
"show_name": show["name"],
# Extra data
- "fade_in": time_in_milliseconds(fromisoformat(schedule["fade_in"])),
- "fade_out": time_in_milliseconds(fromisoformat(schedule["fade_out"])),
- "cue_in": time_in_seconds(fromisoformat(schedule["cue_in"])),
- "cue_out": time_in_seconds(fromisoformat(schedule["cue_out"])),
+ "fade_in": time_in_milliseconds(time_fromisoformat(schedule["fade_in"])),
+ "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,
"replay_gain": file["replay_gain"],
"filesize": file["filesize"],
diff --git a/shared/libretime_shared/datetime.py b/shared/libretime_shared/datetime.py
index 93d4d924c..13225317e 100644
--- a/shared/libretime_shared/datetime.py
+++ b/shared/libretime_shared/datetime.py
@@ -14,7 +14,7 @@ def time_in_milliseconds(value: time) -> float:
return time_in_seconds(value) * 1000
-def fromisoformat(value: str) -> time:
+def time_fromisoformat(value: str) -> time:
"""
This is required for Python 3.6 support. datetime.time.fromisoformat was
only added in Python 3.7. Until LibreTime drops Python 3.6 support, this
diff --git a/shared/tests/datetime_test.py b/shared/tests/datetime_test.py
index 09982f735..3fb7e57b8 100644
--- a/shared/tests/datetime_test.py
+++ b/shared/tests/datetime_test.py
@@ -3,7 +3,7 @@ from datetime import time
from pytest import approx, mark
from libretime_shared.datetime import (
- fromisoformat,
+ time_fromisoformat,
time_in_milliseconds,
time_in_seconds,
)
@@ -27,5 +27,5 @@ def test_time_in_milliseconds():
("00:04:30", time(minute=4, second=30)),
],
)
-def test_fromisoformat(payload, expected):
- assert fromisoformat(payload) == expected
+def test_time_fromisoformat(payload, expected):
+ assert time_fromisoformat(payload) == expected