mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-11 03:51:20 +00:00
Fix support for NPO downloads
This commit is contained in:
parent
6fece0a96b
commit
3b31478dfd
1 changed files with 14 additions and 6 deletions
|
@ -1,6 +1,8 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
import urllib.parse
|
||||||
|
from http.cookies import SimpleCookie
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import (
|
from ..compat import (
|
||||||
|
@ -184,22 +186,28 @@ class NPOIE(NPOBaseIE):
|
||||||
return self._get_info(url, video_id) or self._get_old_info(video_id)
|
return self._get_info(url, video_id) or self._get_old_info(video_id)
|
||||||
|
|
||||||
def _get_info(self, url, video_id):
|
def _get_info(self, url, video_id):
|
||||||
token = self._download_json(
|
_, xsrf_token_response = self._download_webpage_handle(
|
||||||
'https://www.npostart.nl/api/token', video_id,
|
'https://www.npostart.nl/api/token', video_id,
|
||||||
'Downloading token', headers={
|
'Downloading token', headers={
|
||||||
'Referer': url,
|
'Referer': url,
|
||||||
'X-Requested-With': 'XMLHttpRequest',
|
'X-Requested-With': 'XMLHttpRequest',
|
||||||
})['token']
|
})
|
||||||
|
cookies = SimpleCookie()
|
||||||
|
cookies.load(xsrf_token_response.headers['Set-Cookie'])
|
||||||
|
cookies = {k: v.value for k, v in cookies.items()}
|
||||||
|
xsrf_token = cookies['XSRF-TOKEN']
|
||||||
|
|
||||||
player = self._download_json(
|
player = self._download_json(
|
||||||
'https://www.npostart.nl/player/%s' % video_id, video_id,
|
'https://www.npostart.nl/player/%s' % video_id, video_id,
|
||||||
'Downloading player JSON', data=urlencode_postdata({
|
'Downloading player JSON',
|
||||||
|
headers={"x-xsrf-token": urllib.parse.unquote(xsrf_token)},
|
||||||
|
data=urlencode_postdata({
|
||||||
'autoplay': 0,
|
'autoplay': 0,
|
||||||
'share': 1,
|
'share': 1,
|
||||||
'pageUrl': url,
|
'pageUrl': url,
|
||||||
|
'isFavourite': "false",
|
||||||
'hasAdConsent': 0,
|
'hasAdConsent': 0,
|
||||||
'_token': token,
|
},))
|
||||||
}))
|
|
||||||
|
|
||||||
player_token = player['token']
|
player_token = player['token']
|
||||||
|
|
||||||
|
@ -215,7 +223,7 @@ class NPOIE(NPOBaseIE):
|
||||||
'quality': 'npo',
|
'quality': 'npo',
|
||||||
'tokenId': player_token,
|
'tokenId': player_token,
|
||||||
'streamType': 'broadcast',
|
'streamType': 'broadcast',
|
||||||
})
|
}, data=b"")
|
||||||
if not streams:
|
if not streams:
|
||||||
continue
|
continue
|
||||||
stream = streams.get('stream')
|
stream = streams.get('stream')
|
||||||
|
|
Loading…
Reference in a new issue