From 36c0472961e2e58ebd1f62edba6f7006fee5e1b0 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 20 Dec 2019 13:18:34 +0100 Subject: [PATCH 1/3] Added more parameters to RTLXL Season, episode and series --- youtube_dl/extractor/rtlnl.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index fadca8c17..e2e2d8b88 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -85,6 +85,9 @@ class RtlNlIE(InfoExtractor): uuid) material = info['material'][0] + abstracts = info['abstracts'][0] + seasons = info['seasons'][0] + episodes = info['episodes'][0] title = info['abstracts'][0]['name'] subtitle = material.get('title') if subtitle: @@ -123,4 +126,11 @@ class RtlNlIE(InfoExtractor): 'description': description, 'duration': parse_duration(material.get('duration')), 'thumbnails': thumbnails, + 'series': abstracts['name'], + 'season': seasons['name'], + 'season_number': seasons['volgnr'], + 'season_id': seasons['key'], + 'episode': episodes['name'], + 'episode_number': episodes['volgnr'], + 'episode_id': episodes['key'], } From ba13ac5d7e696882ec12773bd256ade1093ca3c3 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 20 Dec 2019 13:19:59 +0100 Subject: [PATCH 2/3] Corrected tabs --- youtube_dl/extractor/rtlnl.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index e2e2d8b88..14502d61d 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -126,11 +126,11 @@ class RtlNlIE(InfoExtractor): 'description': description, 'duration': parse_duration(material.get('duration')), 'thumbnails': thumbnails, - 'series': abstracts['name'], - 'season': seasons['name'], - 'season_number': seasons['volgnr'], - 'season_id': seasons['key'], - 'episode': episodes['name'], - 'episode_number': episodes['volgnr'], - 'episode_id': episodes['key'], + 'series': abstracts['name'], + 'season': seasons['name'], + 'season_number': seasons['volgnr'], + 'season_id': seasons['key'], + 'episode': episodes['name'], + 'episode_number': episodes['volgnr'], + 'episode_id': episodes['key'], } From d97da5a709f0ad1bc3cc86333dbec85dd3266473 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Fri, 20 Dec 2019 14:45:46 +0100 Subject: [PATCH 3/3] Improvements --- youtube_dl/extractor/rtlnl.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dl/extractor/rtlnl.py index 14502d61d..01bc22fc8 100644 --- a/youtube_dl/extractor/rtlnl.py +++ b/youtube_dl/extractor/rtlnl.py @@ -84,11 +84,11 @@ class RtlNlIE(InfoExtractor): 'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/fmt=adaptive/' % uuid, uuid) - material = info['material'][0] - abstracts = info['abstracts'][0] - seasons = info['seasons'][0] - episodes = info['episodes'][0] - title = info['abstracts'][0]['name'] + material = info.get('material')[0] + abstracts = info.get('abstracts')[0] + seasons = info.get('seasons')[0] + episodes = info.get('episodes')[0] + title = info.get('abstracts')[0]['name'] subtitle = material.get('title') if subtitle: title += ' - %s' % subtitle @@ -122,15 +122,15 @@ class RtlNlIE(InfoExtractor): 'id': uuid, 'title': title, 'formats': formats, - 'timestamp': material['original_date'], + 'timestamp': material.get('original_date'), 'description': description, 'duration': parse_duration(material.get('duration')), 'thumbnails': thumbnails, - 'series': abstracts['name'], - 'season': seasons['name'], - 'season_number': seasons['volgnr'], - 'season_id': seasons['key'], - 'episode': episodes['name'], - 'episode_number': episodes['volgnr'], - 'episode_id': episodes['key'], + 'series': abstracts.get('name'), + 'season': seasons.get('name'), + 'season_number': seasons.get('volgnr'), + 'season_id': seasons.get('key'), + 'episode': episodes.get('name'), + 'episode_number': episodes.get('volgnr'), + 'episode_id': episodes.get('key'), }