[ie/crunchyroll] Fix stream extraction (#10005)

[yt-dlp.git] / yt_dlp / extractor / novaplay.py

diff --git a/yt_dlp/extractor/novaplay.py b/yt_dlp/extractor/novaplay.py
index 724986a0603164508b1a798176ebb246f525ce77..adab33f59ec00204218a9d1857293886f239fd1e 100644 (file)
--- a/yt_dlp/extractor/novaplay.py
+++ b/yt_dlp/extractor/novaplay.py
@@ -1,54 +1,58 @@
-# coding: utf-8
 from .common import InfoExtractor
 from ..utils import int_or_none, parse_duration, parse_iso8601
 
 
 class NovaPlayIE(InfoExtractor):
-    _VALID_URL = r'https://play.nova\.bg/video/.*/(?P<id>\d+)'
+    _VALID_URL = r'https?://play\.nova\.bg/video/[^?#]+/(?P<id>\d+)'
     _TESTS = [
         {
-            'url': 'https://play.nova.bg/video/bratya/season-3/bratq-2021-10-08/548677',
-            'md5': 'b1127a84e61bed1632b7c2ca9cbb4153',
+            'url': 'https://play.nova.bg/video/ochakvaite/season-0/ochakvaite-2022-07-22-sybudi-se-sat/606627',
+            'md5': 'd79dff2d09d196c595a7290f48e33399',
             'info_dict': {
-                'id': '548677',
+                'id': '606627',
                 'ext': 'mp4',
-                'title': 'Ð\91Ñ\80аÑ\82Ñ\8f',
-                'alt_title': 'bratya/season-3/bratq-2021-10-08',
-                'duration': 1603.0,
-                'timestamp': 1633724150,
-                'upload_date': '20211008',
-                'thumbnail': 'https://nbg-img.fite.tv/img/548677_460x260.jpg',
-                'description': 'Сезон 3 Епизод 25'
+                'title': 'СÑ\8aбÑ\83ди Ñ\81е - Ñ\81Ñ\8aбоÑ\82а по NOVA (23.07.2022)',
+                'alt_title': 'ochakvaite/season-0/ochakvaite-2022-07-22-sybudi-se-sat',
+                'duration': 29.0,
+                'timestamp': 1658491547,
+                'upload_date': '20220722',
+                'thumbnail': 'https://nbg-img.fite.tv/img/606627_460x260.jpg',
+                'description': '29 сек',
             },
         },
         {
-            'url': 'https://play.nova.bg/video/igri-na-volqta/season-3/igri-na-volqta-2021-09-20-1/548227',
-            'md5': '5fd61b8ecbe582fc021019d570965d58',
+            'url': 'https://play.nova.bg/video/ochakvaite/season-0/ochakvaite-2022-07-22-cherry-tazi/606609',
+            'md5': 'f3e973e2ed1a5b9b3f498b1ab82d01b3',
             'info_dict': {
-                'id': '548227',
+                'id': '606609',
                 'ext': 'mp4',
-                'title': 'Ð\98гÑ\80и на волÑ\8fÑ\82а: Ð\91Ñ\8aлгаÑ\80иÑ\8f (20.09.2021) - Ñ\87аÑ\81Ñ\82 1',
-                'alt_title': 'gri-na-volqta/season-3/igri-na-volqta-2021-09-20-1',
-                'duration': 4060.0,
-                'timestamp': 1632167564,
-                'upload_date': '20210920',
-                'thumbnail': 'https://nbg-img.fite.tv/img/548227_460x260.jpg',
-                'description': 'Сезон 3 Епизод 13'
+                'title': 'ЧеÑ\80еÑ\88каÑ\82а на Ñ\82оÑ\80Ñ\82аÑ\82а - Ñ\82ази веÑ\87еÑ\80 по NOVA (22.07.2022)',
+                'alt_title': 'ochakvaite/season-0/ochakvaite-2022-07-22-cherry-tazi',
+                'duration': 29.0,
+                'timestamp': 1658476303,
+                'upload_date': '20220722',
+                'thumbnail': 'https://nbg-img.fite.tv/img/606609_460x260.jpg',
+                'description': '29 сек',
             },
         }
     ]
 
+    _access_token = None
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        video_props = self._parse_json(self._search_regex(
-            r'<script\s?id=\"__NEXT_DATA__\"\s?type=\"application/json\">({.+})</script>',
-            webpage, 'video_props'), video_id)['props']['pageProps']['video']
+        self._access_token = self._access_token or self._download_json(
+            'https://play.nova.bg/api/client', None, note='Fetching access token')['accessToken']
+        video_props = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['video']
         m3u8_url = self._download_json(
             f'https://nbg-api.fite.tv/api/v2/videos/{video_id}/streams',
-            video_id, headers={'x-flipps-user-agent': 'Flipps/75/9.7'})[0]['url']
+            video_id, headers={
+                'x-flipps-user-agent': 'Flipps/75/9.7',
+                'x-flipps-version': '2022-05-17',
+                'Authorization': f'Bearer {self._access_token}'
+            })[0]['links']['play']['href']
         formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls')
-        self._sort_formats(formats)
 
         return {
             'id': video_id,