diff --git a/src/aura_engine/core/channels.py b/src/aura_engine/core/channels.py index 3bb362a7f0c4dc74bcc7835de6194248f0330d9a..87c98d11c628f324f582abc6e0d0dfc5370eb15b 100644 --- a/src/aura_engine/core/channels.py +++ b/src/aura_engine/core/channels.py @@ -59,11 +59,11 @@ class ChannelName(str, Enum): QUEUE_B = "in_queue_1" HTTP_A = "in_stream_0" HTTP_B = "in_stream_1" - LIVE_0 = "in_line_0" - LIVE_1 = "in_line_1" - LIVE_2 = "in_line_2" - LIVE_3 = "in_line_3" - LIVE_4 = "in_line_4" + LIVE_0 = "aura_engine_line_in_0" + LIVE_1 = "aura_engine_line_in_1" + LIVE_2 = "aura_engine_line_in_2" + LIVE_3 = "aura_engine_line_in_3" + LIVE_4 = "aura_engine_line_in_4" FALLBACK_FOLDER = "fallback_folder" FALLBACK_PLAYLIST = "fallback_playlist" diff --git a/src/aura_engine/resources.py b/src/aura_engine/resources.py index 8ee53f8548cc159f1a167d850bb40f7e37d249ec..cb43ccfcfe41eec7c3eb2bf4055775106ae49d8c 100644 --- a/src/aura_engine/resources.py +++ b/src/aura_engine/resources.py @@ -78,7 +78,7 @@ class ResourceMapping: Return the channel enum for a given live channel string from Tank. Channel URIs from Tank are typically in the format `line://1`, while - channel names in Liquidsoap have names in the format `in_line_1`. + channel names in Liquidsoap have names in the format `aura_engine_line_in_1`. If no valid channel URI is provided, `None` is returned. @@ -90,7 +90,7 @@ class ResourceMapping: """ if not channel_uri: return None - channel_name = "in_line_" + channel_uri.split("line://")[1] + channel_name = "aura_engine_line_in_" + channel_uri.split("line://")[1] for cn in ChannelName: if cn.value == channel_name: diff --git a/tests/core_client_mock.py b/tests/core_client_mock.py index 6372061d8df585ef1ae6a7fca816ebe941fdd7d4..8046ef99ae5b8faf6d9cd69906d9c572afbcd3e0 100644 --- a/tests/core_client_mock.py +++ b/tests/core_client_mock.py @@ -142,7 +142,7 @@ class CoreClientMock(CoreClient): case MixerAction.INPUTS: response = f"{ChannelName.QUEUE_A} {ChannelName.QUEUE_B} {ChannelName.HTTP_A} {ChannelName.HTTP_B} {ChannelName.LIVE_0} {ChannelName.LIVE_1}" case MixerAction.OUTPUTS: - response = '["lineout_0", "out_http_0"]' # no abstraction yet + response = '["aura_engine_line_out_0", "out_http_0"]' # no abstraction yet case MixerAction.STATUS: chn = int(args) vol = self.volumes[chn] diff --git a/tests/test_core_mixer.py b/tests/test_core_mixer.py index 8934fe832ff49370f6e63974a322833f78de4184..edd2da08aa4457c7f1512c65dc7d7ebba92ccc2f 100644 --- a/tests/test_core_mixer.py +++ b/tests/test_core_mixer.py @@ -66,14 +66,14 @@ class TestMixer(unittest.TestCase): self.assertEqual(inputs["in_queue_1"], input_state) self.assertEqual(inputs["in_stream_0"], input_state) self.assertEqual(inputs["in_stream_1"], input_state) - self.assertEqual(inputs["in_line_0"], input_state) - self.assertEqual(inputs["in_line_1"], input_state) + self.assertEqual(inputs["aura_engine_line_in_0"], input_state) + self.assertEqual(inputs["aura_engine_line_in_1"], input_state) def test_get_outputs(self): print(self._testMethodName) outputs = self.mixer.get_outputs() self.assertEqual(len(outputs), 2) - self.assertEqual(outputs[0], "lineout_0") + self.assertEqual(outputs[0], "aura_engine_line_out_0") self.assertEqual(outputs[1], "out_http_0") def test_get_free_channel(self): diff --git a/tests/test_engine_resources.py b/tests/test_engine_resources.py index 2ab1cd95d9b24ebba80ec77e5788f94d33ea7cf4..71d90f04db2f6d05a5e5a5cf0a31055914f8de72 100644 --- a/tests/test_engine_resources.py +++ b/tests/test_engine_resources.py @@ -92,19 +92,19 @@ class TestEngineResources(unittest.TestCase): rm = ResourceMapping() live_channel: ChannelName = rm.live_channel_for_resource("line://0") self.assertEqual("LIVE_0", live_channel.name) - self.assertEqual("in_line_0", live_channel.value) + self.assertEqual("aura_engine_line_in_0", live_channel.value) live_channel: ChannelName = rm.live_channel_for_resource("line://1") self.assertEqual("LIVE_1", live_channel.name) - self.assertEqual("in_line_1", live_channel.value) + self.assertEqual("aura_engine_line_in_1", live_channel.value) live_channel: ChannelName = rm.live_channel_for_resource("line://2") self.assertEqual("LIVE_2", live_channel.name) - self.assertEqual("in_line_2", live_channel.value) + self.assertEqual("aura_engine_line_in_2", live_channel.value) live_channel: ChannelName = rm.live_channel_for_resource("line://3") self.assertEqual("LIVE_3", live_channel.name) - self.assertEqual("in_line_3", live_channel.value) + self.assertEqual("aura_engine_line_in_3", live_channel.value) live_channel: ChannelName = rm.live_channel_for_resource("line://4") self.assertEqual("LIVE_4", live_channel.name) - self.assertEqual("in_line_4", live_channel.value) + self.assertEqual("aura_engine_line_in_4", live_channel.value) def test_resource_class(self): print(self._testMethodName) diff --git a/tests/test_plugins_monitor.py b/tests/test_plugins_monitor.py index 205fe0a263ab68c8185640ad2febfcb2ad75b6b7..03bcb743e5eb242da40e4fbc5fc1d16fffd58a39 100644 --- a/tests/test_plugins_monitor.py +++ b/tests/test_plugins_monitor.py @@ -46,12 +46,12 @@ class MockedMixer: "in_queue_1": state, "in_stream_0": state, "in_stream_1": state, - "in_line_0": state, - "in_line_1": state, + "aura_engine_line_in_0": state, + "aura_engine_line_in_1": state, } def get_outputs(self) -> list: - return ["lineout_0", "out_http_0"] + return ["aura_engine_line_out_0", "out_http_0"] class MockedPlayer: