[tvigle] Adapt to the new API
This commit is contained in:
Sergey M․
parent
7d4d5f25ed
commit
884ae74785
|
|
@ -5,80 +5,82 @@ import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
unified_strdate,
|
float_or_none,
|
||||||
clean_html,
|
str_to_int,
|
||||||
int_or_none,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class TvigleIE(InfoExtractor):
|
class TvigleIE(InfoExtractor):
|
||||||
IE_NAME = 'tvigle'
|
IE_NAME = 'tvigle'
|
||||||
IE_DESC = 'Интернет-телевидение Tvigle.ru'
|
IE_DESC = 'Интернет-телевидение Tvigle.ru'
|
||||||
_VALID_URL = r'http://(?:www\.)?tvigle\.ru/category/.+?[\?&]v(?:ideo)?=(?P<id>\d+)'
|
_VALID_URL = r'http://(?:www\.)?tvigle\.ru/(?:[^/]+/)+(?P<display_id>[^/]+)/$'
|
||||||
|
|
||||||
_TESTS = [
|
_TESTS = [
|
||||||
{
|
{
|
||||||
'url': 'http://www.tvigle.ru/category/cinema/1608/?video=503081',
|
'url': 'http://www.tvigle.ru/video/brat-2/',
|
||||||
'md5': '09afba4616666249f087efc6dcf83cb3',
|
'md5': '72cb7eab33e54314e1790da402d3c9c3',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '503081',
|
'id': '5119390',
|
||||||
'ext': 'flv',
|
'display_id': 'brat-2',
|
||||||
|
'ext': 'mp4',
|
||||||
'title': 'Брат 2 ',
|
'title': 'Брат 2 ',
|
||||||
'description': 'md5:f5a42970f50648cee3d7ad740f3ae769',
|
'description': 'md5:5751f4fe345a58e1692585c361294bd8',
|
||||||
'upload_date': '20110919',
|
'duration': 7356.369,
|
||||||
|
'age_limit': 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.tvigle.ru/category/men/vysotskiy_vospominaniya02/?flt=196&v=676433',
|
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
|
||||||
'md5': 'e7efe5350dd5011d0de6550b53c3ba7b',
|
'md5': 'd9012d7c7c598fe7a11d7fb46dc1f574',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '676433',
|
'id': '5142516',
|
||||||
'ext': 'flv',
|
'ext': 'mp4',
|
||||||
'title': 'Ведущий телепрограммы «60 минут» (США) о Владимире Высоцком',
|
'title': 'Ведущий телепрограммы «60 минут» (США) о Владимире Высоцком',
|
||||||
'description': 'md5:027f7dc872948f14c96d19b4178428a4',
|
'description': 'md5:027f7dc872948f14c96d19b4178428a4',
|
||||||
'upload_date': '20121218',
|
'duration': 186.080,
|
||||||
|
'age_limit': 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
display_id = mobj.group('display_id')
|
||||||
|
|
||||||
video_data = self._download_xml(
|
webpage = self._download_webpage(url, display_id)
|
||||||
'http://www.tvigle.ru/xml/single.php?obj=%s' % video_id, video_id, 'Downloading video XML')
|
|
||||||
|
|
||||||
video = video_data.find('./video')
|
video_id = self._html_search_regex(
|
||||||
|
r'<li class="video-preview current_playing" id="(\d+)">', webpage, 'video id')
|
||||||
|
|
||||||
title = video.get('name')
|
video_data = self._download_json(
|
||||||
description = video.get('anons')
|
'http://cloud.tvigle.ru/api/play/video/%s/' % video_id, display_id)
|
||||||
if description:
|
|
||||||
description = clean_html(description)
|
item = video_data['playlist']['items'][0]
|
||||||
thumbnail = video_data.get('img')
|
|
||||||
upload_date = unified_strdate(video.get('date'))
|
title = item['title']
|
||||||
like_count = int_or_none(video.get('vtp'))
|
description = item['description']
|
||||||
|
thumbnail = item['thumbnail']
|
||||||
|
duration = float_or_none(item['durationMilliseconds'], 1000)
|
||||||
|
age_limit = str_to_int(item['ageRestrictions'])
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
for num, (format_id, format_note) in enumerate([['low_file', 'SQ'], ['file', 'HQ'], ['hd', 'HD 720']]):
|
for vcodec, fmts in item['videos'].items():
|
||||||
video_url = video.get(format_id)
|
for quality, video_url in fmts.items():
|
||||||
if not video_url:
|
formats.append({
|
||||||
continue
|
'url': video_url,
|
||||||
formats.append({
|
'format_id': '%s-%s' % (vcodec, quality),
|
||||||
'url': video_url,
|
'vcodec': vcodec,
|
||||||
'format_id': format_id,
|
'height': int(quality[:-1]),
|
||||||
'format_note': format_note,
|
})
|
||||||
'quality': num,
|
|
||||||
})
|
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
'display_id': display_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': description,
|
'description': description,
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'upload_date': upload_date,
|
'duration': duration,
|
||||||
'like_count': like_count,
|
'age_limit': age_limit,
|
||||||
'age_limit': 18,
|
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
}
|
}
|
||||||
|
|
@ -1321,7 +1321,7 @@ def str_to_int(int_str):
|
||||||
""" A more relaxed version of int_or_none """
|
""" A more relaxed version of int_or_none """
|
||||||
if int_str is None:
|
if int_str is None:
|
||||||
return None
|
return None
|
||||||
int_str = re.sub(r'[,\.]', u'', int_str)
|
int_str = re.sub(r'[,\.\+]', u'', int_str)
|
||||||
return int(int_str)
|
return int(int_str)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue