[nrk] Improve series metadata extraction (closes #27473)

skyme5 · Jan 3, 2021 · 5c6e84c · 5c6e84c
1 parent 1aaee90
commit 5c6e84c
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
@@ -238,23 +238,37 @@ def call_playback_api(item, query=None):
         }
 
         if is_series:
-            series = title
+            series = season_id = season_number = episode = episode_number = None
+            programs = self._call_api(
+                'programs/%s' % video_id, video_id, 'programs', fatal=False)
+            if programs and isinstance(programs, dict):
+                series = str_or_none(programs.get('seriesTitle'))
+                season_id = str_or_none(programs.get('seasonId'))
+                season_number = int_or_none(programs.get('seasonNumber'))
+                episode = str_or_none(programs.get('episodeTitle'))
+                episode_number = int_or_none(programs.get('episodeNumber'))
+            if not series:
+                series = title
             if alt_title:
                 title += ' - %s' % alt_title
-            season_number = int_or_none(self._search_regex(
-                r'Sesong\s+(\d+)', description or '', 'season number',
-                default=None))
-            episode = alt_title if is_series else None
-            episode_number = int_or_none(self._search_regex(
-                r'^(\d+)\.', episode or '', 'episode number',
-                default=None))
+            if not season_number:
+                season_number = int_or_none(self._search_regex(
+                    r'Sesong\s+(\d+)', description or '', 'season number',
+                    default=None))
+            if not episode:
+                episode = alt_title if is_series else None
+            if not episode_number:
+                episode_number = int_or_none(self._search_regex(
+                    r'^(\d+)\.', episode or '', 'episode number',
+                    default=None))
             if not episode_number:
                 episode_number = int_or_none(self._search_regex(
                     r'\((\d+)\s*:\s*\d+\)', description or '',
                     'episode number', default=None))
             info.update({
                 'title': title,
                 'series': series,
+                'season_id': season_id,
                 'season_number': season_number,
                 'episode': episode,
                 'episode_number': episode_number,
@@ -388,7 +402,7 @@ class NRKTVEpisodeIE(InfoExtractor):
             'description': 'md5:ad92ddffc04cea8ce14b415deef81787',
             'duration': 1563.92,
             'series': 'Hellums kro',
-            # 'season_number': 1,
+            'season_number': 1,
             'episode_number': 2,
             'episode': '2. Kro, krig og kjærlighet',
             'age_limit': 6,