This commit is contained in:
deathbybandaid 2020-11-27 16:19:33 -05:00
parent 18809eaec3
commit 6ff65b2c24

View File

@ -25,23 +25,35 @@ class Channel():
self.dict["name"] = self.dict["origin_name"] self.dict["name"] = self.dict["origin_name"]
if "id" not in list(channel_info.keys()): 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"] self.dict["origin_id"] = channel_info["id"]
if "callsign" not in list(channel_info.keys()): 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"] self.dict["origin_callsign"] = channel_info["callsign"]
if not self.dict["callsign"]: if not self.dict["callsign"]:
self.dict["callsign"] = self.dict["origin_callsign"] self.dict["callsign"] = self.dict["origin_callsign"]
if "tags" not in list(channel_info.keys()): 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"] self.dict["origin_tags"] = channel_info["tags"]
if not self.dict["tags"]: if not self.dict["tags"]:
self.dict["tags"] = self.dict["origin_tags"] self.dict["tags"] = self.dict["origin_tags"]
if "number" not in list(channel_info.keys()): 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"])) self.dict["origin_number"] = str(float(channel_info["number"]))
if not self.dict["number"]: if not self.dict["number"]:
self.dict["number"] = self.dict["origin_number"] self.dict["number"] = self.dict["origin_number"]