Browse Source

[dropbox] PEP8 and simplify (#2171)

totalwebcasting
Philipp Hagemeister 11 years ago
parent
commit
ce4e242a6f
1 changed files with 17 additions and 19 deletions
  1. +17
    -19
      youtube_dl/extractor/dropbox.py

+ 17
- 19
youtube_dl/extractor/dropbox.py View File

@ -5,28 +5,26 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
class DropboxIE(InfoExtractor): class DropboxIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)' _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)'
_TEST = { _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/mcnzehi9wo55th4/20131219_085616.mp4',
'file': 'mcnzehi9wo55th4.mp4',
'md5': '2cec58eb277054eca0dbaaf3bdc72564',
'info_dict': {
'title': '20131219_085616'
} }
} }
def _real_extract(self,url):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, 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
}
video_id = mobj.group('id')
title = mobj.group('title')
video_url = url + '?dl=1'
return {
'id': video_id,
'title': title,
'url': video_url,
}

Loading…
Cancel
Save