mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-29 00:35:09 +02:00
[viki] Modernize
This commit is contained in:
parent
773c0b4bb8
commit
cb9722cb3f
@ -1,3 +1,5 @@
|
|||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
@ -9,21 +11,22 @@ from .subtitles import SubtitlesInfoExtractor
|
|||||||
|
|
||||||
|
|
||||||
class VikiIE(SubtitlesInfoExtractor):
|
class VikiIE(SubtitlesInfoExtractor):
|
||||||
IE_NAME = u'viki'
|
IE_NAME = 'viki'
|
||||||
|
|
||||||
_VALID_URL = r'^https?://(?:www\.)?viki\.com/videos/(?P<id>[0-9]+v)'
|
_VALID_URL = r'^https?://(?:www\.)?viki\.com/videos/(?P<id>[0-9]+v)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://www.viki.com/videos/1023585v-heirs-episode-14',
|
'url': 'http://www.viki.com/videos/1023585v-heirs-episode-14',
|
||||||
u'file': u'1023585v.mp4',
|
'md5': 'a21454021c2646f5433514177e2caa5f',
|
||||||
u'md5': u'a21454021c2646f5433514177e2caa5f',
|
'info_dict': {
|
||||||
u'info_dict': {
|
'id': '1023585v',
|
||||||
u'title': u'Heirs Episode 14',
|
'ext': 'mp4',
|
||||||
u'uploader': u'SBS',
|
'title': 'Heirs Episode 14',
|
||||||
u'description': u'md5:c4b17b9626dd4b143dcc4d855ba3474e',
|
'uploader': 'SBS',
|
||||||
u'upload_date': u'20131121',
|
'description': 'md5:c4b17b9626dd4b143dcc4d855ba3474e',
|
||||||
u'age_limit': 13,
|
'upload_date': '20131121',
|
||||||
|
'age_limit': 13,
|
||||||
},
|
},
|
||||||
u'skip': u'Blocked in the US',
|
'skip': 'Blocked in the US',
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
@ -44,7 +47,7 @@ class VikiIE(SubtitlesInfoExtractor):
|
|||||||
|
|
||||||
rating_str = self._html_search_regex(
|
rating_str = self._html_search_regex(
|
||||||
r'<strong>Rating: </strong>\s*([^<]*)<', webpage,
|
r'<strong>Rating: </strong>\s*([^<]*)<', webpage,
|
||||||
u'rating information', default='').strip()
|
'rating information', default='').strip()
|
||||||
RATINGS = {
|
RATINGS = {
|
||||||
'G': 0,
|
'G': 0,
|
||||||
'PG': 10,
|
'PG': 10,
|
||||||
@ -56,16 +59,16 @@ class VikiIE(SubtitlesInfoExtractor):
|
|||||||
|
|
||||||
info_url = 'http://www.viki.com/player5_fragment/%s?action=show&controller=videos' % video_id
|
info_url = 'http://www.viki.com/player5_fragment/%s?action=show&controller=videos' % video_id
|
||||||
info_webpage = self._download_webpage(
|
info_webpage = self._download_webpage(
|
||||||
info_url, video_id, note=u'Downloading info page')
|
info_url, video_id, note='Downloading info page')
|
||||||
if re.match(r'\s*<div\s+class="video-error', info_webpage):
|
if re.match(r'\s*<div\s+class="video-error', info_webpage):
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
u'Video %s is blocked from your location.' % video_id,
|
'Video %s is blocked from your location.' % video_id,
|
||||||
expected=True)
|
expected=True)
|
||||||
video_url = self._html_search_regex(
|
video_url = self._html_search_regex(
|
||||||
r'<source[^>]+src="([^"]+)"', info_webpage, u'video URL')
|
r'<source[^>]+src="([^"]+)"', info_webpage, 'video URL')
|
||||||
|
|
||||||
upload_date_str = self._html_search_regex(
|
upload_date_str = self._html_search_regex(
|
||||||
r'"created_at":"([^"]+)"', info_webpage, u'upload date')
|
r'"created_at":"([^"]+)"', info_webpage, 'upload date')
|
||||||
upload_date = (
|
upload_date = (
|
||||||
unified_strdate(upload_date_str)
|
unified_strdate(upload_date_str)
|
||||||
if upload_date_str is not None
|
if upload_date_str is not None
|
||||||
|
Loading…
Reference in New Issue
Block a user