From 8b3984debf54a455487742292fc1cb6389d1b444 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 6 Dec 2020 11:21:10 -0500 Subject: [PATCH] test --- fHDHR/origin/origin_channels.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/fHDHR/origin/origin_channels.py b/fHDHR/origin/origin_channels.py index 50dc6e4..438bb3b 100644 --- a/fHDHR/origin/origin_channels.py +++ b/fHDHR/origin/origin_channels.py @@ -32,18 +32,23 @@ class OriginChannels(): def get_channel_stream(self, chandict): - stream_json_path = 'channels/channel/%s/onnow.json' % str(chandict["origin_id"]) - stream_id_url = self.base_api + stream_json_path - stream_id = self.fhdhr.web.session.get(stream_id_url).json()["id"] + try: + + stream_json_path = 'channels/channel/%s/onnow.json' % str(chandict["origin_id"]) + stream_id_url = self.base_api + stream_json_path + stream_id = self.fhdhr.web.session.get(stream_id_url).json()["id"] + + stream_id_info_path = 'assets/asset/%s.json?f=title&f=providers&f=descriptions&f=runtime&f=availableSince' % str(stream_id) + stream_id_info_url = self.base_api + stream_id_info_path + stream_id_info_json = self.fhdhr.web.session.get(stream_id_info_url).json() + streamurls = [] + for provider in stream_id_info_json["providers"]: + for source in provider["sources"]: + streamurls.append(source["uri"]) + streamurl = streamurls[0] + except KeyError: + return None - stream_id_info_path = 'assets/asset/%s.json?f=title&f=providers&f=descriptions&f=runtime&f=availableSince' % str(stream_id) - stream_id_info_url = self.base_api + stream_id_info_path - stream_id_info_json = self.fhdhr.web.session.get(stream_id_info_url).json() - streamurls = [] - for provider in stream_id_info_json["providers"]: - for source in provider["sources"]: - streamurls.append(source["uri"]) - streamurl = streamurls[0] if self.fhdhr.config.dict["origin"]["force_best"]: streamurl = self.m3u8_beststream(streamurl) return streamurl