Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[dropbox] Make sure ?dl=0 is ignore (Fixes #3605)

Browse source
This commit is contained in:
Philipp Hagemeister 2014-08-28 14:00:55 +02:00
parent 753727cded
commit b94744d157
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/dropbox.py
View file

@ -11,8 +11,7 @@ from ..utils import compat_urllib_parse_unquote
class DropboxIE(InfoExtractor): class DropboxIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)' _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)'
_TEST = { _TEST = {
'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4', 'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
'md5': '8a3d905427a6951ccb9eb292f154530b',
'info_dict': { 'info_dict': {
'id': 'nelirfsxnmcfbfh', 'id': 'nelirfsxnmcfbfh',
'ext': 'mp4', 'ext': 'mp4',
@ -25,7 +24,9 @@ class DropboxIE(InfoExtractor):
video_id = mobj.group('id') video_id = mobj.group('id')
fn = compat_urllib_parse_unquote(mobj.group('title')) fn = compat_urllib_parse_unquote(mobj.group('title'))
title = os.path.splitext(fn)[0] title = os.path.splitext(fn)[0]
video_url = url + '?dl=1' video_url = (
re.sub(r'[?&]dl=0', '', url) +
('?' if '?' in url else '&') + 'dl=1')
return { return {
'id': video_id, 'id': video_id,