Merge branch 'nowness' of https://github.com/remitamine/youtube-dl into remitamine-nowness

This commit is contained in:
Sergey M․ 2015-09-13 18:01:55 +06:00
commit d5d38d16ae
2 changed files with 82 additions and 27 deletions

View File

@ -405,7 +405,11 @@ from .normalboots import NormalbootsIE
from .nosvideo import NosVideoIE from .nosvideo import NosVideoIE
from .nova import NovaIE from .nova import NovaIE
from .novamov import NovaMovIE from .novamov import NovaMovIE
from .nowness import NownessIE from .nowness import (
NownessIE,
NownessPlaylistIE,
NownessSerieIE,
)
from .nowtv import NowTVIE from .nowtv import NowTVIE
from .nowvideo import NowVideoIE from .nowvideo import NowVideoIE
from .npo import ( from .npo import (

View File

@ -1,19 +1,54 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .brightcove import BrightcoveIE from .brightcove import BrightcoveIE
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ExtractorError from ..utils import ExtractorError
from ..compat import compat_urllib_request
class NownessIE(InfoExtractor): class NownessBaseIE(InfoExtractor):
_VALID_URL = r'https?://(?:(?:www|cn)\.)?nowness\.com/[^?#]*?/(?P<id>[0-9]+)/(?P<slug>[^/]+?)(?:$|[?#])' def extract_url_result(self, post):
if post['type'] == 'video':
for media in post['media']:
if media['type'] == 'video':
video_id = media['content']
source = media['source']
if source == 'brightcove':
player_code = self._download_webpage(
'http://www.nowness.com/iframe?id=%s' % video_id, video_id,
note='Downloading player JavaScript',
errnote='Player download failed')
bc_url = BrightcoveIE._extract_brightcove_url(player_code)
if bc_url is None:
raise ExtractorError('Could not find player definition')
return self.url_result(bc_url, 'Brightcove')
elif source == 'vimeo':
return self.url_result('http://vimeo.com/%s' % video_id, 'Vimeo')
elif source == 'youtube':
return self.url_result(video_id, 'Youtube')
elif source == 'cinematique':
# youtube-dl currently doesn't support cinematique
# return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
pass
def api_request(self, url, request_path):
display_id = self._match_id(url)
lang = 'zh-cn' if 'cn.nowness.com' in url else 'en-us'
request = compat_urllib_request.Request('http://api.nowness.com/api/' + request_path % display_id, headers={
'X-Nowness-Language': lang,
})
json_data = self._download_json(request, display_id)
return display_id, json_data
class NownessIE(NownessBaseIE):
IE_NAME = 'nowness'
_VALID_URL = r'https?://(?:(?:www|cn)\.)?nowness\.com/(?:story|(?:series|category)/[^/]+)/(?P<id>[^/]+?)(?:$|[?#])'
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.nowness.com/day/2013/6/27/3131/candor--the-art-of-gesticulation', 'url': 'https://www.nowness.com/story/candor-the-art-of-gesticulation',
'md5': '068bc0202558c2e391924cb8cc470676', 'md5': '068bc0202558c2e391924cb8cc470676',
'info_dict': { 'info_dict': {
'id': '2520295746001', 'id': '2520295746001',
@ -25,7 +60,7 @@ class NownessIE(InfoExtractor):
} }
}, },
{ {
'url': 'http://cn.nowness.com/day/2014/8/7/4069/kasper-bj-rke-ft-jaakko-eino-kalevi--tnr', 'url': 'https://cn.nowness.com/story/kasper-bjorke-ft-jaakko-eino-kalevi-tnr',
'md5': 'e79cf125e387216f86b2e0a5b5c63aa3', 'md5': 'e79cf125e387216f86b2e0a5b5c63aa3',
'info_dict': { 'info_dict': {
'id': '3716354522001', 'id': '3716354522001',
@ -39,26 +74,42 @@ class NownessIE(InfoExtractor):
] ]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) display_id, post = self.api_request(url, 'post/getBySlug/%s')
video_id = mobj.group('slug') return self.extract_url_result(post)
webpage = self._download_webpage(url, video_id)
player_url = self._search_regex(
r'"([^"]+/content/issue-[0-9.]+.js)"', webpage, 'player URL')
real_id = self._search_regex(
r'\sdata-videoId="([0-9]+)"', webpage, 'internal video ID')
player_code = self._download_webpage( class NownessPlaylistIE(NownessBaseIE):
player_url, video_id, IE_NAME = 'nowness:playlist'
note='Downloading player JavaScript', _VALID_URL = r'https?://(?:(?:www|cn)\.)?nowness\.com/playlist/(?P<id>\d+)'
errnote='Player download failed') _TEST = {
player_code = player_code.replace("'+d+'", real_id) 'url': 'https://www.nowness.com/playlist/3286/i-guess-thats-why-they-call-it-the-blues',
'info_dict':
bc_url = BrightcoveIE._extract_brightcove_url(player_code) {
if bc_url is None: 'id': '3286',
raise ExtractorError('Could not find player definition') },
return { 'playlist_mincount': 8,
'_type': 'url',
'url': bc_url,
'ie_key': 'Brightcove',
} }
def _real_extract(self, url):
playlist_id, playlist = self.api_request(url, 'post?PlaylistId=%s')
entries = [self.extract_url_result(item) for item in playlist['items']]
return self.playlist_result(entries, playlist_id)
class NownessSerieIE(NownessBaseIE):
IE_NAME = 'nowness:serie'
_VALID_URL = r'https?://(?:(?:www|cn)\.)?nowness\.com/series/(?P<id>[^/]+?)(?:$|[?#])'
_TEST = {
'url': 'https://www.nowness.com/series/60-seconds',
'info_dict':
{
'id': '60',
},
'playlist_mincount': 4,
}
def _real_extract(self, url):
display_id, serie = self.api_request(url, 'series/getBySlug/%s')
serie_id = str(serie['id'])
entries = [self.extract_url_result(post) for post in serie['posts']]
return self.playlist_result(entries, serie_id)