Merge remote-tracking branch 'sehrgut/Grooveshark'

[youtube-dl.git] / youtube_dl / extractor / dropbox.py

diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py
index e4d60d17af353a3e300c16185e740f15ad31b511..9f569aa932967910e12b46c0d0269557437d0c79 100644 (file)
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dl/extractor/dropbox.py
@@ -1,32 +1,34 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import os.path
 import re
 
 from .common import InfoExtractor
+from ..utils import compat_urllib_parse_unquote
+
 
 class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)'
     _TEST = {
-        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'
+        'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4',
+        'md5': '8a3d905427a6951ccb9eb292f154530b',
+        'info_dict': {
+            'id': 'nelirfsxnmcfbfh',
+            'ext': 'mp4',
+            'title': 'youtube-dl test video \'ä"BaW_jenozKc'
         }
     }
-    
-    
-    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,
-               'url':video_url
-               
-               }
-        
\ No newline at end of file
+        video_id = mobj.group('id')
+        fn = compat_urllib_parse_unquote(mobj.group('title'))
+        title = os.path.splitext(fn)[0]
+        video_url = url + '?dl=1'
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': video_url,
+        }