From 91b21b2334a3f8ba54a2b5c5fe4322c46565b9f6 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Fri, 3 Jul 2015 11:53:37 +0800 Subject: [infoq] Fix extraction (closes #6141) --- youtube_dl/extractor/infoq.py | 5 +++-- 1 file 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) -- cgit v1.2.3