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

[criterion] Rely on _match_id, improve regex and add thumbnail to test

Browse source
This commit is contained in:
Déstin Reed 2016-09-30 20:06:08 +02:00
parent 8f0cf20ab9
commit 9c51a24642
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
youtube_dl/extractor/criterion.py
View file

@ -1,8 +1,6 @@
# -*- coding: utf-8 -*- # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
@ -16,20 +14,20 @@ class CriterionIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Le Samouraï', 'title': 'Le Samouraï',
'description': 'md5:a2b4b116326558149bef81f76dcbb93f', 'description': 'md5:a2b4b116326558149bef81f76dcbb93f',
'thumbnail': 're:^https?://.*\.jpg$',
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
final_url = self._search_regex( final_url = self._search_regex(
r'so.addVariable\("videoURL", "(.+?)"\)\;', webpage, 'video url') r'so\.addVariable\("videoURL", "(.+?)"\)\;', webpage, 'video url')
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
description = self._html_search_meta('description', webpage) description = self._html_search_meta('description', webpage)
thumbnail = self._search_regex( thumbnail = self._search_regex(
r'so.addVariable\("thumbnailURL", "(.+?)"\)\;', r'so\.addVariable\("thumbnailURL", "(.+?)"\)\;',
webpage, 'thumbnail url') webpage, 'thumbnail url')
return { return {