about summary refs log tree commit diff
path: root/youtube_dl/extractor/dropbox.py
diff options
context:
space:
mode:
authorsahutd <sahutd@gmail.com>2014-01-19 10:20:26 +0530
committersahutd <sahutd@gmail.com>2014-01-19 10:20:26 +0530
commit6b79f40c3d37d33ac944241e205df8c5c4bbabca (patch)
tree9cdf63c6e5a0e2627caff62c3cde95127cdb2a6a /youtube_dl/extractor/dropbox.py
parent2a7c35dd46ad90872feb2ca1baf85f226624cc4c (diff)
downloadyoutube-dl-6b79f40c3d37d33ac944241e205df8c5c4bbabca.tar.gz
youtube-dl-6b79f40c3d37d33ac944241e205df8c5c4bbabca.tar.xz
youtube-dl-6b79f40c3d37d33ac944241e205df8c5c4bbabca.zip
Added support for Dropbox
Diffstat (limited to 'youtube_dl/extractor/dropbox.py')
-rw-r--r--youtube_dl/extractor/dropbox.py19
1 files changed, 9 insertions, 10 deletions
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