github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[condenast] Fix extraction and style (closes #12526)

Browse source
This commit is contained in:
Sergey M․ 2017-03-22 23:22:14 +07:00
parent c183e14f89
commit 391d076d7c
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
youtube_dl/extractor/condenast.py
View file

@ -9,13 +9,14 @@ from ..compat import (
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
orderedSet,
remove_end,
extract_attributes,
mimetype2ext,
determine_ext, determine_ext,
extract_attributes,
int_or_none, int_or_none,
js_to_json,
mimetype2ext,
orderedSet,
parse_iso8601, parse_iso8601,
remove_end,
) )
@ -66,6 +67,16 @@ class CondeNastIE(InfoExtractor):
'upload_date': '20130314', 'upload_date': '20130314',
'timestamp': 1363219200, 'timestamp': 1363219200,
} }
}, {
'url': 'http://video.gq.com/watch/the-closer-with-keith-olbermann-the-only-true-surprise-trump-s-an-idiot?c=series',
'info_dict': {
'id': '58d1865bfd2e6126e2000015',
'ext': 'mp4',
'title': 'The Only True Surprise? Trump’s an Idiot',
'uploader': 'gq',
'upload_date': '20170321',
'timestamp': 1490126427,
},
}, { }, {
# JS embed # JS embed
'url': 'http://player.cnevids.com/embedjs/55f9cf8b61646d1acf00000c/5511d76261646d5566020000.js', 'url': 'http://player.cnevids.com/embedjs/55f9cf8b61646d1acf00000c/5511d76261646d5566020000.js',
@ -114,26 +125,33 @@ class CondeNastIE(InfoExtractor):
}) })
video_id = query['videoId'] video_id = query['videoId']
video_info = None video_info = None
info_page = self._download_webpage( info_page = self._download_json(
'http://player.cnevids.com/player/video.js', 'http://player.cnevids.com/player/video.js',
video_id, 'Downloading video info', query=query, fatal=False) video_id, 'Downloading video info', fatal=False, query=query)
if info_page: if info_page:
video_info = self._parse_json(self._search_regex( video_info = info_page.get('video')
r'loadCallback\(({.+})\)', info_page, 'video info'), video_id)['video'] if not video_info:
else:
info_page = self._download_webpage( info_page = self._download_webpage(
'http://player.cnevids.com/player/loader.js', 'http://player.cnevids.com/player/loader.js',
video_id, 'Downloading loader info', query=query) video_id, 'Downloading loader info', query=query)
video_info = self._parse_json(self._search_regex( video_info = self._parse_json(
r'var\s+video\s*=\s*({.+?});', info_page, 'video info'), video_id) self._search_regex(
r'(?s)var\s+config\s*=\s*({.+?});', info_page, 'config'),
video_id, transform_source=js_to_json)['video']
title = video_info['title'] title = video_info['title']
formats = [] formats = []
for fdata in video_info.get('sources', [{}])[0]: for fdata in video_info['sources']:
src = fdata.get('src') src = fdata.get('src')
if not src: if not src:
continue continue
ext = mimetype2ext(fdata.get('type')) or determine_ext(src) ext = mimetype2ext(fdata.get('type')) or determine_ext(src)
if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
src, video_id, 'mp4', entry_protocol='m3u8_native',
m3u8_id='hls', fatal=False))
continue
quality = fdata.get('quality') quality = fdata.get('quality')
formats.append({ formats.append({
'format_id': ext + ('-%s' % quality if quality else ''), 'format_id': ext + ('-%s' % quality if quality else ''),
@ -169,7 +187,6 @@ class CondeNastIE(InfoExtractor):
path=remove_end(parsed_url.path, '.js').replace('/embedjs/', '/embed/'))) path=remove_end(parsed_url.path, '.js').replace('/embedjs/', '/embed/')))
url_type = 'embed' url_type = 'embed'
self.to_screen('Extracting from %s with the Condé Nast extractor' % self._SITES[site])
webpage = self._download_webpage(url, item_id) webpage = self._download_webpage(url, item_id)
if url_type == 'series': if url_type == 'series':