From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 28 Aug 2013 10:04:44 +0000 (+0200)
Subject: [generic] Fix URL concatenation
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ae3531adf926998d42d1fb52453491c85e33b5f0;p=youtube-dl

[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.
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index d034a11bb..bfc9bff49 100644
--- 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: