Fixed iView to not skip the News24 stream

[webdl] / iview.py

diff --git a/iview.py b/iview.py
index 25176c2aedd66b9abcaa9b6d6d6bb0aa41011521..407351602f6ed05d020c4262cb3584d018e4d493 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,20 +16,20 @@ 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):
@@ -40,9 +39,14 @@ class IviewSeriesNode(Node):
 
        def fill_children(self):
                series_doc = grab_json(self.params["api"] + "series=" + self.series_id, 3600)
-               if not series_doc:
+               for episode_list in series_doc:
+                       if episode_list["a"] == self.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):