X-Git-Url: https://code.delx.au/webdl/blobdiff_plain/0e41a327c035d5e2f6673b1b197bab7850ca1727..2f79e3271dc7b92988482c5099656a83b6148d91:/iview.py diff --git a/iview.py b/iview.py index a2d6cbc..7efe031 100644 --- a/iview.py +++ b/iview.py @@ -1,5 +1,6 @@ from common import grab_json, grab_xml, Node, download_hls -import urlparse +import requests_cache +import urllib.parse API_URL = "http://iview.abc.net.au/api" AUTH_URL = "http://iview.abc.net.au/auth" @@ -10,85 +11,96 @@ def format_episode_title(series, ep): else: return series +def add_episode(parent, ep_info): + video_key = ep_info["episodeHouseNumber"] + series_title = ep_info["seriesTitle"] + title = ep_info.get("title", None) + episode_title = format_episode_title(series_title, title) + + IviewEpisodeNode(episode_title, parent, video_key) + class IviewEpisodeNode(Node): def __init__(self, title, parent, video_key): Node.__init__(self, title, parent) self.video_key = video_key - self.filename = title + ".mp4" + self.filename = title + ".ts" self.can_download = True def find_hls_url(self, playlist): for video in playlist: if video["type"] == "program": - return video["hls-high"] - raise Exception("Missing hls-high program stream for " + self.video_key) + for quality in ["hls-plus", "hls-high"]: + if quality in video: + return video[quality].replace("http:", "https:") + raise Exception("Missing program stream for " + self.video_key) def get_auth_details(self): - auth_doc = grab_xml(AUTH_URL, 0) + with requests_cache.disabled(): + auth_doc = grab_xml(AUTH_URL) NS = { "auth": "http://www.abc.net.au/iView/Services/iViewHandshaker", } token = auth_doc.xpath("//auth:tokenhd/text()", namespaces=NS)[0] token_url = auth_doc.xpath("//auth:server/text()", namespaces=NS)[0] - token_hostname = urlparse.urlparse(token_url).netloc + token_hostname = urllib.parse.urlparse(token_url).netloc return token, token_hostname - def hack_url_auth_token(self, video_url, token, token_hostname): - parsed_url = urlparse.urlparse(video_url) + def add_auth_token_to_url(self, video_url, token, token_hostname): + parsed_url = urllib.parse.urlparse(video_url) hacked_url = parsed_url._replace(netloc=token_hostname, query="hdnea=" + token) - video_url = urlparse.urlunparse(hacked_url) + video_url = urllib.parse.urlunparse(hacked_url) return video_url def download(self): - info = grab_json(API_URL + "/programs/" + self.video_key, 3600) + info = grab_json(API_URL + "/programs/" + self.video_key) video_url = self.find_hls_url(info["playlist"]) token, token_hostname= self.get_auth_details() - hack_url = lambda url: self.hack_url_auth_token(url, token, token_hostname) - return download_hls(self.filename, video_url, hack_url) - + video_url = self.add_auth_token_to_url(video_url, token, token_hostname) + return download_hls(self.filename, video_url) class IviewIndexNode(Node): def __init__(self, title, parent, url): Node.__init__(self, title, parent) self.url = url - self.series_map = {} + self.unique_series = set() - def add_episode(self, ep_info): - video_key = ep_info["episodeHouseNumber"] - series_title = ep_info["seriesTitle"] - title = ep_info.get("title", None) - episode_title = format_episode_title(series_title, title) - - series_node = self.series_map.get(series_title, None) - if not series_node: - series_node = Node(series_title, self) - self.series_map[series_title] = series_node - - IviewEpisodeNode(episode_title, series_node, video_key) + def fill_children(self): + info = grab_json(self.url) + for key in ["carousels", "collections", "index"]: + for collection_list in info[key]: + for ep_info in collection_list.get("episodes", []): + self.add_series(ep_info) + + def add_series(self, ep_info): + title = ep_info["seriesTitle"] + if title in self.unique_series: + return + self.unique_series.add(title) + url = API_URL + "/" + ep_info["href"] + IviewSeriesNode(title, self, url) + +class IviewSeriesNode(Node): + def __init__(self, title, parent, url): + Node.__init__(self, title, parent) + self.url = url def fill_children(self): - info = grab_json(self.url, 3600) - for index_list in info["index"]: - for ep_info in index_list["episodes"]: - self.add_episode(ep_info) + ep_info = grab_json(self.url) + series_slug = ep_info["href"].split("/")[1] + series_url = API_URL + "/series/" + series_slug + "/" + ep_info["seriesHouseNumber"] + info = grab_json(series_url) + for ep_info in info.get("episodes", []): + add_episode(self, ep_info) class IviewFlatNode(Node): def __init__(self, title, parent, url): Node.__init__(self, title, parent) self.url = url - def add_episode(self, ep_info): - video_key = ep_info["episodeHouseNumber"] - series_title = ep_info["seriesTitle"] - title = ep_info.get("title", None) - episode_title = format_episode_title(series_title, title) - - IviewEpisodeNode(episode_title, self, video_key) - def fill_children(self): - info = grab_json(self.url, 3600) + info = grab_json(self.url) for ep_info in info: - self.add_episode(ep_info) + add_episode(self, ep_info) class IviewRootNode(Node): @@ -105,6 +117,7 @@ class IviewRootNode(Node): category("Lifestyle", "lifestyle") category("News & Current Affairs", "news") category("Panel & Discussion", "panel") + category("Regional Australia", "regional") category("Sport", "sport") def load_channels(self): @@ -116,6 +129,8 @@ class IviewRootNode(Node): channel("ABC2", "abc2") channel("ABC3", "abc3") channel("ABC4Kids", "abc4kids") + channel("News", "news") + channel("ABC Arts", "abcarts") channel("iView Exclusives", "iview") def load_featured(self):