Mirroring
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp
1
0
Fork 0
Code Issues Releases Wiki Activity

[crackle] Improve extraction (See desc)

Browse Source 
Closes #282

* Refactor authorization as an extension to `_download_json`
* Better error messages and warnings
* Respect `--ignore-no-formats-error`
* Extract subtitles from manifests
* Try with crackle's geo-location service if all hard-coded countries fail
pull/289/head
pukkandan 4 years ago
parent e28f1c0ae8
commit 07e4a40a9a
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
1 changed files with 162 additions and 117 deletions
Show Stats Download Patch File Download Diff File

279
yt_dlp/extractor/crackle.py
Unescape Escape View File

@ -12,6 +12,7 @@ from ..utils import (
determine_ext, determine_ext,
float_or_none, float_or_none,
int_or_none, int_or_none,
orderedSet,
parse_age_limit, parse_age_limit,
parse_duration, parse_duration,
url_or_none, url_or_none,
@ -66,135 +67,179 @@ class CrackleIE(InfoExtractor):
}, },
} }
def _download_json(self, url, *args, **kwargs):
# Authorization generation algorithm is reverse engineered from:
# https://www.sonycrackle.com/static/js/main.ea93451f.chunk.js
timestamp = time.strftime('%Y%m%d%H%M', time.gmtime())
h = hmac.new(b'IGSLUQCBDFHEOIFM', '|'.join([url, timestamp]).encode(), hashlib.sha1).hexdigest().upper()
headers = {
'Accept': 'application/json',
'Authorization': '|'.join([h, timestamp, '117', '1']),
}
return InfoExtractor._download_json(self, url, *args, headers=headers, **kwargs)
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
country_code = self._downloader.params.get('geo_bypass_country', None) geo_bypass_country = self._downloader.params.get('geo_bypass_country', None)
countries = [country_code] if country_code else ( countries = orderedSet((geo_bypass_country, 'US', 'AU', 'CA', 'AS', 'FM', 'GU', 'MP', 'PR', 'PW', 'MH', 'VI', ''))
'US', 'AU', 'CA', 'AS', 'FM', 'GU', 'MP', 'PR', 'PW', 'MH', 'VI') num_countries, num = len(countries) - 1, 0
last_e = None media = {}
for num, country in enumerate(countries):
if num == 1: # start hard-coded list
self.report_warning('%s. Trying with a list of known countries' % (
'Unable to obtain video formats from %s API' % geo_bypass_country if geo_bypass_country
else 'No country code was given using --geo-bypass-country'))
elif num == num_countries: # end of list
geo_info = self._download_json(
'https://web-api-us.crackle.com/Service.svc/geo/country',
video_id, fatal=False, note='Downloading geo-location information from crackle API',
errnote='Unable to fetch geo-location information from crackle') or {}
country = geo_info.get('CountryCode')
if country is None:
continue
self.to_screen('%s identified country as %s' % (self.IE_NAME, country))
if country in countries:
self.to_screen('Downloading from %s API was already attempted. Skipping...' % country)
continue
for country in countries: if country is None:
continue
try: try:
# Authorization generation algorithm is reverse engineered from:
# https://www.sonycrackle.com/static/js/main.ea93451f.chunk.js
media_detail_url = 'https://web-api-us.crackle.com/Service.svc/details/media/%s/%s?disableProtocols=true' % (video_id, country)
timestamp = time.strftime('%Y%m%d%H%M', time.gmtime())
h = hmac.new(b'IGSLUQCBDFHEOIFM', '|'.join([media_detail_url, timestamp]).encode(), hashlib.sha1).hexdigest().upper()
media = self._download_json( media = self._download_json(
media_detail_url, video_id, 'Downloading media JSON as %s' % country, 'https://web-api-us.crackle.com/Service.svc/details/media/%s/%s?disableProtocols=true' % (video_id, country),
'Unable to download media JSON', headers={ video_id, note='Downloading media JSON from %s API' % country,
'Accept': 'application/json', errnote='Unable to download media JSON')
'Authorization': '|'.join([h, timestamp, '117', '1']),
})
except ExtractorError as e: except ExtractorError as e:
# 401 means geo restriction, trying next country # 401 means geo restriction, trying next country
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401: if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
last_e = e
continue continue
raise raise
media_urls = media.get('MediaURLs') status = media.get('status')
if not media_urls or not isinstance(media_urls, list): if status.get('messageCode') != '0':
raise ExtractorError(
'%s said: %s %s - %s' % (
self.IE_NAME, status.get('messageCodeDescription'), status.get('messageCode'), status.get('message')),
expected=True)
# Found video formats
if isinstance(media.get('MediaURLs'), list):
break
ignore_no_formats = self._downloader.params.get('ignore_no_formats_error')
allow_unplayable_formats = self._downloader.params.get('allow_unplayable_formats')
if not media or (not media.get('MediaURLs') and not ignore_no_formats):
raise ExtractorError(
'Unable to access the crackle API. Try passing your country code '
'to --geo-bypass-country. If it still does not work and the '
'video is available in your country')
title = media['Title']
formats, subtitles = [], {}
has_drm = False
for e in media.get('MediaURLs') or []:
if e.get('UseDRM'):
has_drm = True
if not allow_unplayable_formats:
continue
format_url = url_or_none(e.get('Path'))
if not format_url:
continue continue
ext = determine_ext(format_url)
title = media['Title'] if ext == 'm3u8':
fmts, subs = self._extract_m3u8_formats_and_subtitles(
formats = [] format_url, video_id, 'mp4', entry_protocol='m3u8_native',
for e in media['MediaURLs']: m3u8_id='hls', fatal=False)
if not self._downloader.params.get('allow_unplayable_formats') and e.get('UseDRM') is True: formats.extend(fmts)
subtitles = self._merge_subtitles(subtitles, subs)
elif ext == 'mpd':
fmts, subs = self._extract_mpd_formats_and_subtitles(
format_url, video_id, mpd_id='dash', fatal=False)
formats.extend(fmts)
subtitles = self._merge_subtitles(subtitles, subs)
elif format_url.endswith('.ism/Manifest'):
fmts, subs = self._extract_ism_formats_and_subtitles(
format_url, video_id, ism_id='mss', fatal=False)
formats.extend(fmts)
subtitles = self._merge_subtitles(subtitles, subs)
else:
mfs_path = e.get('Type')
mfs_info = self._MEDIA_FILE_SLOTS.get(mfs_path)
if not mfs_info:
continue continue
format_url = url_or_none(e.get('Path')) formats.append({
if not format_url: 'url': format_url,
'format_id': 'http-' + mfs_path.split('.')[0],
'width': mfs_info['width'],
'height': mfs_info['height'],
})
if not formats and has_drm and not ignore_no_formats:
raise ExtractorError('The video is DRM protected', expected=True)
self._sort_formats(formats)
description = media.get('Description')
duration = int_or_none(media.get(
'DurationInSeconds')) or parse_duration(media.get('Duration'))
view_count = int_or_none(media.get('CountViews'))
average_rating = float_or_none(media.get('UserRating'))
age_limit = parse_age_limit(media.get('Rating'))
genre = media.get('Genre')
release_year = int_or_none(media.get('ReleaseYear'))
creator = media.get('Directors')
artist = media.get('Cast')
if media.get('MediaTypeDisplayValue') == 'Full Episode':
series = media.get('ShowName')
episode = title
season_number = int_or_none(media.get('Season'))
episode_number = int_or_none(media.get('Episode'))
else:
series = episode = season_number = episode_number = None
cc_files = media.get('ClosedCaptionFiles')
if isinstance(cc_files, list):
for cc_file in cc_files:
if not isinstance(cc_file, dict):
continue continue
ext = determine_ext(format_url) cc_url = url_or_none(cc_file.get('Path'))
if ext == 'm3u8': if not cc_url:
formats.extend(self._extract_m3u8_formats( continue
format_url, video_id, 'mp4', entry_protocol='m3u8_native', lang = cc_file.get('Locale') or 'en'
m3u8_id='hls', fatal=False)) subtitles.setdefault(lang, []).append({'url': cc_url})
elif ext == 'mpd':
formats.extend(self._extract_mpd_formats( thumbnails = []
format_url, video_id, mpd_id='dash', fatal=False)) images = media.get('Images')
elif format_url.endswith('.ism/Manifest'): if isinstance(images, list):
formats.extend(self._extract_ism_formats( for image_key, image_url in images.items():
format_url, video_id, ism_id='mss', fatal=False)) mobj = re.search(r'Img_(\d+)[xX](\d+)', image_key)
else: if not mobj:
mfs_path = e.get('Type') continue
mfs_info = self._MEDIA_FILE_SLOTS.get(mfs_path) thumbnails.append({
if not mfs_info: 'url': image_url,
continue 'width': int(mobj.group(1)),
formats.append({ 'height': int(mobj.group(2)),
'url': format_url, })
'format_id': 'http-' + mfs_path.split('.')[0],
'width': mfs_info['width'], return {
'height': mfs_info['height'], 'id': video_id,
}) 'title': title,
self._sort_formats(formats) 'description': description,
'duration': duration,
description = media.get('Description') 'view_count': view_count,
duration = int_or_none(media.get( 'average_rating': average_rating,
'DurationInSeconds')) or parse_duration(media.get('Duration')) 'age_limit': age_limit,
view_count = int_or_none(media.get('CountViews')) 'genre': genre,
average_rating = float_or_none(media.get('UserRating')) 'creator': creator,
age_limit = parse_age_limit(media.get('Rating')) 'artist': artist,
genre = media.get('Genre') 'release_year': release_year,
release_year = int_or_none(media.get('ReleaseYear')) 'series': series,
creator = media.get('Directors') 'episode': episode,
artist = media.get('Cast') 'season_number': season_number,
'episode_number': episode_number,
if media.get('MediaTypeDisplayValue') == 'Full Episode': 'thumbnails': thumbnails,
series = media.get('ShowName') 'subtitles': subtitles,
episode = title 'formats': formats,
season_number = int_or_none(media.get('Season')) }
episode_number = int_or_none(media.get('Episode'))
else:
series = episode = season_number = episode_number = None
subtitles = {}
cc_files = media.get('ClosedCaptionFiles')
if isinstance(cc_files, list):
for cc_file in cc_files:
if not isinstance(cc_file, dict):
continue
cc_url = url_or_none(cc_file.get('Path'))
if not cc_url:
continue
lang = cc_file.get('Locale') or 'en'
subtitles.setdefault(lang, []).append({'url': cc_url})
thumbnails = []
images = media.get('Images')
if isinstance(images, list):
for image_key, image_url in images.items():
mobj = re.search(r'Img_(\d+)[xX](\d+)', image_key)
if not mobj:
continue
thumbnails.append({
'url': image_url,
'width': int(mobj.group(1)),
'height': int(mobj.group(2)),
})
return {
'id': video_id,
'title': title,
'description': description,
'duration': duration,
'view_count': view_count,
'average_rating': average_rating,
'age_limit': age_limit,
'genre': genre,
'creator': creator,
'artist': artist,
'release_year': release_year,
'series': series,
'episode': episode,
'season_number': season_number,
'episode_number': episode_number,
'thumbnails': thumbnails,
'subtitles': subtitles,
'formats': formats,
}
raise last_e

Write Preview
Loading…
Cancel
Save