projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ndr:embed:base] Add missing ext for m3u8
[youtube-dl]
/
youtube_dl
/
extractor
/
spankwire.py
diff --git
a/youtube_dl/extractor/spankwire.py
b/youtube_dl/extractor/spankwire.py
index 609f78294bdbe3dbf50aed9cf86a4a079164b76d..692fd78e886c0a6a932adce4659f2564beeab7e6 100644
(file)
--- a/
youtube_dl/extractor/spankwire.py
+++ b/
youtube_dl/extractor/spankwire.py
@@
-6,9
+6,9
@@
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse_unquote,
compat_urllib_parse_urlparse,
from ..compat import (
compat_urllib_parse_unquote,
compat_urllib_parse_urlparse,
- compat_urllib_request,
)
from ..utils import (
)
from ..utils import (
+ sanitized_Request,
str_to_int,
unified_strdate,
)
str_to_int,
unified_strdate,
)
@@
-51,7
+51,7
@@
class SpankwireIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- req =
compat_urllib_request.
Request('http://www.' + mobj.group('url'))
+ req =
sanitized_
Request('http://www.' + mobj.group('url'))
req.add_header('Cookie', 'age_verified=1')
webpage = self._download_webpage(req, video_id)
req.add_header('Cookie', 'age_verified=1')
webpage = self._download_webpage(req, video_id)
@@
-68,7
+68,7
@@
class SpankwireIE(InfoExtractor):
r'by:\s*<a [^>]*>(.+?)</a>',
webpage, 'uploader', fatal=False)
uploader_id = self._html_search_regex(
r'by:\s*<a [^>]*>(.+?)</a>',
webpage, 'uploader', fatal=False)
uploader_id = self._html_search_regex(
- r'by:\s*<a href="/
user/viewProfile
\?.*?UserId=(\d+).*?"',
+ r'by:\s*<a href="/
(?:user/viewProfile|Profile\.aspx)
\?.*?UserId=(\d+).*?"',
webpage, 'uploader id', fatal=False)
upload_date = unified_strdate(self._html_search_regex(
r'</a> on (.+?) at \d+:\d+',
webpage, 'uploader id', fatal=False)
upload_date = unified_strdate(self._html_search_regex(
r'</a> on (.+?) at \d+:\d+',