diff options
| author | Remita Amine <remitamine@gmail.com> | 2020-12-02 21:37:14 +0100 |
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2020-12-02 21:49:09 +0100 |
| commit | 664dd8ba854238207fa1421a4f353606406dcded (patch) | |
| tree | 6b547644c63eb2997f71df84bd990a4205313ce5 | |
| parent | 64554c12e121a5dc0ab3f715fbf2452e5969a722 (diff) | |
| download | youtube-dl-664dd8ba854238207fa1421a4f353606406dcded.tar.gz youtube-dl-664dd8ba854238207fa1421a4f353606406dcded.tar.xz youtube-dl-664dd8ba854238207fa1421a4f353606406dcded.zip | |
[extractor/common] improve Akamai HTTP format extraction
- Allow m3u8 manifest without an additional audio format - Fix extraction for qualities starting with a number Solution provided by @nixxo based on: https://stackoverflow.com/a/5984688
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 16aff885c..4463e06b3 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -2623,7 +2623,7 @@ class InfoExtractor(object): REPL_REGEX = r'https://[^/]+/i/([^,]+),([^/]+),([^/]+).csmil/.+' qualities = re.match(REPL_REGEX, m3u8_url).group(2).split(',') qualities_length = len(qualities) - if len(formats) in (qualities_length + 1, qualities_length * 2 + 1): + if len(formats) in (qualities_length, qualities_length + 1, qualities_length * 2, qualities_length * 2 + 1): i = 0 http_formats = [] for f in formats: @@ -2632,7 +2632,7 @@ class InfoExtractor(object): http_f = f.copy() del http_f['manifest_url'] http_url = re.sub( - REPL_REGEX, protocol + r'://%s/\1%s\3' % (http_host, qualities[i]), f['url']) + REPL_REGEX, protocol + r'://%s/\g<1>%s\3' % (http_host, qualities[i]), f['url']) http_f.update({ 'format_id': http_f['format_id'].replace('hls-', protocol + '-'), 'url': http_url, |