mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 00:16:48 +00:00
Refactor into reusable method
This commit is contained in:
parent
8b1a7d9a7c
commit
34b5b20107
@ -847,7 +847,7 @@ from .nowness import (
|
|||||||
NownessSeriesIE,
|
NownessSeriesIE,
|
||||||
)
|
)
|
||||||
from .noz import NozIE
|
from .noz import NozIE
|
||||||
from .npo import NPOIE
|
from .npo import BNNVaraIE, NPOIE
|
||||||
from .npr import NprIE
|
from .npr import NprIE
|
||||||
from .nrk import (
|
from .nrk import (
|
||||||
NRKIE,
|
NRKIE,
|
||||||
|
@ -13,7 +13,6 @@ class NPOIE(InfoExtractor):
|
|||||||
IE_DESC = 'npo.nl'
|
IE_DESC = 'npo.nl'
|
||||||
_VALID_URL = r'''(?x)
|
_VALID_URL = r'''(?x)
|
||||||
(?:
|
(?:
|
||||||
npo:|
|
|
||||||
https?://
|
https?://
|
||||||
(?:www\.)?
|
(?:www\.)?
|
||||||
(?:
|
(?:
|
||||||
@ -93,8 +92,19 @@ class NPOIE(InfoExtractor):
|
|||||||
if not product_id:
|
if not product_id:
|
||||||
raise ExtractorError('No productId found for slug: %s' % slug)
|
raise ExtractorError('No productId found for slug: %s' % slug)
|
||||||
|
|
||||||
token = self._get_token(product_id)
|
formats = self._download_by_product_id(product_id, slug, url)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'id': slug,
|
||||||
|
'formats': formats,
|
||||||
|
'title': title or slug,
|
||||||
|
'description': description,
|
||||||
|
'thumbnail': thumbnail,
|
||||||
|
# TODO fill in other metadata that's available
|
||||||
|
}
|
||||||
|
|
||||||
|
def _download_by_product_id(self, product_id, slug, url=None):
|
||||||
|
token = self._get_token(product_id)
|
||||||
formats = []
|
formats = []
|
||||||
for profile in (
|
for profile in (
|
||||||
'dash',
|
'dash',
|
||||||
@ -105,7 +115,7 @@ class NPOIE(InfoExtractor):
|
|||||||
data=json.dumps({
|
data=json.dumps({
|
||||||
'profileName': profile,
|
'profileName': profile,
|
||||||
'drmType': 'widevine',
|
'drmType': 'widevine',
|
||||||
'referrerUrl': url,
|
'referrerUrl': url or '',
|
||||||
}).encode('utf8'),
|
}).encode('utf8'),
|
||||||
headers={
|
headers={
|
||||||
'Authorization': token,
|
'Authorization': token,
|
||||||
@ -114,12 +124,40 @@ class NPOIE(InfoExtractor):
|
|||||||
)
|
)
|
||||||
stream_url = stream_link.get('stream', {}).get('streamURL')
|
stream_url = stream_link.get('stream', {}).get('streamURL')
|
||||||
formats.extend(self._extract_mpd_formats(stream_url, slug, mpd_id='dash', fatal=False))
|
formats.extend(self._extract_mpd_formats(stream_url, slug, mpd_id='dash', fatal=False))
|
||||||
|
return formats
|
||||||
|
|
||||||
|
|
||||||
|
class BNNVaraIE(NPOIE):
|
||||||
|
IE_NAME = 'bnnvara'
|
||||||
|
IE_DESC = 'bnnvara.nl'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?bnnvara\.nl/videos/[0-9]*'
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
url = url.rstrip('/')
|
||||||
|
video_id = url.split('/')[-1]
|
||||||
|
|
||||||
|
media = self._download_json('https://api.bnnvara.nl/bff/graphql',
|
||||||
|
video_id,
|
||||||
|
data=json.dumps(
|
||||||
|
{
|
||||||
|
'operationName': 'getMedia',
|
||||||
|
'variables': {
|
||||||
|
'id': video_id,
|
||||||
|
'hasAdConsent': False,
|
||||||
|
'atInternetId': 70
|
||||||
|
},
|
||||||
|
'query': 'query getMedia($id: ID!, $mediaUrl: String, $hasAdConsent: Boolean!, $atInternetId: Int) {\n player(\n id: $id\n mediaUrl: $mediaUrl\n hasAdConsent: $hasAdConsent\n atInternetId: $atInternetId\n ) {\n ... on PlayerSucces {\n brand {\n name\n slug\n broadcastsEnabled\n __typename\n }\n title\n programTitle\n pomsProductId\n broadcasters {\n name\n __typename\n }\n duration\n classifications {\n title\n imageUrl\n type\n __typename\n }\n image {\n title\n url\n __typename\n }\n cta {\n title\n url\n __typename\n }\n genres {\n name\n __typename\n }\n subtitles {\n url\n language\n __typename\n }\n sources {\n name\n url\n ratio\n __typename\n }\n type\n token\n __typename\n }\n ... on PlayerError {\n error\n __typename\n }\n __typename\n }\n}'
|
||||||
|
}).encode('utf8'),
|
||||||
|
headers={
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
})
|
||||||
|
product_id = media.get('data', {}).get('player', {}).get('pomsProductId')
|
||||||
|
|
||||||
|
formats = self._download_by_product_id(product_id, video_id)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': slug,
|
'id': product_id,
|
||||||
|
'title': media.get('data', {}).get('player', {}).get('title'),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'title': title or slug,
|
'thumbnail': media.get('data', {}).get('player', {}).get('image').get('url'),
|
||||||
'description': description,
|
|
||||||
'thumbnail': thumbnail,
|
|
||||||
# TODO fill in other metadata that's available
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user