projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[util] Move compatibility functions out of util
[youtube-dl]
/
youtube_dl
/
extractor
/
dropbox.py
diff --git
a/youtube_dl/extractor/dropbox.py
b/youtube_dl/extractor/dropbox.py
index 1e1763abf79b833ddc8e982d7a9acbbd080785a7..aefca848a25a7c4c10a0a821bf3454efbe6c1117 100644
(file)
--- a/
youtube_dl/extractor/dropbox.py
+++ b/
youtube_dl/extractor/dropbox.py
@@
-5,28
+5,33
@@
import os.path
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import compat_urllib_parse_unquote
+from ..compat import compat_urllib_parse_unquote
+from ..utils import url_basename
class DropboxIE(InfoExtractor):
class DropboxIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s
/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)
'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s
h?/(?P<id>[a-zA-Z0-9]{15})/.*
'
+ _TEST
S = [
{
'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
'info_dict': {
'id': 'nelirfsxnmcfbfh',
'ext': 'mp4',
'title': 'youtube-dl test video \'ä"BaW_jenozKc'
}
'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
'info_dict': {
'id': 'nelirfsxnmcfbfh',
'ext': 'mp4',
'title': 'youtube-dl test video \'ä"BaW_jenozKc'
}
- }
+ },
+ {
+ 'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
+ 'only_matching': True,
+ },
+ ]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- fn = compat_urllib_parse_unquote(
mobj.group('title'
))
+ fn = compat_urllib_parse_unquote(
url_basename(url
))
title = os.path.splitext(fn)[0]
title = os.path.splitext(fn)[0]
- video_url = (
- re.sub(r'[?&]dl=0', '', url) +
- ('?' if '?' in url else '&') + 'dl=1')
+ video_url = re.sub(r'[?&]dl=0', '', url)
+ video_url += ('?' if '?' not in video_url else '&') + 'dl=1'
return {
'id': video_id,
return {
'id': video_id,