X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/5b8917fb5254db07084a08549aefbc476aff25dc..9f14daf22b4080ae1531a772ee7574959af4e2fa:/yt_dlp/extractor/zee5.py diff --git a/yt_dlp/extractor/zee5.py b/yt_dlp/extractor/zee5.py index d461a11eb..a64eb9ed0 100644 --- a/yt_dlp/extractor/zee5.py +++ b/yt_dlp/extractor/zee5.py @@ -1,11 +1,11 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import re +import json +import random +import string from .common import InfoExtractor from ..compat import compat_str from ..utils import ( + ExtractorError, int_or_none, parse_age_limit, str_or_none, @@ -20,113 +20,161 @@ class Zee5IE(InfoExtractor): _VALID_URL = r'''(?x) (?: zee5:| - (?:https?://)(?:www\.)?zee5\.com/(?:[^#?]+/)? + https?://(?:www\.)?zee5\.com/(?:[^#?]+/)? (?: - (?:tvshows|kids|zee5originals)(?:/[^#/?]+){3} - |movies/[^#/?]+ + (?:tv-shows|kids|web-series|zee5originals)(?:/[^#/?]+){3} + |(?:movies|kids|videos|news|music-videos)/(?!kids-shows)[^#/?]+ )/(?P[^#/?]+)/ ) (?P[^#/?]+)/?(?:$|[?#]) ''' _TESTS = [{ - 'url': 'https://www.zee5.com/movies/details/krishna-the-birth/0-0-63098', + 'url': 'https://www.zee5.com/movies/details/adavari-matalaku-ardhale-verule/0-0-movie_1143162669', 'info_dict': { - 'id': '0-0-63098', + 'id': '0-0-movie_1143162669', 'ext': 'mp4', - 'display_id': 'krishna-the-birth', - 'title': 'Krishna - The Birth', - 'duration': 4368, - 'average_rating': 4, - 'description': str, - 'alt_title': 'Krishna - The Birth', + 'display_id': 'adavari-matalaku-ardhale-verule', + 'title': 'Adavari Matalaku Ardhale Verule', + 'duration': 9360, + 'description': compat_str, + 'alt_title': 'Adavari Matalaku Ardhale Verule', 'uploader': 'Zee Entertainment Enterprises Ltd', - 'release_date': '20060101', - 'upload_date': '20060101', - 'timestamp': 1136073600, - 'thumbnail': 'https://akamaividz.zee5.com/resources/0-0-63098/list/270x152/0063098_list_80888170.jpg', + 'release_date': '20070427', + 'upload_date': '20070427', + 'timestamp': 1177632000, + 'thumbnail': r're:^https?://.*\.jpg$', + 'episode_number': 0, + 'episode': 'Episode 0', 'tags': list }, 'params': { 'format': 'bv', }, }, { - 'url': 'https://zee5.com/tvshows/details/krishna-balram/0-6-1871/episode-1-the-test-of-bramha/0-1-233402', + 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899/yoga-se-hoga-bandbudh-aur-budbak/0-1-239839', 'info_dict': { - 'id': '0-1-233402', + 'id': '0-1-239839', 'ext': 'mp4', - 'display_id': 'episode-1-the-test-of-bramha', - 'title': 'Episode 1 - The Test Of Bramha', - 'duration': 1336, - 'average_rating': 4, - 'description': str, - 'alt_title': 'Episode 1 - The Test Of Bramha', - 'uploader': 'Green Gold', - 'release_date': '20090101', - 'upload_date': '20090101', - 'timestamp': 1230768000, - 'thumbnail': 'https://akamaividz.zee5.com/resources/0-1-233402/list/270x152/01233402_list.jpg', - 'series': 'Krishna Balram', + 'display_id': 'yoga-se-hoga-bandbudh-aur-budbak', + 'title': 'Yoga Se Hoga-Bandbudh aur Budbak', + 'duration': 659, + 'description': compat_str, + 'alt_title': 'Yoga Se Hoga-Bandbudh aur Budbak', + 'uploader': 'Zee Entertainment Enterprises Ltd', + 'release_date': '20150101', + 'upload_date': '20150101', + 'timestamp': 1420070400, + 'thumbnail': r're:^https?://.*\.jpg$', + 'series': 'Bandbudh Aur Budbak', 'season_number': 1, 'episode_number': 1, + 'episode': 'Episode 1', + 'season': 'Season 1', 'tags': list, }, 'params': { 'format': 'bv', }, }, { - 'url': 'https://www.zee5.com/hi/tvshows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN', + 'url': 'https://www.zee5.com/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN', 'only_matching': True }, { - 'url': 'https://www.zee5.com/global/hi/tvshows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730', + 'url': 'https://www.zee5.com/global/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730', + 'only_matching': True + }, { + 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408/maine-dekhi-hai-uski-mrityu/0-1-6z587412', + 'only_matching': True + }, { + 'url': 'https://www.zee5.com/kids/kids-movies/maya-bommalu/0-0-movie_1040370005', + 'only_matching': True + }, { + 'url': 'https://www.zee5.com/news/details/jana-sena-chief-pawan-kalyan-shows-slippers-to-ysrcp-leaders/0-0-newsauto_6ettj4242oo0', + 'only_matching': True + }, { + 'url': 'https://www.zee5.com/music-videos/details/adhento-gaani-vunnapaatuga-jersey-nani-shraddha-srinath/0-0-56973', 'only_matching': True }] + _DETAIL_API_URL = 'https://spapi.zee5.com/singlePlayback/getDetails/secure?content_id={}&device_id={}&platform_name=desktop_web&country=IN&check_parental_control=false' + _DEVICE_ID = ''.join(random.choices(string.ascii_letters + string.digits, k=20)).ljust(32, '0') + _USER_TOKEN = None + _LOGIN_HINT = 'Use "--username " to login using otp or "--username token" and "--password " to login using user token.' + _NETRC_MACHINE = 'zee5' + _GEO_COUNTRIES = ['IN'] + + def _perform_login(self, username, password): + if len(username) == 10 and username.isdigit() and self._USER_TOKEN is None: + self.report_login() + otp_request_json = self._download_json(f'https://b2bapi.zee5.com/device/sendotp_v1.php?phoneno=91{username}', + None, note='Sending OTP') + if otp_request_json['code'] == 0: + self.to_screen(otp_request_json['message']) + else: + raise ExtractorError(otp_request_json['message'], expected=True) + otp_code = self._get_tfa_info('OTP') + otp_verify_json = self._download_json(f'https://b2bapi.zee5.com/device/verifyotp_v1.php?phoneno=91{username}&otp={otp_code}&guest_token={self._DEVICE_ID}&platform=web', + None, note='Verifying OTP', fatal=False) + if not otp_verify_json: + raise ExtractorError('Unable to verify OTP.', expected=True) + self._USER_TOKEN = otp_verify_json.get('token') + if not self._USER_TOKEN: + raise ExtractorError(otp_request_json['message'], expected=True) + elif username.lower() == 'token' and len(password) > 1198: + self._USER_TOKEN = password + else: + raise ExtractorError(self._LOGIN_HINT, expected=True) def _real_extract(self, url): - video_id, display_id = re.match(self._VALID_URL, url).group('id', 'display_id') + video_id, display_id = self._match_valid_url(url).group('id', 'display_id') access_token_request = self._download_json( 'https://useraction.zee5.com/token/platform_tokens.php?platform_name=web_app', video_id, note='Downloading access token') - token_request = self._download_json( - 'https://useraction.zee5.com/tokennd', - video_id, note='Downloading video token') + data = { + 'x-access-token': access_token_request['token'] + } + if self._USER_TOKEN: + data['Authorization'] = 'bearer %s' % self._USER_TOKEN + else: + data['X-Z5-Guest-Token'] = self._DEVICE_ID + json_data = self._download_json( - 'https://gwapi.zee5.com/content/details/{}?translation=en&country=IN'.format(video_id), - video_id, headers={'X-Access-Token': access_token_request['token']}) - m3u8_url = try_get( - json_data, - (lambda x: x['hls'][0], lambda x: x['video_details']['hls_url']), - str) - formats = self._extract_m3u8_formats( - 'https://zee5vodnd.akamaized.net' + m3u8_url.replace('/drm1/', '/hls1/') + token_request['video_token'], - video_id, fatal=False) - mpd_url = try_get( - json_data, - (lambda x: x['video'][0], lambda x: x['video_details']['url']), - str) - formats += self._extract_mpd_formats( - 'https://zee5vodnd.akamaized.net' + mpd_url + token_request['video_token'], - video_id, fatal=False) + self._DETAIL_API_URL.format(video_id, self._DEVICE_ID), + video_id, headers={'content-type': 'application/json'}, data=json.dumps(data).encode('utf-8')) + asset_data = json_data['assetDetails'] + show_data = json_data.get('showDetails', {}) + if 'premium' in asset_data['business_type']: + raise ExtractorError('Premium content is DRM protected.', expected=True) + if not asset_data.get('hls_url'): + self.raise_login_required(self._LOGIN_HINT, metadata_available=True, method=None) + formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(asset_data['hls_url'], video_id, 'mp4', fatal=False) - self._sort_formats(formats) + subtitles = {} + for sub in asset_data.get('subtitle_url', []): + sub_url = sub.get('url') + if not sub_url: + continue + subtitles.setdefault(sub.get('language', 'en'), []).append({ + 'url': self._proto_relative_url(sub_url), + }) + subtitles = self._merge_subtitles(subtitles, m3u8_subs) return { 'id': video_id, 'display_id': display_id, - 'title': json_data['title'], + 'title': asset_data['title'], 'formats': formats, - 'duration': int_or_none(json_data.get('duration')), - 'average_rating': int_or_none(json_data.get('rating')), - 'description': str_or_none(json_data.get('description')), - 'alt_title': str_or_none(json_data.get('original_title')), - 'uploader': str_or_none(json_data.get('content_owner')), - 'age_limit': parse_age_limit(json_data.get('age_rating')), - 'release_date': unified_strdate(json_data.get('release_date')), - 'timestamp': unified_timestamp(json_data.get('release_date')), - 'thumbnail': url_or_none(json_data.get('image_url')), - 'series': try_get(json_data, lambda x: x['tvshow_details']['title'], str), - 'season': try_get(json_data, lambda x: x['season_details']['title'], str), - 'season_number': int_or_none(try_get(json_data, lambda x: x['season_details']['index'])), - 'episode_number': int_or_none(try_get(json_data, lambda x: x['index'])), - 'tags': try_get(json_data, lambda x: x['tags'], list) + 'subtitles': subtitles, + 'duration': int_or_none(asset_data.get('duration')), + 'description': str_or_none(asset_data.get('description')), + 'alt_title': str_or_none(asset_data.get('original_title')), + 'uploader': str_or_none(asset_data.get('content_owner')), + 'age_limit': parse_age_limit(asset_data.get('age_rating')), + 'release_date': unified_strdate(asset_data.get('release_date')), + 'timestamp': unified_timestamp(asset_data.get('release_date')), + 'thumbnail': url_or_none(asset_data.get('image_url')), + 'series': str_or_none(asset_data.get('tvshow_name')), + 'season': try_get(show_data, lambda x: x['seasons']['title'], str), + 'season_number': int_or_none(try_get(show_data, lambda x: x['seasons'][0]['orderid'])), + 'episode_number': int_or_none(try_get(asset_data, lambda x: x['orderid'])), + 'tags': try_get(asset_data, lambda x: x['tags'], list) } @@ -135,43 +183,48 @@ class Zee5SeriesIE(InfoExtractor): _VALID_URL = r'''(?x) (?: zee5:series:| - (?:https?://)(?:www\.)?zee5\.com/(?:[^#?]+/)? - (?:tvshows|kids|zee5originals)(?:/[^#/?]+){2}/ + https?://(?:www\.)?zee5\.com/(?:[^#?]+/)? + (?:tv-shows|web-series|kids|zee5originals)/(?!kids-movies)(?:[^#/?]+/){2} ) - (?P[^#/?]+)/?(?:$|[?#]) + (?P[^#/?]+)(?:/episodes)?/?(?:$|[?#]) ''' _TESTS = [{ - 'url': 'https://www.zee5.com/kids/kids-shows/krishna-balram/0-6-1871', - 'playlist_mincount': 43, + 'url': 'https://www.zee5.com/kids/kids-shows/bandbudh-aur-budbak/0-6-1899', + 'playlist_mincount': 156, 'info_dict': { - 'id': '0-6-1871', + 'id': '0-6-1899', }, }, { - 'url': 'https://www.zee5.com/tvshows/details/bhabi-ji-ghar-par-hai/0-6-199', + 'url': 'https://www.zee5.com/tv-shows/details/bhabi-ji-ghar-par-hai/0-6-199', 'playlist_mincount': 1500, 'info_dict': { 'id': '0-6-199', }, }, { - 'url': 'https://www.zee5.com/tvshows/details/agent-raghav-crime-branch/0-6-965', - 'playlist_mincount': 25, + 'url': 'https://www.zee5.com/tv-shows/details/agent-raghav-crime-branch/0-6-965', + 'playlist_mincount': 24, 'info_dict': { 'id': '0-6-965', }, }, { - 'url': 'https://www.zee5.com/ta/tvshows/details/nagabhairavi/0-6-3201', + 'url': 'https://www.zee5.com/ta/tv-shows/details/nagabhairavi/0-6-3201', 'playlist_mincount': 3, 'info_dict': { 'id': '0-6-3201', }, }, { - 'url': 'https://www.zee5.com/global/hi/tvshows/details/khwaabon-ki-zamin-par/0-6-270', + 'url': 'https://www.zee5.com/global/hi/tv-shows/details/khwaabon-ki-zamin-par/0-6-270', 'playlist_mincount': 150, 'info_dict': { 'id': '0-6-270', }, - } - ] + }, { + 'url': 'https://www.zee5.com/tv-shows/details/chala-hawa-yeu-dya-ladies-zindabaad/0-6-2943/episodes', + 'only_matching': True, + }, { + 'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408', + 'only_matching': True, + }] def _entries(self, show_id): access_token_request = self._download_json( @@ -181,13 +234,13 @@ def _entries(self, show_id): 'X-Access-Token': access_token_request['token'], 'Referer': 'https://www.zee5.com/', } - show_url = 'https://gwapi.zee5.com/content/tvshow/{}?translation=en&country=IN'.format(show_id) + show_url = f'https://gwapi.zee5.com/content/tvshow/{show_id}?translation=en&country=IN' page_num = 0 show_json = self._download_json(show_url, video_id=show_id, headers=headers) for season in show_json.get('seasons') or []: season_id = try_get(season, lambda x: x['id'], compat_str) - next_url = 'https://gwapi.zee5.com/content/tvshow/?season_id={}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100'.format(season_id) + next_url = f'https://gwapi.zee5.com/content/tvshow/?season_id={season_id}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100' while next_url: page_num += 1 episodes_json = self._download_json(