iview: merge duplicate series names

[webdl] / iview.py

diff --git a/iview.py b/iview.py
index 25176c2aedd66b9abcaa9b6d6d6bb0aa41011521..05d0472d31cfa38689fc44327e01f9e097f7aad0 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -2,7 +2,6 @@
 # vim:ts=4:sts=4:sw=4:noet
 
 from common import grab_xml, grab_json, download_rtmp, Node
-from datetime import datetime
 import itertools
 
 BASE_URL = "http://www.abc.net.au/iview/"
@@ -17,32 +16,41 @@ class IviewNode(Node):
                Node.__init__(self, title, parent)
                self.params = params
                self.vpath = vpath
+               self.filename = self.title + "." + vpath.rsplit(".", 1)[1]
                self.can_download = True
 
        def download(self):
                auth_doc = grab_xml(self.params["auth"], 0)
-###            vbase = auth_doc.xpath("//auth:server/text()", namespaces=NS)[0]
+               server = self.params["server_streaming"]
                token = auth_doc.xpath("//auth:token/text()", namespaces=NS)[0]
-               vbase = "rtmp://cp53909.edgefcs.net/ondemand"
-               vbase += "?auth=" + token
+               playpath = auth_doc.xpath("//auth:path/text()", namespaces=NS)[0]
+               if playpath == "playback/_definst_/":
+                       playpath = "flash/" + playpath
+               vbase = server + "?auth=" + token
                vpath, ext = self.vpath.rsplit(".", 1)
-               vpath = "flash/playback/_definst_/" + vpath
-               vpath = ext + ":" + vpath
-               filename = self.title + "." + ext
-               return download_rtmp(filename, vbase, vpath, HASH_URL)
-
+               vpath = ext + ":" + playpath + vpath
+               return download_rtmp(self.filename, vbase, vpath, HASH_URL)
 
 class IviewSeriesNode(Node):
-       def __init__(self, title, parent, params, series_id):
+       def __init__(self, title, parent, params, series_ids):
                Node.__init__(self, title, parent)
                self.params = params
-               self.series_id = series_id
+               self.series_ids = series_ids
 
        def fill_children(self):
-               series_doc = grab_json(self.params["api"] + "series=" + self.series_id, 3600)
-               if not series_doc:
+               for series_id in self.series_ids:
+                       self.fill_children_for_id(series_id)
+
+       def fill_children_for_id(self, series_id):
+               series_doc = grab_json(self.params["api"] + "series=" + series_id, 3600)
+               for episode_list in series_doc:
+                       if episode_list["a"] == series_id:
+                               episode_list = episode_list["f"]
+                               break
+               else:
                        return
-               for episode in series_doc[0]["f"]:
+
+               for episode in episode_list:
                        vpath = episode["n"]
                        episode_title = episode["b"].strip()
                        if not episode_title.startswith(self.title):
@@ -52,16 +60,22 @@ class IviewSeriesNode(Node):
                        IviewNode(episode_title, self, self.params, vpath)
 
 class SeriesInfo(object):
-       def __init__(self, title, sid, categories):
+       def __init__(self, title):
                self.title = title
-               self.sid = sid
-               self.categories = categories
+               self.series_ids = set()
+               self.categories = set()
+
+       def add_series_id(self, series_id):
+               self.series_ids.add(series_id)
+
+       def add_categories(self, categories):
+               self.categories.update(categories)
 
 class IviewRootNode(Node):
        def __init__(self, parent):
                Node.__init__(self, "ABC iView", parent)
                self.params = {}
-               self.series_info = []
+               self.series_info = {}
                self.categories_map = {}
 
        def load_params(self):
@@ -77,8 +91,12 @@ class IviewRootNode(Node):
                        title = series["b"].replace("&", "&")
                        sid = series["a"]
                        categories = series["e"].split()
-                       info = SeriesInfo(title, sid, categories)
-                       self.series_info.append(info)
+                       info = self.series_info.get(title, None)
+                       if not info:
+                               info = SeriesInfo(title)
+                               self.series_info[title] = info
+                       info.add_categories(categories)
+                       info.add_series_id(sid)
 
        def load_categories(self):
                categories_doc = grab_xml(BASE_URL + self.params["categories"], 24*3600)
@@ -100,11 +118,11 @@ class IviewRootNode(Node):
 
        def link_series(self):
                # Create a duplicate within each category for each series
-               for s in self.series_info:
+               for s in self.series_info.itervalues():
                        for cid in s.categories:
                                parent = self.categories_map.get(cid)
                                if parent:
-                                       IviewSeriesNode(s.title, parent, self.params, s.sid)
+                                       IviewSeriesNode(s.title, parent, self.params, s.series_ids)
 
        def fill_children(self):
                self.load_params()