Merge remote-tracking branch 'sahutd/master'
This commit is contained in:
		@@ -47,6 +47,7 @@ from .depositfiles import DepositFilesIE
 | 
			
		||||
from .dotsub import DotsubIE
 | 
			
		||||
from .dreisat import DreiSatIE
 | 
			
		||||
from .defense import DefenseGouvFrIE
 | 
			
		||||
from .dropbox import DropboxIE
 | 
			
		||||
from .ebaumsworld import EbaumsWorldIE
 | 
			
		||||
from .ehow import EHowIE
 | 
			
		||||
from .eighttracks import EightTracksIE
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										32
									
								
								youtube_dl/extractor/dropbox.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								youtube_dl/extractor/dropbox.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
# coding: utf-8
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
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>[^?#]*)'
 | 
			
		||||
    _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'
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
    
 | 
			
		||||
    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
 | 
			
		||||
               
 | 
			
		||||
               }
 | 
			
		||||
        
 | 
			
		||||
		Reference in New Issue
	
	Block a user