Use livestreamer for iview HLS instead of my own code

[webdl] / iview.py

diff --git a/iview.py b/iview.py
index cfe5ec4a9ceab6e08eeac0a8e915e560155db4c6..d0e0e58e2c203ea1d1bdf2af062f6e0022c11e5d 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -14,7 +14,7 @@ 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):
@@ -33,7 +33,7 @@ class IviewEpisodeNode(Node):
         token_hostname = urlparse.urlparse(token_url).netloc
         return token, token_hostname
 
-    def hack_url_auth_token(self, video_url, token, token_hostname):
+    def add_auth_token_to_url(self, video_url, token, token_hostname):
         parsed_url = urlparse.urlparse(video_url)
         hacked_url = parsed_url._replace(netloc=token_hostname, query="hdnea=" + token)
         video_url = urlparse.urlunparse(hacked_url)
@@ -43,8 +43,8 @@ class IviewEpisodeNode(Node):
         info = grab_json(API_URL + "/programs/" + self.video_key, 3600)
         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)
-        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):