deathbybandaid/fHDHR_NewsON
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2020-11-27 16:28:18 -05:00
parent 0b2e0d43b2
commit d3efeb598a
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fHDHR/device/channels/__init__.py
View File

@ -60,12 +60,10 @@ class Channels():
self.fhdhr.logger.info("Performing Channel Scan.") self.fhdhr.logger.info("Performing Channel Scan.")
channel_dict_list = self.origin.get_channels() channel_dict_list = self.origin.get_channels()
for channel_info in channel_dict_list: for channel_info in channel_dict_list:
print(channel_info)
channel_obj = Channel(self.fhdhr, self.id_system, origin_id=channel_info["id"]) channel_obj = Channel(self.fhdhr, self.id_system, origin_id=channel_info["id"])
channel_id = channel_obj.dict["id"] channel_id = channel_obj.dict["id"]
channel_obj.basics(channel_info) channel_obj.basics(channel_info)
self.list[channel_id] = channel_obj self.list[channel_id] = channel_obj
print(self.list[channel_id].number)
if not self.list_update_time: if not self.list_update_time:
self.fhdhr.logger.info("Found " + str(len(self.list)) + " channels for " + str(self.fhdhr.config.dict["main"]["servicename"])) self.fhdhr.logger.info("Found " + str(len(self.list)) + " channels for " + str(self.fhdhr.config.dict["main"]["servicename"]))

20
fHDHR/device/channels/channel.py
View File

@ -25,35 +25,23 @@ 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()):
if self.dict["origin_id"]: channel_info["id"] = channel_info["name"]
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()):
if self.dict["origin_callsign"]: channel_info["callsign"] = channel_info["name"]
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()):
if self.dict["origin_tags"]: channel_info["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()):
if self.dict["origin_number"]: channel_info["number"] = self.id_system.get_number(channel_info["id"])
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"]