projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d236b37
)
[imgur] improve error check for non-video URLs
author
John Boehr
<jbboehr@gmail.com>
Thu, 19 Feb 2015 03:47:54 +0000
(19:47 -0800)
committer
John Boehr
<jbboehr@gmail.com>
Thu, 19 Feb 2015 03:47:54 +0000
(19:47 -0800)
youtube_dl/extractor/imgur.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/imgur.py
b/youtube_dl/extractor/imgur.py
index 38c9617731cf1b1a708939e46009b0bdba88774d..7937a5c819bf7be8eeda523dfcafc1b51f02e987 100644
(file)
--- a/
youtube_dl/extractor/imgur.py
+++ b/
youtube_dl/extractor/imgur.py
@@
-5,6
+5,7
@@
import re
from .common import InfoExtractor
from ..utils import (
int_or_none,
from .common import InfoExtractor
from ..utils import (
int_or_none,
+ str_or_none,
js_to_json,
mimetype2ext,
ExtractorError,
js_to_json,
mimetype2ext,
ExtractorError,
@@
-35,11
+36,6
@@
class ImgurIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- sources = re.findall(r'<source src="([^"]+)" type="([^"]+)"', webpage)
- if not sources:
- raise ExtractorError(
- 'No sources found for video %s' % video_id, expected=True)
-
width = int_or_none(self._search_regex(
r'<param name="width" value="([0-9]+)"',
webpage, 'width', fatal=False))
width = int_or_none(self._search_regex(
r'<param name="width" value="([0-9]+)"',
webpage, 'width', fatal=False))
@@
-47,10
+43,13
@@
class ImgurIE(InfoExtractor):
r'<param name="height" value="([0-9]+)"',
webpage, 'height', fatal=False))
r'<param name="height" value="([0-9]+)"',
webpage, 'height', fatal=False))
- formats = []
- video_elements = self._search_regex(
+ video_elements = str_or_none(self._search_regex(
r'(?s)<div class="video-elements">(.*?)</div>',
r'(?s)<div class="video-elements">(.*?)</div>',
- webpage, 'video elements')
+ webpage, 'video elements', fatal=False))
+ if not video_elements:
+ raise ExtractorError(
+ 'No sources found for video %s' % video_id, expected=True)
+
formats = []
for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements):
formats.append({
formats = []
for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements):
formats.append({