dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vrtnu] Add support for cookies authentication and simplify (#11873)

This commit is contained in:
Sergey M․ 2017-10-25 23:17:14 +07:00
parent 7913e0fca7
commit b8c6ffc518
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
youtube_dl/extractor/canvas.py
View File

@ -5,8 +5,6 @@ import json
from .common import InfoExtractor from .common import InfoExtractor
from .gigya import GigyaBaseIE from .gigya import GigyaBaseIE
from ..compat import compat_HTTPError from ..compat import compat_HTTPError
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
@ -192,7 +190,7 @@ class VrtNUIE(GigyaBaseIE):
'season_number': 1, 'season_number': 1,
'episode_number': 1, 'episode_number': 1,
}, },
# 'skip': 'This video is only available for registered users' 'skip': 'This video is only available for registered users'
}] }]
_NETRC_MACHINE = 'vrtnu' _NETRC_MACHINE = 'vrtnu'
_APIKEY = '3_0Z2HujMtiWq_pkAjgnS2Md2E11a1AwZjYiBETtwNE-EoEHDINgtnvcAOpNgmrVGy' _APIKEY = '3_0Z2HujMtiWq_pkAjgnS2Md2E11a1AwZjYiBETtwNE-EoEHDINgtnvcAOpNgmrVGy'
@ -204,7 +202,7 @@ class VrtNUIE(GigyaBaseIE):
def _login(self): def _login(self):
username, password = self._get_login_info() username, password = self._get_login_info()
if username is None: if username is None:
self.raise_login_required() return
auth_data = { auth_data = {
'APIKey': self._APIKEY, 'APIKey': self._APIKEY,
@ -281,15 +279,21 @@ class VrtNUIE(GigyaBaseIE):
clean_url = url.split('?')[0].split('#')[0].strip('/') clean_url = url.split('?')[0].split('#')[0].strip('/')
securevideo_url = clean_url + '.mssecurevideo.json' securevideo_url = clean_url + '.mssecurevideo.json'
json = self._download_json(securevideo_url, display_id) try:
video = self._download_json(securevideo_url, display_id)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
self.raise_login_required()
raise
# We are dealing with a '../<show>.relevant' URL # We are dealing with a '../<show>.relevant' URL
redirect_url = json.get('url') redirect_url = video.get('url')
if redirect_url: if redirect_url:
return self.url_result('https:' + redirect_url) return self.url_result(self._proto_relative_url(redirect_url, 'https:'))
else:
# There is only one entry, but with an unknown key, so just get # There is only one entry, but with an unknown key, so just get
# the first one # the first one
video_id = list(json.values())[0].get('videoid') video_id = list(video.values())[0].get('videoid')
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',