X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdropbox.py;h=d74981eead1db6cf8b41b4473c36d7a736169c5e;hb=924f47f7b6d08f5a93558d3239b6bf94c71dc245;hp=0df025cd33b56465cd10576feaf84b73cd757bf8;hpb=8da531359e8dc5299b438195ac75c30100ae05df;p=youtube-dl.git

diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py
index 0df025cd3..d74981eea 100644
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dl/extractor/dropbox.py
@@ -1,33 +1,31 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import os.path
 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',
-        
+        'file': 'mcnzehi9wo55th4.mp4',
+        'md5': 'f6d65b1b326e82fd7ab7720bea3dacae',
+        'info_dict': {
+            'title': '20131219_085616'
+        }
     }
-    
-    
-    def _real_extract(self,url):
+
+    def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        video_id=mobj.group('id')
-        title=mobj.group('title')
-        webpage = self._download_webpage(url, video_id)
-        video_url=url+'?dl=1'
-        return{
-               'id':video_id,
-               'title':title,
-               'formats': [{
-                            'url': video_url,
-                            'vcodec': 'none',
-                          }]
-               
-               }
-        
\ No newline at end of file
+        video_id = mobj.group('id')
+        title = os.path.splitext(mobj.group('title'))[0]
+        video_url = url + '?dl=1'
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': video_url,
+        }