Merge tag 'upstream/2015.06.04.1'

[youtubedl] / youtube_dl / extractor / sbs.py

diff --git a/youtube_dl/extractor/sbs.py b/youtube_dl/extractor/sbs.py
index b8775c2f99f4a105ae35f1b04a919e64c987df0f..d4bd1a0d72624e65bc9a5890f371b492451a9486 100644 (file)
--- a/youtube_dl/extractor/sbs.py
+++ b/youtube_dl/extractor/sbs.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 

-import json

 import re
 from .common import InfoExtractor
 from ..utils import (
 import re
 from .common import InfoExtractor
 from ..utils import (


@@ -33,16 +32,18 @@ class SBSIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)
+

         webpage = self._download_webpage(url, video_id)
 
         webpage = self._download_webpage(url, video_id)
 

-        release_urls_json = js_to_json(self._search_regex(
+        player = self._search_regex(

             r'(?s)playerParams\.releaseUrls\s*=\s*(\{.*?\n\});\n',
             r'(?s)playerParams\.releaseUrls\s*=\s*(\{.*?\n\});\n',

-            webpage, ''))
-        release_urls = json.loads(release_urls_json)
-        theplatform_url = (
-            release_urls.get('progressive') or release_urls.get('standard'))
+            webpage, 'player')
+        player = re.sub(r"'\s*\+\s*[\da-zA-Z_]+\s*\+\s*'", '', player)
+
+        release_urls = self._parse_json(js_to_json(player), video_id)
+
+        theplatform_url = release_urls.get('progressive') or release_urls['standard']

 
         title = remove_end(self._og_search_title(webpage), ' (The Feed)')
         description = self._html_search_meta('description', webpage)
 
         title = remove_end(self._og_search_title(webpage), ' (The Feed)')
         description = self._html_search_meta('description', webpage)


@@ -52,7 +53,6 @@ class SBSIE(InfoExtractor):
             '_type': 'url_transparent',
             'id': video_id,
             'url': theplatform_url,
             '_type': 'url_transparent',
             'id': video_id,
             'url': theplatform_url,

-

             'title': title,
             'description': description,
             'thumbnail': thumbnail,
             'title': title,
             'description': description,
             'thumbnail': thumbnail,