projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e92d4a1
)
[smotri] Improve extraction (Closes #4698)
author
Sergey M․
<dstftw@gmail.com>
Wed, 14 Jan 2015 15:50:36 +0000
(21:50 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 14 Jan 2015 15:50:36 +0000
(21:50 +0600)
youtube_dl/extractor/smotri.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/smotri.py
b/youtube_dl/extractor/smotri.py
index baef3daa04f70ceea7200f5f810eba7fc9df052f..26f361c93990b6b92ff31d2447b70f7e08263d00 100644
(file)
--- a/
youtube_dl/extractor/smotri.py
+++ b/
youtube_dl/extractor/smotri.py
@@
-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
{
'url': 'http://pics.smotri.com/scrubber_custom8.swf?file=v9188090500',
# swf player
{
'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')
- if video.get('_moderate_no') or not video.get('moderated'):
- raise ExtractorError('Video %s has not been approved by moderator' % video_id, expected=True)
+ video_url = video.get('_vidURL') or video.get('_vidURL_mp4')
+
+ if not video_url:
+ if video.get('_moderate_no') or not video.get('moderated'):
+ raise ExtractorError(
+ 'Video %s has not been approved by moderator' % video_id, expected=True)
- if video.get('error'):
- raise ExtractorError('Video %s does not exist' % video_id, expected=True)
+
if video.get('error'):
+
raise ExtractorError('Video %s does not exist' % video_id, expected=True)
- video_url = video.get('_vidURL') or video.get('_vidURL_mp4')
title = video['title']
thumbnail = video['_imgURL']
upload_date = unified_strdate(video['added'])
title = video['title']
thumbnail = video['_imgURL']
upload_date = unified_strdate(video['added'])