kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[crunchyroll] Add extractor-args language and hardsub

Browse source 
Closes #1516
This commit is contained in:
pukkandan 2021-11-04 23:34:37 +05:30
parent c18d4482b1
commit a9d4da606d
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1559,6 +1559,10 @@ The following extractors use this feature:
* `language`: Languages to extract. Eg: `funimation:language=english,japanese` * `language`: Languages to extract. Eg: `funimation:language=english,japanese`
* `version`: The video version to extract - `uncut` or `simulcast` * `version`: The video version to extract - `uncut` or `simulcast`
#### crunchyroll
* `language`: Languages to extract. Eg: `crunchyroll:language=jaJp`
* `hardsub`: Which hard-sub versions to extract. Eg: `crunchyroll:hardsub=None,enUS`
#### vikichannel #### vikichannel
* `video_types`: Types of videos to download - one or more of `episodes`, `movies`, `clips`, `trailers` * `video_types`: Types of videos to download - one or more of `episodes`, `movies`, `clips`, `trailers`

20
yt_dlp/extractor/crunchyroll.py
View file

@ -27,6 +27,7 @@ from ..utils import (
int_or_none, int_or_none,
lowercase_escape, lowercase_escape,
merge_dicts, merge_dicts,
qualities,
remove_end, remove_end,
sanitized_Request, sanitized_Request,
try_get, try_get,
@ -478,19 +479,24 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
[r'<a[^>]+href="/publisher/[^"]+"[^>]*>([^<]+)</a>', r'<div>\s*Publisher:\s*<span>\s*(.+?)\s*</span>\s*</div>'], [r'<a[^>]+href="/publisher/[^"]+"[^>]*>([^<]+)</a>', r'<div>\s*Publisher:\s*<span>\s*(.+?)\s*</span>\s*</div>'],
webpage, 'video_uploader', default=False) webpage, 'video_uploader', default=False)
requested_languages = self._configuration_arg('language')
requested_hardsubs = [('' if val == 'none' else val) for val in self._configuration_arg('hardsub')]
language_preference = qualities((requested_languages or [language or ''])[::-1])
hardsub_preference = qualities((requested_hardsubs or ['', language or ''])[::-1])
formats = [] formats = []
for stream in media.get('streams', []): for stream in media.get('streams', []):
audio_lang = stream.get('audio_lang') audio_lang = stream.get('audio_lang') or ''
hardsub_lang = stream.get('hardsub_lang') hardsub_lang = stream.get('hardsub_lang') or ''
if (requested_languages and audio_lang.lower() not in requested_languages
or requested_hardsubs and hardsub_lang.lower() not in requested_hardsubs):
continue
vrv_formats = self._extract_vrv_formats( vrv_formats = self._extract_vrv_formats(
stream.get('url'), video_id, stream.get('format'), stream.get('url'), video_id, stream.get('format'),
audio_lang, hardsub_lang) audio_lang, hardsub_lang)
for f in vrv_formats: for f in vrv_formats:
f['language_preference'] = 1 if audio_lang == language else 0 f['language_preference'] = language_preference(audio_lang)
f['quality'] = ( f['quality'] = hardsub_preference(hardsub_lang)
1 if not hardsub_lang
else 0 if hardsub_lang == language
else -1)
formats.extend(vrv_formats) formats.extend(vrv_formats)
if not formats: if not formats:
available_fmts = [] available_fmts = []