youtube-dl

commit ae3531adf926998d42d1fb52453491c85e33b5f0
parent 8cf5ee7831095a37ca5d223cca9e177f8768b84e
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Wed, 28 Aug 2013 12:04:44 +0200

[generic] Fix URL concatenation

When the url is something like http://example.org/foo/bar?x=y  and the added is file/video.mp4 , we want http://example.org/foo/file/video.mp4
Fixes #1268.

Diffstat:
M
youtube_dl/extractor/generic.py
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
@@ -166,7 +166,12 @@ class GenericIE(InfoExtractor):
         if video_url.startswith('//'):
             video_url = compat_urllib_parse_urlparse(url).scheme + ':' + video_url
         if '://' not in video_url:
-            video_url = url + ('' if url.endswith('/') else '/') + video_url
+            up = compat_urllib_parse_urlparse(url)
+            if video_url.startswith('/'):
+                video_url = up.scheme + '://' + up.netloc + video_url
+            else:  # relative path
+                video_url = (up.scheme + '://' + up.netloc +
+                             up.path.rpartition('/')[0] + '/' + video_url)
         video_id = os.path.basename(video_url)
 
         # here's a fun little line of code for you: