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 #1956 from dstftw/master
[youtube-dl]
/
youtube_dl
/
extractor
/
websurg.py
diff --git
a/youtube_dl/extractor/websurg.py
b/youtube_dl/extractor/websurg.py
index 849334aa0d783947eeed08475beffa35ecc49c43..43953bfdd566c2a17b58c124f92ad7dab5c2312b 100644
(file)
--- a/
youtube_dl/extractor/websurg.py
+++ b/
youtube_dl/extractor/websurg.py
@@
-18,7
+18,8
@@
class WeBSurgIE(InfoExtractor):
u'file': u'vd01en4012.mp4',
u'params': {
u'skip_download': True,
u'file': u'vd01en4012.mp4',
u'params': {
u'skip_download': True,
- }
+ },
+ u'skip': u'Requires login information',
}
_LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1'
}
_LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1'
@@
-36,8
+37,7
@@
class WeBSurgIE(InfoExtractor):
request.add_header(
'Content-Type', 'application/x-www-form-urlencoded;charset=utf-8')
compat_urllib_request.urlopen(request).info()
request.add_header(
'Content-Type', 'application/x-www-form-urlencoded;charset=utf-8')
compat_urllib_request.urlopen(request).info()
- request = compat_urllib_request.Request(self._LOGIN_URL)
- webpage = compat_urllib_request.urlopen(request).read()
+ webpage = self._download_webpage(self._LOGIN_URL, '', 'Logging in')
if webpage != 'OK':
self._downloader.report_error(
if webpage != 'OK':
self._downloader.report_error(
@@
-46,7
+46,6
@@
class WeBSurgIE(InfoExtractor):
def _real_extract(self, url):
video_id = re.match(self._VALID_URL, url).group(1)
def _real_extract(self, url):
video_id = re.match(self._VALID_URL, url).group(1)
- request = compat_urllib_request.Request(url)
webpage = self._download_webpage(url, video_id)
url_info = re.search(r'streamer="(.*?)" src="(.*?)"', webpage)
webpage = self._download_webpage(url, video_id)
url_info = re.search(r'streamer="(.*?)" src="(.*?)"', webpage)