|
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
|
|
|
|
|
|
from .common import InfoExtractor
|
|
|
|
|
|
-from ..compat import compat_urllib_parse
|
|
|
+from ..compat import compat_urlparse
|
|
|
from ..utils import qualities
|
|
|
|
|
|
|
|
@@ -21,17 +21,21 @@ class TheSceneIE(InfoExtractor):
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
display_id = self._match_id(url)
|
|
|
+
|
|
|
webpage = self._download_webpage(url, display_id)
|
|
|
- player_url = compat_urllib_parse.urljoin(
|
|
|
+
|
|
|
+ player_url = compat_urlparse.urljoin(
|
|
|
url,
|
|
|
self._html_search_regex(
|
|
|
r'id=\'js-player-script\'[^>]+src=\'(.+?)\'', webpage, 'player url'))
|
|
|
|
|
|
- self.to_screen(player_url)
|
|
|
- player = self._download_webpage(player_url, player_url)
|
|
|
- info = self._parse_json(self._search_regex(r'(?m)var\s+video\s+=\s+({.+?});$', player, 'info json'), display_id)
|
|
|
+ player = self._download_webpage(player_url, display_id)
|
|
|
+ info = self._parse_json(
|
|
|
+ self._search_regex(
|
|
|
+ r'(?m)var\s+video\s+=\s+({.+?});$', player, 'info json'),
|
|
|
+ display_id)
|
|
|
|
|
|
- qualities_order = qualities(['low', 'high'])
|
|
|
+ qualities_order = qualities(('low', 'high'))
|
|
|
formats = [{
|
|
|
'format_id': '{0}-{1}'.format(f['type'].split('/')[0], f['quality']),
|
|
|
'url': f['src'],
|
|
@@ -41,8 +45,8 @@ class TheSceneIE(InfoExtractor):
|
|
|
|
|
|
return {
|
|
|
'id': info['id'],
|
|
|
+ 'display_id': display_id,
|
|
|
'title': info['title'],
|
|
|
'formats': formats,
|
|
|
'thumbnail': info.get('poster_frame'),
|
|
|
- 'display_id': display_id,
|
|
|
}
|