depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-22 02:01:50 +00:00
Code Issues Releases Wiki Activity

[videofy.me] fix info extraction

Browse source 
Closes #7339.
This commit is contained in:
remitamine 2015-11-01 22:12:20 +01:00 committed by Jaime Marquínez Ferrándiz
parent eb97f46e8b
commit c514b0ec65
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
youtube_dl/extractor/videofyme.py
View file

@ -2,8 +2,8 @@ from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
find_xpath_attr,
int_or_none, int_or_none,
parse_iso8601,
) )
@ -18,33 +18,35 @@ class VideofyMeIE(InfoExtractor):
'id': '1100701', 'id': '1100701',
'ext': 'mp4', 'ext': 'mp4',
'title': 'This is VideofyMe', 'title': 'This is VideofyMe',
'description': None, 'description': '',
'upload_date': '20130326',
'timestamp': 1364288959,
'uploader': 'VideofyMe', 'uploader': 'VideofyMe',
'uploader_id': 'thisisvideofyme', 'uploader_id': 'thisisvideofyme',
'view_count': int, 'view_count': int,
'likes': int,
'comment_count': int,
}, },
} }
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
config = self._download_xml('http://sunshine.videofy.me/?videoId=%s' % video_id,
video_id) config = self._download_json('http://vf-player-info-loader.herokuapp.com/%s.json' % video_id, video_id)['videoinfo']
video = config.find('video')
sources = video.find('sources') video = config.get('video')
url_node = next(node for node in [find_xpath_attr(sources, 'source', 'id', 'HQ %s' % key) blog = config.get('blog', {})
for key in ['on', 'av', 'off']] if node is not None)
video_url = url_node.find('url').text
view_count = int_or_none(self._search_regex(
r'([0-9]+)', video.find('views').text, 'view count', fatal=False))
return { return {
'id': video_id, 'id': video_id,
'title': video.find('title').text, 'title': video['title'],
'url': video_url, 'url': video['sources']['source']['url'],
'thumbnail': video.find('thumb').text, 'thumbnail': video.get('thumb'),
'description': video.find('description').text, 'description': video.get('description'),
'uploader': config.find('blog/name').text, 'timestamp': parse_iso8601(video.get('date')),
'uploader_id': video.find('identifier').text, 'uploader': blog.get('name'),
'view_count': view_count, 'uploader_id': blog.get('identifier'),
'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),
'likes': int_or_none(video.get('likes')),
'comment_count': int_or_none(video.get('nrOfComments')),
} }