diff options
author | Philipp Hagemeister <[email protected]> | 2014-01-19 06:12:20 +0100 |
---|---|---|
committer | Philipp Hagemeister <[email protected]> | 2014-01-19 06:12:20 +0100 |
commit | b27bec212faa0e0d17faa09ee3b88919397abd55 (patch) | |
tree | edf50d1ec31cf87529190847ebf2dc189e72567e | |
parent | dfa50793d8541ff2c5603f7c3b727c0f6e551d8d (diff) | |
parent | 704519c7e386037eeda1ba727e0d31558be4d3dc (diff) | |
download | youtube-dl-b27bec212faa0e0d17faa09ee3b88919397abd55.tar.gz youtube-dl-b27bec212faa0e0d17faa09ee3b88919397abd55.zip |
Merge remote-tracking branch 'sahutd/master'
-rw-r--r-- | youtube_dl/extractor/__init__.py | 1 | ||||
-rw-r--r-- | youtube_dl/extractor/dropbox.py | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index d66f7b026..5605e917b 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -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 diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dl/extractor/dropbox.py new file mode 100644 index 000000000..e4d60d17a --- /dev/null +++ b/youtube_dl/extractor/dropbox.py @@ -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 + + } +
\ No newline at end of file |