aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/__init__.py2
-rw-r--r--youtube_dl/extractor/dropbox.py19
2 files changed, 10 insertions, 11 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 81c06b586..5605e917b 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -47,7 +47,7 @@ from .depositfiles import DepositFilesIE
from .dotsub import DotsubIE
from .dreisat import DreiSatIE
from .defense import DefenseGouvFrIE
-from .dropbox import DropBoxIE
+from .dropbox import DropboxIE
from .ebaumsworld import EbaumsWorldIE
from .ehow import EHowIE
from .eighttracks import EightTracksIE
diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py
index 0df025cd3..e4d60d17a 100644
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dl/extractor/dropbox.py
@@ -5,13 +5,15 @@ import re
from .common import InfoExtractor
-class DropBoxIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?dropbox.com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>.*)'
+class DropboxIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)'
_TEST = {
- 'url': 'https://www.dropbox.com/s/mcnzehi9wo55th4/20131219_085616.mp4',
- 'file': '20131219_085616.mp4',
- 'md5': '2cec58eb277054eca0dbaaf3bdc72564',
-
+ u'url': u'https://www.dropbox.com/s/mcnzehi9wo55th4/20131219_085616.mp4',
+ u'file': u'mcnzehi9wo55th4.mp4',
+ u'md5': u'2cec58eb277054eca0dbaaf3bdc72564',
+ u'info_dict': {
+ u'title': '20131219_085616'
+ }
}
@@ -24,10 +26,7 @@ class DropBoxIE(InfoExtractor):
return{
'id':video_id,
'title':title,
- 'formats': [{
- 'url': video_url,
- 'vcodec': 'none',
- }]
+ 'url':video_url
}
\ No newline at end of file