Switch to streamlink

[webdl] / brightcove.py

diff --git a/brightcove.py b/brightcove.py
index 9e801a47f2f2365c5057af0d3cb1d53118ca6c20..efb961b0022f12391cf1968bbbe38eeffd866e1c 100644 (file)
--- a/brightcove.py
+++ b/brightcove.py
@@ -5,7 +5,7 @@ import sys
 from common import grab_json, download_hls, download_hds, Node, append_to_qs
 
 CH9_TOKEN = "ogxhPgSphIVa2hhxbi9oqtYwtg032io4B4-ImwddYliFWHqS0UfMEw.."
-CH10_TOKEN = "lWCaZyhokufjqe7H4TLpXwHSTnNXtqHxyMvoNOsmYA_GRaZ4zcwysw.."
+CH10_TOKEN = "90QPG7lQuLJAc4s82qA-T_UoDhz_VBFK6SGstWDB0jZH8eu1SZQDFA.."
 
 BRIGHTCOVE_API = "http://api.brightcove.com/services/library?"
 
@@ -38,8 +38,8 @@ class BrightcoveVideoNode(Node):
             "video_id": self.video_id,
         })
 
-        doc = grab_json(desc_url, 3600)
-        video_url = doc["HLSURL"]
+        doc = grab_json(desc_url)
+        video_url = doc and doc["HLSURL"]
         if not video_url:
             return
 
@@ -54,8 +54,8 @@ class BrightcoveVideoNode(Node):
             "video_id": self.video_id,
         })
 
-        doc = grab_json(desc_url, 3600)
-        video_url = doc["hdsManifestUrl"]
+        doc = grab_json(desc_url)
+        video_url = doc and doc["hdsManifestUrl"]
         if not video_url:
             return
 
@@ -84,7 +84,7 @@ class BrightcoveRootNode(Node):
             url = self.get_all_videos_url(page_number)
             page_number += 1
 
-            page = grab_json(url, 3600)
+            page = grab_json(url)
             items = page["items"]
             if len(items) == 0:
                 break
@@ -174,6 +174,6 @@ class Ch10RootNode(BrightcoveRootNode):
 
 
 def fill_nodes(root_node):
-    Ch9RootNode(root_node)
+    # Ch9RootNode(root_node) -- Need a new API token
     Ch10RootNode(root_node)