artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-26 18:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nrk] Run autopep8 to format nrk.py

Browse Source
This commit is contained in:
MrDemocracy 2024-10-06 02:12:37 +02:00 committed by GitHub
parent 4522cce417
commit 4cd8abfc08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
yt_dlp/extractor/nrk.py
View File

@ -178,7 +178,7 @@ class NRKIE(NRKBaseIE):
if not isinstance(asset, dict): if not isinstance(asset, dict):
continue continue
if asset.get('encrypted'): if asset.get('encrypted'):
pass # Unencrypted stream no longer available pass # Unencrypted stream no longer available
format_url = url_or_none(asset.get('url')) format_url = url_or_none(asset.get('url'))
if not format_url: if not format_url:
continue continue
@ -236,14 +236,14 @@ class NRKIE(NRKBaseIE):
chapters = [] chapters = []
if data.get('skipDialogInfo'): if data.get('skipDialogInfo'):
chapters = [item for item in [{ chapters = [item for item in [{
'start_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'startIntroInSeconds'))), 'start_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'startIntroInSeconds'))),
'end_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'endIntroInSeconds'))), 'end_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'endIntroInSeconds'))),
'title': 'Intro', 'title': 'Intro',
}, { }, {
'start_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'startCreditsInSeconds'))), 'start_time': float_or_none(traverse_obj(data, ('skipDialogInfo', 'startCreditsInSeconds'))),
'end_time': duration, 'end_time': duration,
'title': 'Outro', 'title': 'Outro',
}] if item['start_time'] != item['end_time']] }] if item['start_time'] != item['end_time']]
if try_get(data, lambda x: x['preplay']['indexPoints']): if try_get(data, lambda x: x['preplay']['indexPoints']):
seconds_or_none = lambda x: float_or_none(parse_duration(x)) seconds_or_none = lambda x: float_or_none(parse_duration(x))
chapters += traverse_obj(data['preplay'], ('indexPoints', ..., { chapters += traverse_obj(data['preplay'], ('indexPoints', ..., {
@ -281,7 +281,7 @@ class NRKIE(NRKBaseIE):
series = season_id = season_number = episode = episode_number = None series = season_id = season_number = episode = episode_number = None
programs = self._call_api( programs = self._call_api(
f'programs/{video_id}', video_id, 'programs', fatal=False) f'programs/{video_id}', video_id, 'programs', fatal=False)
match = re.search(r'\d+', try_get(programs, lambda x: x['firstTimeTransmitted']['publicationDate'] or x['usageRights']['availableFrom'], str) or try_get(programs, lambda x: x['usageRights']['availableFrom'], str)) match = re.search(r'\d+', try_get(programs, lambda x: x['firstTimeTransmitted']['publicationDate'] or x['usageRights']['availableFrom'], str) or try_get(programs, lambda x: x['usageRights']['availableFrom'], str))
if match: if match:
info.update({'timestamp': min(info['timestamp'], int(match.group()) // 1000)}) info.update({'timestamp': min(info['timestamp'], int(match.group()) // 1000)})
@ -321,34 +321,34 @@ class NRKIE(NRKBaseIE):
return info return info
def _perform_login(self, username, password): def _perform_login(self, username, password):
try: try:
self._download_json( self._download_json(
self._LOGIN_URL, None, headers={'Content-Type': 'application/json; charset=UTF-8', 'accept': 'application/json; charset=utf-8'}, self._LOGIN_URL, None, headers={'Content-Type': 'application/json; charset=UTF-8', 'accept': 'application/json; charset=utf-8'},
data=json.dumps({ data=json.dumps({
'clientId': '', 'clientId': '',
'hashedPassword': {'current': { 'hashedPassword': {'current': {
'hash': password, 'hash': password,
'recipe': { 'recipe': {
'algorithm': 'cleartext', 'algorithm': 'cleartext',
'salt': '', 'salt': '',
}, },
}, },
}, },
'password': password, 'password': password,
'username': username, 'username': username,
}).encode()) }).encode())
self._download_webpage('https://tv.nrk.no/auth/web/login/opsession', None) self._download_webpage('https://tv.nrk.no/auth/web/login/opsession', None)
response = self._download_json('https://tv.nrk.no/auth/session/tokenforsub/_', None) response = self._download_json('https://tv.nrk.no/auth/session/tokenforsub/_', None)
self._AUTH_TOKEN = try_get(response, lambda x: x['session']['accessToken']) self._AUTH_TOKEN = try_get(response, lambda x: x['session']['accessToken'])
self._API_CALL_HEADERS['authorization'] = f'Bearer {self._AUTH_TOKEN}' self._API_CALL_HEADERS['authorization'] = f'Bearer {self._AUTH_TOKEN}'
except ExtractorError as e: except ExtractorError as e:
message = None message = None
if isinstance(e.cause, HTTPError) and e.cause.status in (401, 400): if isinstance(e.cause, HTTPError) and e.cause.status in (401, 400):
resp = self._parse_json( resp = self._parse_json(
e.cause.response.read().decode(), None, fatal=False) or {} e.cause.response.read().decode(), None, fatal=False) or {}
message = next((error['message'] for error in resp['errors'] if error['field'] == 'Password'), None) message = next((error['message'] for error in resp['errors'] if error['field'] == 'Password'), None)
self.report_warning(message or 'Unable to log in') self.report_warning(message or 'Unable to log in')
class NRKTVIE(InfoExtractor): class NRKTVIE(InfoExtractor):
@ -727,6 +727,7 @@ class NRKTVSeasonIE(NRKTVSerieBaseIE):
return self.playlist_result(self._entries(data, f'{serie}/{season_id}'), f'{serie}/{season_id}', title) return self.playlist_result(self._entries(data, f'{serie}/{season_id}'), f'{serie}/{season_id}', title)
class NRKTVSeriesIE(NRKTVSerieBaseIE): class NRKTVSeriesIE(NRKTVSerieBaseIE):
_VALID_URL = r'https?://(?P<domain>(?:tv|radio)\.nrk|(?:tv\.)?nrksuper)\.no/(?P<serie_kind>serie|pod[ck]ast)/(?P<id>[^/]+)' _VALID_URL = r'https?://(?P<domain>(?:tv|radio)\.nrk|(?:tv\.)?nrksuper)\.no/(?P<serie_kind>serie|pod[ck]ast)/(?P<id>[^/]+)'
_TESTS = [{ _TESTS = [{