[downloader/dash] Improve 'combine_url' (fixes #6341)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 23 Jul 2015 10:09:30 +0000 (12:09 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 23 Jul 2015 10:09:30 +0000 (12:09 +0200)
In some videos the base_url already ends with '/'.

youtube_dl/downloader/dash.py

index a4685d307fa3b0cc1357f08c4a1398b7f251c3fe..8b6fa2753adbafcb1a0ab26788dcec2be5903638 100644 (file)
@@ -37,7 +37,7 @@ class DashSegmentsFD(FileDownloader):
         def combine_url(base_url, target_url):
             if re.match(r'^https?://', target_url):
                 return target_url
-            return '%s/%s' % (base_url, target_url)
+            return '%s%s%s' % (base_url, '' if base_url.endswith('/') else '/', target_url)
 
         with open(tmpfilename, 'wb') as outf:
             append_url_to_file(