|
@@ -108,7 +108,9 @@ class WDRIE(InfoExtractor):
|
|
|
if mobj.group('player') is None:
|
|
|
entries = [
|
|
|
self.url_result(page_url + href, 'WDR')
|
|
|
- for href in re.findall(r'<a href="/?(.+?%s\.html)" rel="nofollow"' % self._PLAYER_REGEX, webpage)
|
|
|
+ for href in re.findall(
|
|
|
+ r'<a href="/?(.+?%s\.html)" rel="nofollow"' % self._PLAYER_REGEX,
|
|
|
+ webpage)
|
|
|
]
|
|
|
|
|
|
if entries: # Playlist page
|
|
@@ -133,8 +135,8 @@ class WDRIE(InfoExtractor):
|
|
|
note='Downloading playlist page %d' % page_num)
|
|
|
return self.playlist_result(entries, page_id)
|
|
|
|
|
|
- flashvars = compat_parse_qs(
|
|
|
- self._html_search_regex(r'<param name="flashvars" value="([^"]+)"', webpage, 'flashvars'))
|
|
|
+ flashvars = compat_parse_qs(self._html_search_regex(
|
|
|
+ r'<param name="flashvars" value="([^"]+)"', webpage, 'flashvars'))
|
|
|
|
|
|
page_id = flashvars['trackerClipId'][0]
|
|
|
video_url = flashvars['dslSrc'][0]
|
|
@@ -148,7 +150,8 @@ class WDRIE(InfoExtractor):
|
|
|
if 'trackerClipAirTime' in flashvars:
|
|
|
upload_date = flashvars['trackerClipAirTime'][0]
|
|
|
else:
|
|
|
- upload_date = self._html_search_meta('DC.Date', webpage, 'upload date')
|
|
|
+ upload_date = self._html_search_meta(
|
|
|
+ 'DC.Date', webpage, 'upload date')
|
|
|
|
|
|
if upload_date:
|
|
|
upload_date = unified_strdate(upload_date)
|
|
@@ -157,12 +160,15 @@ class WDRIE(InfoExtractor):
|
|
|
preference = qualities(['S', 'M', 'L', 'XL'])
|
|
|
|
|
|
if video_url.endswith('.f4m'):
|
|
|
- formats.extend(self._extract_f4m_formats(video_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18', page_id, f4m_id='hds', fatal=False))
|
|
|
+ formats.extend(self._extract_f4m_formats(
|
|
|
+ video_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18', page_id,
|
|
|
+ f4m_id='hds', fatal=False))
|
|
|
elif video_url.endswith('.smil'):
|
|
|
- formats.extend(self._extract_smil_formats(video_url, page_id, False, {
|
|
|
- 'hdcore': '3.3.0',
|
|
|
- 'plugin': 'aasp-3.3.0.99.43',
|
|
|
- }))
|
|
|
+ formats.extend(self._extract_smil_formats(
|
|
|
+ video_url, page_id, False, {
|
|
|
+ 'hdcore': '3.3.0',
|
|
|
+ 'plugin': 'aasp-3.3.0.99.43',
|
|
|
+ }))
|
|
|
else:
|
|
|
formats.append({
|
|
|
'url': video_url,
|
|
@@ -171,11 +177,16 @@ class WDRIE(InfoExtractor):
|
|
|
},
|
|
|
})
|
|
|
|
|
|
- m3u8_url = self._search_regex(r'rel="adaptiv"[^>]+href="([^"]+)"', webpage, 'm3u8 url', default=None)
|
|
|
+ m3u8_url = self._search_regex(
|
|
|
+ r'rel="adaptiv"[^>]+href="([^"]+)"',
|
|
|
+ webpage, 'm3u8 url', default=None)
|
|
|
if m3u8_url:
|
|
|
- formats.extend(self._extract_m3u8_formats(m3u8_url, page_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
|
|
|
+ formats.extend(self._extract_m3u8_formats(
|
|
|
+ m3u8_url, page_id, 'mp4', 'm3u8_native',
|
|
|
+ m3u8_id='hls', fatal=False))
|
|
|
|
|
|
- direct_urls = re.findall(r'rel="web(S|M|L|XL)"[^>]+href="([^"]+)"', webpage)
|
|
|
+ direct_urls = re.findall(
|
|
|
+ r'rel="web(S|M|L|XL)"[^>]+href="([^"]+)"', webpage)
|
|
|
if direct_urls:
|
|
|
for quality, video_url in direct_urls:
|
|
|
formats.append({
|