Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows

pull/5772/head
Sergey M․ 2015-05-16 21:28:36 +06:00
commit 363cf58645
2 changed files with 36 additions and 1 deletions

View File

@ -643,7 +643,10 @@ from .vine import (
VineIE, VineIE,
VineUserIE, VineUserIE,
) )
from .viki import VikiIE from .viki import (
VikiIE,
VikiShowIE,
)
from .vk import ( from .vk import (
VKIE, VKIE,
VKUserVideosIE, VKUserVideosIE,

View File

@ -145,3 +145,35 @@ class VikiIE(InfoExtractor):
'ext': 'vtt', 'ext': 'vtt',
}] }]
return res return res
class VikiShowIE(InfoExtractor):
IE_NAME = 'viki:show'
_VALID_URL = r'^https?://(?:www\.)?viki\.com/tv/(?P<id>[0-9]+c)'
_TESTS = [{
'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
'info_dict': {
'id': '50c',
'title': 'Boys Over Flowers',
'description': 'md5:ecd3cff47967fe193cff37c0bec52790',
},
'playlist_count': 25,
}]
def _real_extract(self, url):
show_id = self._match_id(url)
show_page = self._download_webpage(url, show_id, 'Download show page')
title = self._og_search_title(show_page)
description = self._og_search_description(show_page)
show_json = self._download_json(
'http://api.viki.io/v4/containers/%s/episodes.json?app=100000a&per_page=999&sort=number&direction=asc' % show_id,
show_id, note='Retrieve show json', errnote='Unable to get show json')
entries = []
for video in show_json['response']:
video_id = video['id']
entries.append(self.url_result(
'http://www.viki.com/videos/%s' % video_id, 'Viki', video_id))
return self.playlist_result(entries, show_id, title, description)