Fixed iView to use categories and channels from API

[webdl] / iview.py

diff --git a/iview.py b/iview.py
index 7efe031ce3097d5174b49a34c5cff5a9961e96e1..0a9ac1b8f015d608b973efd9c5bce43cc6f44021 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -1,9 +1,10 @@
 from common import grab_json, grab_xml, Node, download_hls
 import requests_cache
+import string
 import urllib.parse
 
-API_URL = "http://iview.abc.net.au/api"
-AUTH_URL = "http://iview.abc.net.au/auth"
+API_URL = "https://iview.abc.net.au/api"
+AUTH_URL = "https://iview.abc.net.au/auth"
 
 def format_episode_title(series, ep):
     if ep:
@@ -53,6 +54,8 @@ class IviewEpisodeNode(Node):
 
     def download(self):
         info = grab_json(API_URL + "/programs/" + self.video_key)
+        if "playlist" not in info:
+            return False
         video_url = self.find_hls_url(info["playlist"])
         token, token_hostname= self.get_auth_details()
         video_url = self.add_auth_token_to_url(video_url, token, token_hostname)
@@ -67,9 +70,10 @@ class IviewIndexNode(Node):
     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)
+            for collection_list in info.get(key, None):
+                if isinstance(collection_list, dict):
+                    for ep_info in collection_list.get("episodes", []):
+                        self.add_series(ep_info)
 
     def add_series(self, ep_info):
         title = ep_info["seriesTitle"]
@@ -106,32 +110,38 @@ class IviewFlatNode(Node):
 class IviewRootNode(Node):
     def load_categories(self):
         by_category_node = Node("By Category", self)
-        def category(name, slug):
-            IviewIndexNode(name, by_category_node, API_URL + "/category/" + slug)
-
-        category("Arts & Culture", "arts")
-        category("Comedy", "comedy")
-        category("Documentary", "docs")
-        category("Drama", "drama")
-        category("Education", "education")
-        category("Lifestyle", "lifestyle")
-        category("News & Current Affairs", "news")
-        category("Panel & Discussion", "panel")
-        category("Regional Australia", "regional")
-        category("Sport", "sport")
+
+        data = grab_json(API_URL + "/categories")
+        categories = data["categories"]
+
+        for category_data in categories:
+            category_title = category_data["title"]
+            category_title = string.capwords(category_title)
+
+            category_href = category_data["href"]
+
+            IviewIndexNode(category_title, by_category_node, API_URL + "/" + category_href)
 
     def load_channels(self):
         by_channel_node = Node("By Channel", self)
-        def channel(name, slug):
-            IviewIndexNode(name, by_channel_node, API_URL + "/channel/" + slug)
-
-        channel("ABC1", "abc1")
-        channel("ABC2", "abc2")
-        channel("ABC3", "abc3")
-        channel("ABC4Kids", "abc4kids")
-        channel("News", "news")
-        channel("ABC Arts", "abcarts")
-        channel("iView Exclusives", "iview")
+
+        data = grab_json(API_URL + "/channel")
+        channels = data["channels"]
+
+        for channel_data in channels:
+            channel_id = channel_data["categoryID"]
+            channel_title = {
+                "abc1": "ABC1",
+                "abc2": "ABC2",
+                "abc3": "ABC3",
+                "abc4kids": "ABC4Kids",
+                "news": "News",
+                "abcarts": "ABC Arts",
+            }.get(channel_id, channel_data["title"])
+
+            channel_href = channel_data["href"]
+
+            IviewIndexNode(channel_title, by_channel_node, API_URL + "/" + channel_href)
 
     def load_featured(self):
         IviewFlatNode("Featured", self, API_URL + "/featured")