projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7045 from remitamine/ign
[youtube-dl]
/
youtube_dl
/
extractor
/
dumpert.py
diff --git
a/youtube_dl/extractor/dumpert.py
b/youtube_dl/extractor/dumpert.py
index 1f00386feae15d00a4421b3166335c15f3b01aa9..e5aadcd25ccccb6f9838d0bd1417edc2fbe3bd0f 100644
(file)
--- a/
youtube_dl/extractor/dumpert.py
+++ b/
youtube_dl/extractor/dumpert.py
@@
-2,14
+2,17
@@
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|embed)/(?P<id>[0-9]+/[0-9a-zA-Z]+)'
+ _VALID_URL = r'
(?P<protocol>https?)
://(?:www\.)?dumpert\.nl/(?:mediabase|embed)/(?P<id>[0-9]+/[0-9a-zA-Z]+)'
_TESTS = [{
'url': 'http://www.dumpert.nl/mediabase/6646981/951bc60f/',
'md5': '1b9318d7d5054e7dcb9dc7654f21d643',
_TESTS = [{
'url': 'http://www.dumpert.nl/mediabase/6646981/951bc60f/',
'md5': '1b9318d7d5054e7dcb9dc7654f21d643',
@@
-26,10
+29,12
@@
class DumpertIE(InfoExtractor):
}]
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')
- url = '
https://www.dumpert.nl/mediabase/' + video_id
- 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)