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

[smotri] Improve extraction (Closes #4698)

Browse source
This commit is contained in:
Sergey M․ 2015-01-14 21:50:36 +06:00
parent e92d4a11f5
commit c9ef44ce29
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
youtube_dl/extractor/smotri.py
View file

@ -90,6 +90,20 @@ class SmotriIE(InfoExtractor):
}, },
'skip': 'Video is not approved by moderator', 'skip': 'Video is not approved by moderator',
}, },
# not approved by moderator, but available
{
'url': 'http://smotri.com/video/view/?id=v28888533b73',
'md5': 'f44bc7adac90af518ef1ecf04893bb34',
'info_dict': {
'id': 'v28888533b73',
'ext': 'mp4',
'title': 'Russian Spies Killed By ISIL Child Soldier',
'uploader': 'Mopeder',
'uploader_id': 'mopeder',
'duration': 71,
'thumbnail': 'http://frame9.loadup.ru/d7/32/2888853.2.3.jpg',
},
},
# swf player # swf player
{ {
'url': 'http://pics.smotri.com/scrubber_custom8.swf?file=v9188090500', 'url': 'http://pics.smotri.com/scrubber_custom8.swf?file=v9188090500',
@ -146,13 +160,16 @@ class SmotriIE(InfoExtractor):
video = self._download_json(request, video_id, 'Downloading video JSON') video = self._download_json(request, video_id, 'Downloading video JSON')
video_url = video.get('_vidURL') or video.get('_vidURL_mp4')
if not video_url:
if video.get('_moderate_no') or not video.get('moderated'): if video.get('_moderate_no') or not video.get('moderated'):
raise ExtractorError('Video %s has not been approved by moderator' % video_id, expected=True) raise ExtractorError(
'Video %s has not been approved by moderator' % video_id, expected=True)
if video.get('error'): if video.get('error'):
raise ExtractorError('Video %s does not exist' % video_id, expected=True) raise ExtractorError('Video %s does not exist' % video_id, expected=True)
video_url = video.get('_vidURL') or video.get('_vidURL_mp4')
title = video['title'] title = video['title']
thumbnail = video['_imgURL'] thumbnail = video['_imgURL']
upload_date = unified_strdate(video['added']) upload_date = unified_strdate(video['added'])