R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[wwe] Resolve requested issues

Browse Source
This commit is contained in:
mttronc 2018-09-11 11:26:48 +02:00
parent a403ce27c6
commit d84d4f17c3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/wwe.py
View File

@ -1,19 +1,21 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ExtractorError from ..compat import compat_str
from ..utils import urljoin
class WWEIE(InfoExtractor): class WWEIE(InfoExtractor):
_VALID_URL = r'https?://(?:\w+\.)?wwe.com/(?:.*/)?videos/(?P<id>[\w-]+)' _VALID_URL = r'https?://(?:\w+\.)?wwe.com/(?:.*/)?videos/(?P<id>[\w-]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.wwe.com/videos/daniel-bryan-vs-andrade-cien-almas-smackdown-live-sept-4-2018', 'url': 'https://www.wwe.com/videos/daniel-bryan-vs-andrade-cien-almas-smackdown-live-sept-4-2018',
'md5': '30cbc824b51f4010ea885bfcaec76972',
'info_dict': { 'info_dict': {
'id': 'sd994_bryan_almas_090418', 'id': '40048199',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Daniel Bryan vs. Andrade "Cien" Almas: SmackDown LIVE, Sept. 4, 2018', 'title': 'Daniel Bryan vs. Andrade "Cien" Almas: SmackDown LIVE, Sept. 4, 2018',
'description': 'Still fuming after he and his wife Brie Bella were attacked by The Miz and Maryse last week, Daniel Bryan takes care of some unfinished business with Andrade "Cien" Almas.', 'description': 'Still fuming after he and his wife Brie Bella were attacked by The Miz and Maryse last week, Daniel Bryan takes care of some unfinished business with Andrade "Cien" Almas.',
'thumbnail': 'https://www.wwe.com/f/styles/wwe_16_9_s/public/2018/09/20180904_sd_danielalmas--d97661dd31eea8a99837a3dbc7121f8f.jpg', 'thumbnail': r're:^https?://.*\.jpg$',
} }
}, { }, {
'url': 'https://de.wwe.com/videos/gran-metalik-vs-tony-nese-wwe-205-live-sept-4-2018', 'url': 'https://de.wwe.com/videos/gran-metalik-vs-tony-nese-wwe-205-live-sept-4-2018',
@ -33,17 +35,14 @@ class WWEIE(InfoExtractor):
player = drupal_settings['WWEVideoLanding']['initialVideo'] player = drupal_settings['WWEVideoLanding']['initialVideo']
metadata = player['playlist'][0] metadata = player['playlist'][0]
if metadata.get('file') is None: id = compat_str(metadata['nid'])
raise ExtractorError('Unable to extract video url')
title = metadata.get('title') or self._og_search_title(webpage) title = metadata.get('title') or self._og_search_title(webpage)
video_url = 'https:' + metadata.get('file') video_url = 'https:' + metadata['file']
thumbnail = None thumbnail = None
if metadata.get('image') is not None: if metadata.get('image') is not None:
thumbnail = 'https://www.wwe.com' + metadata.get('image') thumbnail = urljoin(url, metadata.get('image'))
description = metadata.get('description') description = metadata.get('description')
id = self._generic_id(video_url)
formats = self._extract_m3u8_formats(video_url, id, 'mp4') formats = self._extract_m3u8_formats(video_url, id, 'mp4')
return { return {