depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-01 22:47:59 +00:00
Code Issues Releases Wiki Activity

[generic] Fix URL concatenation

Browse source 
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.
This commit is contained in:
Philipp Hagemeister 2013-08-28 12:04:44 +02:00
parent 8cf5ee7831
commit ae3531adf9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/generic.py
View file

@ -166,7 +166,12 @@ class GenericIE(InfoExtractor):
if video_url.startswith('//'): if video_url.startswith('//'):
video_url = compat_urllib_parse_urlparse(url).scheme + ':' + video_url video_url = compat_urllib_parse_urlparse(url).scheme + ':' + video_url
if '://' not in 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) video_id = os.path.basename(video_url)
# here's a fun little line of code for you: # here's a fun little line of code for you: