From 4de206f6ff32d428941b293171fe18e99c87dc96 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 16 Dec 2020 15:39:16 -0500 Subject: [PATCH] test --- origin/origin_epg.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/origin/origin_epg.py b/origin/origin_epg.py index a9f5ed1..36006e5 100644 --- a/origin/origin_epg.py +++ b/origin/origin_epg.py @@ -20,7 +20,16 @@ class OriginEPG(): epg_opn = self.fhdhr.web.session.get(self.base_epg_url + str(chan_obj.dict["origin_id"])) epg_json = epg_opn.json() - for listing in epg_json["channel"][0]["programme"]: + current_channel_id = chan_obj.dict["origin_id"] + + for listing in epg_json["programme"]: + + if listing["channel"] != current_channel_id: + listing_chan_obj = fhdhr_channels.get_channel_obj("origin_id", listing["channel"]) + if str(listing_chan_obj.number) not in list(programguide.keys()): + programguide[str(listing_chan_obj.number)] = listing_chan_obj.epgdict + else: + listing_chan_obj = chan_obj timestampdict = self.stirr_time_convert(listing["start"], listing["stop"]) @@ -42,8 +51,8 @@ class OriginEPG(): "thumbnail": None } - if not any((d['time_start'] == clean_prog_dict['time_start'] and d['id'] == clean_prog_dict['id']) for d in programguide[chan_obj.number]["listing"]): - programguide[str(chan_obj.number)]["listing"].append(clean_prog_dict) + if not any((d['time_start'] == clean_prog_dict['time_start'] and d['id'] == clean_prog_dict['id']) for d in programguide[listing_chan_obj.number]["listing"]): + programguide[str(listing_chan_obj.number)]["listing"].append(clean_prog_dict) return programguide