projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc6943e
)
Changes suggested by @phihag
author
Pierre Rudloff
<contact@rudloff.pro>
Thu, 3 Oct 2013 23:04:38 +0000
(
01:04
+0200)
committer
Pierre Rudloff
<contact@rudloff.pro>
Thu, 3 Oct 2013 23:04:38 +0000
(
01:04
+0200)
youtube_dl/extractor/websurg.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/websurg.py
b/youtube_dl/extractor/websurg.py
index efc8029af794eed63218b6ac4d29a911d06c6a52..849334aa0d783947eeed08475beffa35ecc49c43 100644
(file)
--- a/
youtube_dl/extractor/websurg.py
+++ b/
youtube_dl/extractor/websurg.py
@@
-36,21
+36,21
@@
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()
- def _real_extract(self, url):
-
- request = compat_urllib_request.Request(url)
- webpage = unicode(
- compat_urllib_request.urlopen(request).read(), 'utf-8')
+ if webpage != 'OK':
+ self._downloader.report_error(
+ u'Unable to log in: bad username/password')
+ def _real_extract(self, url):
video_id = re.match(self._VALID_URL, url).group(1)
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)
url_info = re.search(r'streamer="(.*?)" src="(.*?)"', webpage)
- if url_info is None:
- self._downloader.report_warning(
- u'Unable to log in: bad username/password')
- return
return {'id': video_id,
'title': self._og_search_title(webpage),
'description': self._og_search_description(webpage),
return {'id': video_id,
'title': self._og_search_title(webpage),
'description': self._og_search_description(webpage),