]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[adobetv] Use embedded data in the webpage
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 18 Jun 2016 04:21:40 +0000 (12:21 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 18 Jun 2016 04:21:40 +0000 (12:21 +0800)
Sometimes the HTML webpage is returned even with '?format=json'

youtube_dl/extractor/adobetv.py

index 8753ee2cf2b5fdaa5810fc8d564f388734a84324..5ae16fa16809b557e74e133a4a7811d396b1c2c2 100644 (file)
@@ -156,7 +156,10 @@ class AdobeTVVideoIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_data = self._download_json(url + '?format=json', video_id)
+        webpage = self._download_webpage(url, video_id)
+
+        video_data = self._parse_json(self._search_regex(
+            r'var\s+bridge\s*=\s*([^;]+);', webpage, 'bridged data'), video_id)
 
         formats = [{
             'format_id': '%s-%s' % (determine_ext(source['src']), source.get('height')),