youtube_dl/extractor/hotstar.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import hashlib
 import hmac
-import json
 import re
 import time
 import uuid
@@ -26,50 +25,43 @@ from ..utils import (
 class HotStarBaseIE(InfoExtractor):
     _AKAMAI_ENCRYPTION_KEY = b'\x05\xfc\x1a\x01\xca\xc9\x4b\xc4\x12\xfc\x53\x12\x07\x75\xf9\xee'
 
-    def _call_api_impl(self, path, video_id, headers, query, data=None):
+    def _call_api_impl(self, path, video_id, query):
         st = int(time.time())
         exp = st + 6000
         auth = 'st=%d~exp=%d~acl=/*' % (st, exp)
         auth += '~hmac=' + hmac.new(self._AKAMAI_ENCRYPTION_KEY, auth.encode(), hashlib.sha256).hexdigest()
-        h = {'hotstarauth': auth}
+        response = self._download_json(
-        h.update(headers)
+            'https://api.hotstar.com/' + path, video_id, headers={
-        return self._download_json(
+                'hotstarauth': auth,
-            'https://api.hotstar.com/' + path,
+                'x-country-code': 'IN',
-            video_id, headers=h, query=query, data=data)
+                'x-platform-code': 'JIO',
-
+            }, query=query)
-    def _call_api(self, path, video_id, query_name='contentId'):
-        response = self._call_api_impl(path, video_id, {
-            'x-country-code': 'IN',
-            'x-platform-code': 'JIO',
-        }, {
-            query_name: video_id,
-            'tas': 10000,
-        })
         if response['statusCode'] != 'OK':
             raise ExtractorError(
                 response['body']['message'], expected=True)
         return response['body']['results']
 
-    def _call_api_v2(self, path, video_id, headers, query=None, data=None):
+    def _call_api(self, path, video_id, query_name='contentId'):
-        h = {'X-Request-Id': compat_str(uuid.uuid4())}
+        return self._call_api_impl(path, video_id, {
-        h.update(headers)
+            query_name: video_id,
-        try:
+            'tas': 10000,
-            return self._call_api_impl(
+        })
-                path, video_id, h, query, data)
+
-        except ExtractorError as e:
+    def _call_api_v2(self, path, video_id):
-            if isinstance(e.cause, compat_HTTPError):
+        return self._call_api_impl(
-                if e.cause.code == 402:
+            '%s/in/contents/%s' % (path, video_id), video_id, {
-                    self.raise_login_required()
+                'desiredConfig': 'encryption:plain;ladder:phone,tv;package:hls,dash',
-                message = self._parse_json(e.cause.read().decode(), video_id)['message']
+                'client': 'mweb',
-                if message in ('Content not available in region', 'Country is not supported'):
+                'clientVersion': '6.18.0',
-                    raise self.raise_geo_restricted(message)
+                'deviceId': compat_str(uuid.uuid4()),
-                raise ExtractorError(message)
+                'osName': 'Windows',
-            raise e
+                'osVersion': '10',
+            })
 
 
 class HotStarIE(HotStarBaseIE):
     IE_NAME = 'hotstar'
-    _VALID_URL = r'https?://(?:www\.)?hotstar\.com/(?:.+[/-])?(?P<id>\d{10})'
+    _VALID_URL = r'https?://(?:www\.)?hotstar\.com/(?:.+?[/-])?(?P<id>\d{10})'
     _TESTS = [{
         # contentData
         'url': 'https://www.hotstar.com/can-you-not-spread-rumours/1000076273',
@@ -100,13 +92,8 @@ class HotStarIE(HotStarBaseIE):
         # only available via api v2
         'url': 'https://www.hotstar.com/tv/ek-bhram-sarvagun-sampanna/s-2116/janhvi-targets-suman/1000234847',
         'only_matching': True,
-    }, {
-        'url': 'https://www.hotstar.com/in/tv/start-music/1260005217/cooks-vs-comalis/1100039717',
-        'only_matching': True,
     }]
     _GEO_BYPASS = False
-    _DEVICE_ID = None
-    _USER_TOKEN = None
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -134,30 +121,7 @@ class HotStarIE(HotStarBaseIE):
         headers = {'Referer': url}
         formats = []
         geo_restricted = False
-
+        playback_sets = self._call_api_v2('h/v2/play', video_id)['playBackSets']
-        if not self._USER_TOKEN:
-            self._DEVICE_ID = compat_str(uuid.uuid4())
-            self._USER_TOKEN = self._call_api_v2('um/v3/users', video_id, {
-                'X-HS-Platform': 'PCTV',
-                'Content-Type': 'application/json',
-            }, data=json.dumps({
-                'device_ids': [{
-                    'id': self._DEVICE_ID,
-                    'type': 'device_id',
-                }],
-            }).encode())['user_identity']
-
-        playback_sets = self._call_api_v2(
-            'play/v2/playback/content/' + video_id, video_id, {
-                'X-HS-Platform': 'web',
-                'X-HS-AppVersion': '6.99.1',
-                'X-HS-UserToken': self._USER_TOKEN,
-            }, query={
-                'device-id': self._DEVICE_ID,
-                'desired-config': 'encryption:plain',
-                'os-name': 'Windows',
-                'os-version': '10',
-            })['data']['playBackSets']
         for playback_set in playback_sets:
             if not isinstance(playback_set, dict):
                 continue
@@ -199,22 +163,19 @@ class HotStarIE(HotStarBaseIE):
         for f in formats:
             f.setdefault('http_headers', {}).update(headers)
 
-        image = try_get(video_data, lambda x: x['image']['h'], compat_str)
-
         return {
             'id': video_id,
             'title': title,
-            'thumbnail': 'https://img1.hotstarext.com/image/upload/' + image if image else None,
             'description': video_data.get('description'),
             'duration': int_or_none(video_data.get('duration')),
             'timestamp': int_or_none(video_data.get('broadcastDate') or video_data.get('startDate')),
             'formats': formats,
             'channel': video_data.get('channelName'),
-            'channel_id': str_or_none(video_data.get('channelId')),
+            'channel_id': video_data.get('channelId'),
             'series': video_data.get('showName'),
             'season': video_data.get('seasonName'),
             'season_number': int_or_none(video_data.get('seasonNo')),
-            'season_id': str_or_none(video_data.get('seasonId')),
+            'season_id': video_data.get('seasonId'),
             'episode': title,
             'episode_number': int_or_none(video_data.get('episodeNo')),
         }
@@ -222,7 +183,7 @@ class HotStarIE(HotStarBaseIE):
 
 class HotStarPlaylistIE(HotStarBaseIE):
     IE_NAME = 'hotstar:playlist'
-    _VALID_URL = r'https?://(?:www\.)?hotstar\.com/(?:[a-z]{2}/)?tv/[^/]+/s-\w+/list/[^/]+/t-(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:www\.)?hotstar\.com/tv/[^/]+/s-\w+/list/[^/]+/t-(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://www.hotstar.com/tv/savdhaan-india/s-26/list/popular-clips/t-3_2_26',
         'info_dict': {
@@ -232,9 +193,6 @@ class HotStarPlaylistIE(HotStarBaseIE):
     }, {
         'url': 'https://www.hotstar.com/tv/savdhaan-india/s-26/list/extras/t-2480',
         'only_matching': True,
-    }, {
-        'url': 'https://www.hotstar.com/us/tv/masterchef-india/s-830/list/episodes/t-1_2_830',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):

youtube_dl/extractor/youtube.py

@@ -319,18 +319,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                             (?:www\.)?invidious\.kabi\.tk/|
                             (?:www\.)?invidious\.13ad\.de/|
                             (?:www\.)?invidious\.mastodon\.host/|
-                            (?:www\.)?invidious\.zapashcanon\.fr/|
-                            (?:www\.)?invidious\.kavin\.rocks/|
-                            (?:www\.)?invidious\.tube/|
-                            (?:www\.)?invidiou\.site/|
-                            (?:www\.)?invidious\.site/|
-                            (?:www\.)?invidious\.xyz/|
                             (?:www\.)?invidious\.nixnet\.xyz/|
                             (?:www\.)?invidious\.drycat\.fr/|
                             (?:www\.)?tube\.poal\.co/|
-                            (?:www\.)?tube\.connect\.cafe/|
                             (?:www\.)?vid\.wxzm\.sx/|
-                            (?:www\.)?vid\.mint\.lgbt/|
                             (?:www\.)?yewtu\.be/|
                             (?:www\.)?yt\.elukerio\.org/|
                             (?:www\.)?yt\.lelux\.fi/|