mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-23 17:02:30 +00:00
[funimation] Sort formats according to the relevant extractor-args
This commit is contained in:
parent
ff1dec819a
commit
e919569e67
@ -13,6 +13,7 @@
|
|||||||
js_to_json,
|
js_to_json,
|
||||||
str_or_none,
|
str_or_none,
|
||||||
try_get,
|
try_get,
|
||||||
|
qualities,
|
||||||
urlencode_postdata,
|
urlencode_postdata,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
)
|
)
|
||||||
@ -180,6 +181,8 @@ def _real_extract(self, url):
|
|||||||
|
|
||||||
formats, subtitles, thumbnails, duration = [], {}, [], 0
|
formats, subtitles, thumbnails, duration = [], {}, [], 0
|
||||||
requested_languages, requested_versions = self._configuration_arg('language'), self._configuration_arg('version')
|
requested_languages, requested_versions = self._configuration_arg('language'), self._configuration_arg('version')
|
||||||
|
language_preference = qualities((requested_languages or [''])[::-1])
|
||||||
|
source_preference = qualities((requested_versions or ['uncut', 'simulcast'])[::-1])
|
||||||
only_initial_experience = 'seperate-video-versions' in self.get_param('compat_opts', [])
|
only_initial_experience = 'seperate-video-versions' in self.get_param('compat_opts', [])
|
||||||
|
|
||||||
for lang, version, fmt in self._get_experiences(episode):
|
for lang, version, fmt in self._get_experiences(episode):
|
||||||
@ -227,10 +230,15 @@ def _real_extract(self, url):
|
|||||||
})
|
})
|
||||||
for f in current_formats:
|
for f in current_formats:
|
||||||
# TODO: Convert language to code
|
# TODO: Convert language to code
|
||||||
f.update({'language': lang, 'format_note': version})
|
f.update({
|
||||||
|
'language': lang,
|
||||||
|
'format_note': version,
|
||||||
|
'source_preference': source_preference(version.lower()),
|
||||||
|
'language_preference': language_preference(lang.lower()),
|
||||||
|
})
|
||||||
formats.extend(current_formats)
|
formats.extend(current_formats)
|
||||||
self._remove_duplicate_formats(formats)
|
self._remove_duplicate_formats(formats)
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats, ('lang', 'source'))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': initial_experience_id if only_initial_experience else episode_id,
|
'id': initial_experience_id if only_initial_experience else episode_id,
|
||||||
|
Loading…
Reference in New Issue
Block a user