From 6ff65b2c24198a6aec8a1b05617027a80e1fc90d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Fri, 27 Nov 2020 16:19:33 -0500 Subject: [PATCH] test --- fHDHR/device/channels/channel.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fHDHR/device/channels/channel.py b/fHDHR/device/channels/channel.py index ad3d7a1..034fb55 100644 --- a/fHDHR/device/channels/channel.py +++ b/fHDHR/device/channels/channel.py @@ -25,23 +25,35 @@ class Channel(): self.dict["name"] = self.dict["origin_name"] if "id" not in list(channel_info.keys()): - channel_info["id"] = channel_info["name"] + if self.dict["origin_id"]: + channel_info["id"] = self.dict["origin_id"] + else: + channel_info["id"] = channel_info["name"] self.dict["origin_id"] = channel_info["id"] if "callsign" not in list(channel_info.keys()): - channel_info["callsign"] = channel_info["name"] + if self.dict["origin_callsign"]: + channel_info["callsign"] = self.dict["origin_callsign"] + else: + channel_info["callsign"] = channel_info["name"] self.dict["origin_callsign"] = channel_info["callsign"] if not self.dict["callsign"]: self.dict["callsign"] = self.dict["origin_callsign"] if "tags" not in list(channel_info.keys()): - channel_info["tags"] = [] + if self.dict["origin_tags"]: + channel_info["tags"] = self.dict["origin_tags"] + else: + channel_info["tags"] = [] self.dict["origin_tags"] = channel_info["tags"] if not self.dict["tags"]: self.dict["tags"] = self.dict["origin_tags"] if "number" not in list(channel_info.keys()): - channel_info["number"] = self.id_system.get_number(channel_info["id"]) + if self.dict["origin_number"]: + channel_info["number"] = self.dict["origin_number"] + else: + channel_info["number"] = self.id_system.get_number(channel_info["id"]) self.dict["origin_number"] = str(float(channel_info["number"])) if not self.dict["number"]: self.dict["number"] = self.dict["origin_number"]