Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 10:07:15 +08:00
Code Issues Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Roxedus 2020-01-05 22:50:52 +01:00
parent aa31a2c235
commit 10f2af0bb2
No known key found for this signature in database
GPG Key ID: 9B4E311961C63639
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/nrk.py
View File

@ -389,7 +389,7 @@ class NRKTVEpisodeIE(InfoExtractor):
'id': 'MUHH36005220BA', 'id': 'MUHH36005220BA',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Kro, krig og kjærlighet 2:6', 'title': 'Kro, krig og kjærlighet 2:6',
'description': 'Jan tviholder på sine prinsipper. Oddbjørn er skeptisk til Jans evne til å lede dem og bestemmer seg for å ta saken i egne hender.', 'description': 'md5:b32a7dc0b1ed27c8064f58b97bda4350',
'duration': 1563, 'duration': 1563,
'series': 'Hellums kro', 'series': 'Hellums kro',
'season_number': 1, 'season_number': 1,
@ -436,12 +436,11 @@ class NRKTVEpisodeIE(InfoExtractor):
class NRKTVSerieBaseIE(InfoExtractor): class NRKTVSerieBaseIE(InfoExtractor):
def _extract_series(self, webpage, display_id, fatal=True): def _extract_series(self, webpage, display_id, fatal=True):
config = self._parse_json( config = self._parse_json(
js_to_json(
self._search_regex( self._search_regex(
(r'INITIAL_DATA(?:_V\d)?_*\s*=\s*({.+?})\s*;', (r'INITIAL_DATA(?:_V\d)?_*\s*=\s*({.+?})\s*;',
r'({.+?})\s*,\s*"[^"]+"\s*\)\s*</script>'), r'({.+?})\s*,\s*"[^"]+"\s*\)\s*</script>'),
webpage, 'config', default='{}' if not fatal else NO_DEFAULT)), webpage, 'config', default='{}' if not fatal else NO_DEFAULT),
display_id, fatal=False) display_id, fatal=False, transform_source=js_to_json)
if not config: if not config:
return return
return try_get( return try_get(
@ -515,7 +514,7 @@ class NRKTVSeriesIE(NRKTVSerieBaseIE):
'info_dict': { 'info_dict': {
'id': 'blank', 'id': 'blank',
'title': 'Blank', 'title': 'Blank',
'description': 'Da Markus dro fra bygda var han den kuleste fyren med den fineste dama. Etter kort tid er han tilbake. Og ingenting er som før. Norsk dramaserie.', 'description': 'md5:7664b4e7e77dc6810cd3bca367c25b6e',
}, },
'playlist_mincount': 30, 'playlist_mincount': 30,
}, { }, {