[ie/NRKTVEpisode] Fix extractor (#14065)

Closes #14054
Authored by: runarmod

yt_dlp/extractor/nrk.py

@@ -446,9 +446,10 @@ class NRKTVIE(InfoExtractor):
 
 
 class NRKTVEpisodeIE(InfoExtractor):
-    _VALID_URL = r'https?://tv\.nrk\.no/serie/(?P<id>[^/]+/sesong/(?P<season_number>\d+)/episode/(?P<episode_number>\d+))'
+    _VALID_URL = r'https?://tv\.nrk\.no/serie/(?P<id>[^/?#]+/sesong/(?P<season_number>\d+)/episode/(?P<episode_number>\d+))'
     _TESTS = [{
         'url': 'https://tv.nrk.no/serie/hellums-kro/sesong/1/episode/2',
+        'add_ie': [NRKIE.ie_key()],
         'info_dict': {
             'id': 'MUHH36005220',
             'ext': 'mp4',
@@ -485,26 +486,23 @@ class NRKTVEpisodeIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        display_id, season_number, episode_number = self._match_valid_url(url).groups()
+        display_id, season_number, episode_number = self._match_valid_url(url).group(
+            'id', 'season_number', 'episode_number')
+        webpage, urlh = self._download_webpage_handle(url, display_id)
 
-        webpage = self._download_webpage(url, display_id)
+        if NRKTVIE.suitable(urlh.url):
-
+            nrk_id = NRKTVIE._match_id(urlh.url)
-        info = self._search_json_ld(webpage, display_id, default={})
+        else:
-        nrk_id = info.get('@id') or self._html_search_meta(
+            nrk_id = self._search_json(
-            'nrk:program-id', webpage, default=None) or self._search_regex(
+                r'<script\b[^>]+\bid="pageData"[^>]*>', webpage,
-            rf'data-program-id=["\']({NRKTVIE._EPISODE_RE})', webpage,
+                'page data', display_id)['initialState']['selectedEpisodePrfId']
-            'nrk id')
+            if not re.fullmatch(NRKTVIE._EPISODE_RE, nrk_id):
-        assert re.match(NRKTVIE._EPISODE_RE, nrk_id)
+                raise ExtractorError('Unable to extract NRK ID')
 
-        info.update({
+        return self.url_result(
-            '_type': 'url',
+            f'nrk:{nrk_id}', NRKIE, nrk_id,
-            'id': nrk_id,
+            season_number=int(season_number),
-            'url': f'nrk:{nrk_id}',
+            episode_number=int(episode_number))
-            'ie_key': NRKIE.ie_key(),
-            'season_number': int(season_number),
-            'episode_number': int(episode_number),
-        })
-        return info
 
 
 class NRKTVSerieBaseIE(NRKBaseIE):