Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / adobetv.py

diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dl/extractor/adobetv.py
index 8753ee2cf2b5fdaa5810fc8d564f388734a84324..008c98e51ead3ffcad7bb350fcf928a945b91e35 100644 (file)
--- a/youtube_dl/extractor/adobetv.py
+++ b/youtube_dl/extractor/adobetv.py
@@ -30,7 +30,7 @@ class AdobeTVIE(AdobeTVBaseIE):
             'ext': 'mp4',
             'title': 'Quick Tip - How to Draw a Circle Around an Object in Photoshop',
             'description': 'md5:99ec318dc909d7ba2a1f2b038f7d2311',
             'ext': 'mp4',
             'title': 'Quick Tip - How to Draw a Circle Around an Object in Photoshop',
             'description': 'md5:99ec318dc909d7ba2a1f2b038f7d2311',

-            'thumbnail': 're:https?://.*\.jpg$',
+            'thumbnail': r're:https?://.*\.jpg$',

             'upload_date': '20110914',
             'duration': 60,
             'view_count': int,
             'upload_date': '20110914',
             'duration': 60,
             'view_count': int,


@@ -156,7 +156,10 @@ class AdobeTVVideoIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
     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')),
 
         formats = [{
             'format_id': '%s-%s' % (determine_ext(source['src']), source.get('height')),