aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-07-03 11:53:37 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-07-03 11:54:36 +0800
commit91b21b2334a3f8ba54a2b5c5fe4322c46565b9f6 (patch)
tree0cd559eca1122bf9d2fc40fe8cdae3c68e1a91bf
parent66e568de3b7ed73fd379b941f35ce2b3c7ad9664 (diff)
downloadyoutube-dl-91b21b2334a3f8ba54a2b5c5fe4322c46565b9f6.tar.xz
[infoq] Fix extraction (closes #6141)
-rw-r--r--youtube_dl/extractor/infoq.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/infoq.py b/youtube_dl/extractor/infoq.py
index 117a7faf6..91a1b3ccb 100644
--- a/youtube_dl/extractor/infoq.py
+++ b/youtube_dl/extractor/infoq.py
@@ -5,6 +5,7 @@ import base64
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse,
+ compat_urlparse,
)
@@ -45,7 +46,7 @@ class InfoQIE(InfoExtractor):
video_id, extension = video_filename.split('.')
http_base = self._search_regex(
- r'EXPRESSINSTALL_SWF\s*=\s*"(https?://[^/"]+/)', webpage,
+ r'EXPRESSINSTALL_SWF\s*=\s*[^"]*"((?:https?:)?//[^/"]+/)', webpage,
'HTTP base URL')
formats = [{
@@ -55,7 +56,7 @@ class InfoQIE(InfoExtractor):
'play_path': playpath,
}, {
'format_id': 'http',
- 'url': http_base + real_id,
+ 'url': compat_urlparse.urljoin(url, http_base) + real_id,
}]
self._sort_formats(formats)