Merge pull request #4 from debian-janitor/lintian-fixes

[youtubedl] / youtube_dl / extractor / spike.py

diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py
index 6090e00662b5517bad5442576c375ad07590a384..7c11ea7aaf9306181fee00adab6080d5c40ac1d7 100644 (file)
--- a/youtube_dl/extractor/spike.py
+++ b/youtube_dl/extractor/spike.py
@@ -22,7 +22,7 @@ class BellatorIE(MTVServicesInfoExtractor):
         'only_matching': True,
     }]
 
         'only_matching': True,
     }]
 

-    _FEED_URL = 'http://www.spike.com/feeds/mrss/'
+    _FEED_URL = 'http://www.bellator.com/feeds/mrss/'

     _GEO_COUNTRIES = ['US']
 
 
     _GEO_COUNTRIES = ['US']
 
 


@@ -46,8 +46,12 @@ class ParamountNetworkIE(MTVServicesInfoExtractor):
     _GEO_COUNTRIES = ['US']
 
     def _extract_mgid(self, webpage):
     _GEO_COUNTRIES = ['US']
 
     def _extract_mgid(self, webpage):

-        cs = self._parse_json(self._search_regex(
+        root_data = self._parse_json(self._search_regex(

             r'window\.__DATA__\s*=\s*({.+})',
             r'window\.__DATA__\s*=\s*({.+})',

-            webpage, 'data'), None)['children']
-        c = next(c for c in cs if c.get('type') == 'VideoPlayer')
+            webpage, 'data'), None)
+
+        def find_sub_data(data, data_type):
+            return next(c for c in data['children'] if c.get('type') == data_type)
+
+        c = find_sub_data(find_sub_data(root_data, 'MainContainer'), 'VideoPlayer')

         return c['props']['media']['video']['config']['uri']
         return c['props']['media']['video']['config']['uri']