Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-08 09:10:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[teachertube] Fix and relax thumbnail extraction (closes #15403)

Browse Source
This commit is contained in:
Sergey M․ 2018-01-24 22:41:25 +07:00
parent 967ebbdb6c
commit 837b061710
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/teachertube.py
View File

@ -17,6 +17,7 @@ class TeacherTubeIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?teachertube\.com/(viewVideo\.php\?video_id=|music\.php\?music_id=|video/(?:[\da-z-]+-)?|audio/)(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?teachertube\.com/(viewVideo\.php\?video_id=|music\.php\?music_id=|video/(?:[\da-z-]+-)?|audio/)(?P<id>\d+)'
_TESTS = [{ _TESTS = [{
# flowplayer
'url': 'http://www.teachertube.com/viewVideo.php?video_id=339997', 'url': 'http://www.teachertube.com/viewVideo.php?video_id=339997',
'md5': 'f9434ef992fd65936d72999951ee254c', 'md5': 'f9434ef992fd65936d72999951ee254c',
'info_dict': { 'info_dict': {
@ -24,19 +25,10 @@ class TeacherTubeIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Measures of dispersion from a frequency table', 'title': 'Measures of dispersion from a frequency table',
'description': 'Measures of dispersion from a frequency table', 'description': 'Measures of dispersion from a frequency table',
'thumbnail': r're:http://.*\.jpg', 'thumbnail': r're:https?://.*\.(?:jpg|png)',
},
}, {
'url': 'http://www.teachertube.com/viewVideo.php?video_id=340064',
'md5': '0d625ec6bc9bf50f70170942ad580676',
'info_dict': {
'id': '340064',
'ext': 'mp4',
'title': 'How to Make Paper Dolls _ Paper Art Projects',
'description': 'Learn how to make paper dolls in this simple',
'thumbnail': r're:http://.*\.jpg',
}, },
}, { }, {
# jwplayer
'url': 'http://www.teachertube.com/music.php?music_id=8805', 'url': 'http://www.teachertube.com/music.php?music_id=8805',
'md5': '01e8352006c65757caf7b961f6050e21', 'md5': '01e8352006c65757caf7b961f6050e21',
'info_dict': { 'info_dict': {
@ -46,14 +38,9 @@ class TeacherTubeIE(InfoExtractor):
'description': 'RADIJSKA EMISIJA ZRAKOPLOVNE TEHNI?KE ?KOLE P', 'description': 'RADIJSKA EMISIJA ZRAKOPLOVNE TEHNI?KE ?KOLE P',
}, },
}, { }, {
# unavailable video
'url': 'http://www.teachertube.com/video/intro-video-schleicher-297790', 'url': 'http://www.teachertube.com/video/intro-video-schleicher-297790',
'md5': '9c79fbb2dd7154823996fc28d4a26998', 'only_matching': True,
'info_dict': {
'id': '297790',
'ext': 'mp4',
'title': 'Intro Video - Schleicher',
'description': 'Intro Video - Why to flip, how flipping will',
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -84,12 +71,16 @@ def _real_extract(self, url):
self._sort_formats(formats) self._sort_formats(formats)
thumbnail = self._og_search_thumbnail(
webpage, default=None) or self._html_search_meta(
'thumbnail', webpage)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'thumbnail': self._html_search_regex(r'\'image\'\s*:\s*["\']([^"\']+)["\']', webpage, 'thumbnail'),
'formats': formats,
'description': description, 'description': description,
'thumbnail': thumbnail,
'formats': formats,
} }