xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-24 03:50:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[odnoklassniki] Support extraction from metadata URL (Closes #5813)

Browse Source
This commit is contained in:
Sergey M․ 2015-05-25 21:22:13 +06:00
parent b885bae634
commit c6bbdadd79
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
youtube_dl/extractor/odnoklassniki.py
View File

@ -2,6 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse
from ..utils import ( from ..utils import (
unified_strdate, unified_strdate,
int_or_none, int_or_none,
@ -11,8 +12,9 @@ from ..utils import (
class OdnoklassnikiIE(InfoExtractor): class OdnoklassnikiIE(InfoExtractor):
_VALID_URL = r'https?://(?:odnoklassniki|ok)\.ru/(?:video|web-api/video/moviePlayer)/(?P<id>\d+)' _VALID_URL = r'https?://(?:odnoklassniki|ok)\.ru/(?:video|web-api/video/moviePlayer)/(?P<id>[\d-]+)'
_TESTS = [{ _TESTS = [{
# metadata in JSON
'url': 'http://ok.ru/video/20079905452', 'url': 'http://ok.ru/video/20079905452',
'md5': '8e24ad2da6f387948e7a7d44eb8668fe', 'md5': '8e24ad2da6f387948e7a7d44eb8668fe',
'info_dict': { 'info_dict': {
@ -20,11 +22,22 @@ class OdnoklassnikiIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Культура меняет нас (прекрасный ролик!))', 'title': 'Культура меняет нас (прекрасный ролик!))',
'duration': 100, 'duration': 100,
'upload_date': '20141207',
'uploader_id': '330537914540', 'uploader_id': '330537914540',
'uploader': 'Виталий Добровольский', 'uploader': 'Виталий Добровольский',
'like_count': int, 'like_count': int,
'age_limit': 0, },
}, {
# metadataUrl
'url': 'http://ok.ru/video/63567059965189-0',
'md5': '9676cf86eff5391d35dea675d224e131',
'info_dict': {
'id': '63567059965189-0',
'ext': 'mp4',
'title': 'Девушка без комплексов ...',
'duration': 191,
'uploader_id': '534380003155',
'uploader': 'Андрей Мещанинов',
'like_count': int,
}, },
}, { }, {
'url': 'http://ok.ru/web-api/video/moviePlayer/20079905452', 'url': 'http://ok.ru/web-api/video/moviePlayer/20079905452',
@ -41,7 +54,15 @@ class OdnoklassnikiIE(InfoExtractor):
r'data-attributes="([^"]+)"', webpage, 'player')), r'data-attributes="([^"]+)"', webpage, 'player')),
video_id) video_id)
metadata = self._parse_json(player['flashvars']['metadata'], video_id) flashvars = player['flashvars']
metadata = flashvars.get('metadata')
if metadata:
metadata = self._parse_json(metadata, video_id)
else:
metadata = self._download_json(
compat_urllib_parse.unquote(flashvars['metadataUrl']),
video_id, 'Downloading metadata JSON')
movie = metadata['movie'] movie = metadata['movie']
title = movie['title'] title = movie['title']
@ -53,11 +74,11 @@ class OdnoklassnikiIE(InfoExtractor):
uploader = author.get('name') uploader = author.get('name')
upload_date = unified_strdate(self._html_search_meta( upload_date = unified_strdate(self._html_search_meta(
'ya:ovs:upload_date', webpage, 'upload date')) 'ya:ovs:upload_date', webpage, 'upload date', default=None))
age_limit = None age_limit = None
adult = self._html_search_meta( adult = self._html_search_meta(
'ya:ovs:adult', webpage, 'age limit') 'ya:ovs:adult', webpage, 'age limit', default=None)
if adult: if adult:
age_limit = 18 if adult == 'true' else 0 age_limit = 18 if adult == 'true' else 0