R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vier] Improve authentication logic

Browse Source 
* Authenticate only when required
* Support vijf.be in addition to vier.be
This commit is contained in:
mrBliss 2017-04-20 15:50:45 +02:00
parent 5283140a89
commit 02c411a9e6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/vier.py
View File

@ -49,16 +49,13 @@ class VierIE(InfoExtractor):
'only_matching': True, 'only_matching': True,
}] }]
def _real_initialize(self): def _login(self, site):
self._login()
def _login(self):
username, password = self._get_login_info() username, password = self._get_login_info()
if username is None: if username is None or password is None:
return self.raise_login_required()
self._request_webpage( self._request_webpage(
'http://www.vier.be/user/login', 'http://www.%s.be/user/login' % site,
None, note='Logging in', errnote='Could not log in', None, note='Logging in', errnote='Could not log in',
data=urlencode_postdata({ data=urlencode_postdata({
'form_id': 'user_login', 'form_id': 'user_login',
@ -75,6 +72,10 @@ class VierIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
if re.search(r'id="user-login"', webpage):
self._login(site)
webpage = self._download_webpage(url, display_id)
video_id = self._search_regex( video_id = self._search_regex(
[r'data-nid="(\d+)"', r'"nid"\s*:\s*"(\d+)"'], [r'data-nid="(\d+)"', r'"nid"\s*:\s*"(\d+)"'],
webpage, 'video id') webpage, 'video id')