diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-11-30 17:19:55 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-11-30 17:19:55 -0500 |
| commit | ccf02e63e53e481824b56b4e05ab1c2a9558c9a7 (patch) | |
| tree | 41ad503be3ca01b0d83d0585f577bcf871b3f159 /yt_dlp/extractor/shemaroome.py | |
| parent | 54288332f1d8ec2974c65281e6a712e56b5cd24f (diff) | |
| parent | 1bad50eced921126ea6587d9ae99e98164da500b (diff) | |
| download | hypervideo-pre-ccf02e63e53e481824b56b4e05ab1c2a9558c9a7.tar.lz hypervideo-pre-ccf02e63e53e481824b56b4e05ab1c2a9558c9a7.tar.xz hypervideo-pre-ccf02e63e53e481824b56b4e05ab1c2a9558c9a7.zip | |
updated from upstream | 30/11/2021 at 17:19
Diffstat (limited to 'yt_dlp/extractor/shemaroome.py')
| -rw-r--r-- | yt_dlp/extractor/shemaroome.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yt_dlp/extractor/shemaroome.py b/yt_dlp/extractor/shemaroome.py index 142d5dc3a..00a5b00cd 100644 --- a/yt_dlp/extractor/shemaroome.py +++ b/yt_dlp/extractor/shemaroome.py @@ -16,7 +16,7 @@ from ..utils import ( class ShemarooMeIE(InfoExtractor): - _VALID_URL = r'(?:https?://)(?:www\.)?shemaroome\.com/(?:movies|shows)/(?P<id>[^?#]+)' + _VALID_URL = r'https?://(?:www\.)?shemaroome\.com/(?:movies|shows)/(?P<id>[^?#]+)' _TESTS = [{ 'url': 'https://www.shemaroome.com/movies/dil-hai-tumhaara', 'info_dict': { @@ -78,7 +78,7 @@ class ShemarooMeIE(InfoExtractor): iv = [0] * 16 m3u8_url = intlist_to_bytes(aes_cbc_decrypt(url_data, key, iv)) m3u8_url = m3u8_url[:-compat_ord((m3u8_url[-1]))].decode('ascii') - formats = self._extract_m3u8_formats(m3u8_url, video_id, fatal=False, headers={'stream_key': data_json['stream_key']}) + formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, fatal=False, headers={'stream_key': data_json['stream_key']}) self._sort_formats(formats) release_date = self._html_search_regex( @@ -91,6 +91,7 @@ class ShemarooMeIE(InfoExtractor): subtitles.setdefault('EN', []).append({ 'url': self._proto_relative_url(sub_url), }) + subtitles = self._merge_subtitles(subtitles, m3u8_subs) description = self._html_search_regex(r'(?s)>Synopsis(</.+?)</', webpage, 'description', fatal=False) return { |