[vidme] Make uploader optional and add test
This commit is contained in:
parent
8abb86fec4
commit
3b58d94f71
1 changed files with 32 additions and 5 deletions
|
@ -22,6 +22,27 @@ class VidmeIE(InfoExtractor):
|
||||||
'timestamp': 1406313244,
|
'timestamp': 1406313244,
|
||||||
'upload_date': '20140725',
|
'upload_date': '20140725',
|
||||||
'thumbnail': 're:^https?://.*\.jpg',
|
'thumbnail': 're:^https?://.*\.jpg',
|
||||||
|
'view_count': int,
|
||||||
|
'like_count': int,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
# tests uploader field
|
||||||
|
'url': 'https://vid.me/4Iib',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '4Iib',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'The Carver',
|
||||||
|
'description': 'md5:e9c24870018ae8113be936645b93ba3c',
|
||||||
|
'duration': 97.859999999999999,
|
||||||
|
'timestamp': 1433203629,
|
||||||
|
'upload_date': '20150602',
|
||||||
|
'uploader': 'Thomas',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg',
|
||||||
|
'view_count': int,
|
||||||
|
'like_count': int,
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
# From http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching
|
# From http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching
|
||||||
|
@ -40,17 +61,23 @@ class VidmeIE(InfoExtractor):
|
||||||
title = self._og_search_title(webpage)
|
title = self._og_search_title(webpage)
|
||||||
description = self._og_search_description(webpage, default='')
|
description = self._og_search_description(webpage, default='')
|
||||||
thumbnail = self._og_search_thumbnail(webpage)
|
thumbnail = self._og_search_thumbnail(webpage)
|
||||||
timestamp = int_or_none(self._og_search_property('updated_time', webpage, fatal=False))
|
timestamp = int_or_none(self._og_search_property(
|
||||||
width = int_or_none(self._og_search_property('video:width', webpage, fatal=False))
|
'updated_time', webpage, fatal=False))
|
||||||
height = int_or_none(self._og_search_property('video:height', webpage, fatal=False))
|
width = int_or_none(self._og_search_property(
|
||||||
|
'video:width', webpage, fatal=False))
|
||||||
|
height = int_or_none(self._og_search_property(
|
||||||
|
'video:height', webpage, fatal=False))
|
||||||
duration = float_or_none(self._html_search_regex(
|
duration = float_or_none(self._html_search_regex(
|
||||||
r'data-duration="([^"]+)"', webpage, 'duration', fatal=False))
|
r'data-duration="([^"]+)"', webpage, 'duration', fatal=False))
|
||||||
view_count = str_to_int(self._html_search_regex(
|
view_count = str_to_int(self._html_search_regex(
|
||||||
r'<(?:li|span) class="video_views">\s*([\d,\.]+)\s*plays?', webpage, 'view count', fatal=False))
|
r'<(?:li|span) class="video_views">\s*([\d,\.]+)\s*plays?',
|
||||||
|
webpage, 'view count', fatal=False))
|
||||||
like_count = str_to_int(self._html_search_regex(
|
like_count = str_to_int(self._html_search_regex(
|
||||||
r'class="score js-video-vote-score"[^>]+data-score="([\d,\.\s]+)">',
|
r'class="score js-video-vote-score"[^>]+data-score="([\d,\.\s]+)">',
|
||||||
webpage, 'like count', fatal=False))
|
webpage, 'like count', fatal=False))
|
||||||
uploader = self._html_search_regex('class="video_author_username">([^<]+)', webpage, 'uploader', fatal=False)
|
uploader = self._html_search_regex(
|
||||||
|
'class="video_author_username"[^>]*>([^<]+)',
|
||||||
|
webpage, 'uploader', default=None)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
Loading…
Reference in a new issue