w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[imgur] Simplify

Browse source
This commit is contained in:
Philipp Hagemeister 2015-02-19 05:53:09 +01:00
parent b74d505577
commit b88ba05356
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/imgur.py
View file

@ -5,12 +5,12 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
str_or_none,
js_to_json, js_to_json,
mimetype2ext, mimetype2ext,
ExtractorError, ExtractorError,
) )
class ImgurIE(InfoExtractor): class ImgurIE(InfoExtractor):
_VALID_URL = r'https?://(?:i\.)?imgur\.com/(?P<id>[a-zA-Z0-9]+)(?:\.mp4|\.gifv)?' _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?P<id>[a-zA-Z0-9]+)(?:\.mp4|\.gifv)?'
@ -43,12 +43,13 @@ class ImgurIE(InfoExtractor):
r'<param name="height" value="([0-9]+)"', r'<param name="height" value="([0-9]+)"',
webpage, 'height', fatal=False)) webpage, 'height', fatal=False))
video_elements = str_or_none(self._search_regex( video_elements = self._search_regex(
r'(?s)<div class="video-elements">(.*?)</div>', r'(?s)<div class="video-elements">(.*?)</div>',
webpage, 'video elements', fatal=False)) webpage, 'video elements', default=None)
if not video_elements: if not video_elements:
raise ExtractorError( raise ExtractorError(
'No sources found for video %s' % video_id, expected=True) 'No sources found for video %s. Maybe an image?' % video_id,
expected=True)
formats = [] formats = []
for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements): for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements):