projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] add mimetypes to determine manifest ext(m3u8, f4m, mpd)
[youtube-dl]
/
youtube_dl
/
extractor
/
dumpert.py
diff --git
a/youtube_dl/extractor/dumpert.py
b/youtube_dl/extractor/dumpert.py
index 999fb5620df2976073122fb95fbad1bb133f357a..e5aadcd25ccccb6f9838d0bd1417edc2fbe3bd0f 100644
(file)
--- a/
youtube_dl/extractor/dumpert.py
+++ b/
youtube_dl/extractor/dumpert.py
@@
-2,15
+2,18
@@
from __future__ import unicode_literals
import base64
from __future__ import unicode_literals
import base64
+import re
from .common import InfoExtractor
from .common import InfoExtractor
-from ..compat import compat_urllib_request
-from ..utils import qualities
+from ..utils import (
+ qualities,
+ sanitized_Request,
+)
class DumpertIE(InfoExtractor):
class DumpertIE(InfoExtractor):
- _VALID_URL = r'
https?://(?:www\.)?dumpert\.nl/mediabase
/(?P<id>[0-9]+/[0-9a-zA-Z]+)'
- _TEST
=
{
+ _VALID_URL = r'
(?P<protocol>https?)://(?:www\.)?dumpert\.nl/(?:mediabase|embed)
/(?P<id>[0-9]+/[0-9a-zA-Z]+)'
+ _TEST
S = [
{
'url': 'http://www.dumpert.nl/mediabase/6646981/951bc60f/',
'md5': '1b9318d7d5054e7dcb9dc7654f21d643',
'info_dict': {
'url': 'http://www.dumpert.nl/mediabase/6646981/951bc60f/',
'md5': '1b9318d7d5054e7dcb9dc7654f21d643',
'info_dict': {
@@
-20,12
+23,18
@@
class DumpertIE(InfoExtractor):
'description': 'Niet schrikken hoor',
'thumbnail': 're:^https?://.*\.jpg$',
}
'description': 'Niet schrikken hoor',
'thumbnail': 're:^https?://.*\.jpg$',
}
- }
+ }, {
+ 'url': 'http://www.dumpert.nl/embed/6675421/dc440fe7/',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
def _real_extract(self, url):
- video_id = self._match_id(url)
+ mobj = re.match(self._VALID_URL, url)
+ video_id = mobj.group('id')
+ protocol = mobj.group('protocol')
- req = compat_urllib_request.Request(url)
+ url = '%s://www.dumpert.nl/mediabase/%s' % (protocol, video_id)
+ req = sanitized_Request(url)
req.add_header('Cookie', 'nsfw=1; cpc=10')
webpage = self._download_webpage(req, video_id)
req.add_header('Cookie', 'nsfw=1; cpc=10')
webpage = self._download_webpage(req, video_id)