aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-09-05 18:02:17 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-09-05 18:02:17 +0200
commit08e291b54d8aaa34300c02e70ff86aaa36820a62 (patch)
tree21b9e56d24adb93ab689e3edf830c30e007363a0 /youtube_dl
parent6b95b065be2ac6d1089968a673e3f142157f111f (diff)
downloadyoutube-dl-08e291b54d8aaa34300c02e70ff86aaa36820a62.zip
youtube-dl-08e291b54d8aaa34300c02e70ff86aaa36820a62.tar.gz
youtube-dl-08e291b54d8aaa34300c02e70ff86aaa36820a62.tar.bz2
[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote the url when extracting the id (fixes #1372)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index dc4dea4..de7379a 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -153,7 +153,7 @@ class GenericIE(InfoExtractor):
mobj = re.search(r'<meta.*?property="og:video".*?content="(.*?)"', webpage)
if mobj is None:
# HTML5 video
- mobj = re.search(r'<video[^<]*>.*?<source .*?src="([^"]+)"', webpage, flags=re.DOTALL)
+ mobj = re.search(r'<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage, flags=re.DOTALL)
if mobj is None:
raise ExtractorError(u'Invalid URL: %s' % url)
@@ -162,9 +162,9 @@ class GenericIE(InfoExtractor):
if mobj.group(1) is None:
raise ExtractorError(u'Invalid URL: %s' % url)
- video_url = compat_urllib_parse.unquote(mobj.group(1))
+ video_url = mobj.group(1)
video_url = compat_urlparse.urljoin(url, video_url)
- video_id = os.path.basename(video_url)
+ video_id = compat_urllib_parse.unquote(os.path.basename(video_url))
# here's a fun little line of code for you:
video_extension = os.path.splitext(video_id)[1][1:]