diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-04-29 21:32:31 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-05-01 04:58:38 +0530 |
| commit | 3fe75fdc803d50820ddf643dc5184c01162451c4 (patch) | |
| tree | 626c8680a719e0f2177358c132039c8a39f05766 /yt_dlp/utils.py | |
| parent | 6f7563beb7509aba2f8b1f03fd37e52427dcfecb (diff) | |
| download | hypervideo-pre-3fe75fdc803d50820ddf643dc5184c01162451c4.tar.lz hypervideo-pre-3fe75fdc803d50820ddf643dc5184c01162451c4.tar.xz hypervideo-pre-3fe75fdc803d50820ddf643dc5184c01162451c4.zip | |
[cleanup] Misc fixes (see desc)
* Do not warn when fixup is skipped for existing file
* [fragment] Fix `--skip-unavailable-fragments` for HTTP Errors
* [utils] write_string: Fix bug in 59f943cd5097e9bdbc3cb3e6b5675e43d369341a
* [utils] parse_codecs: Subtitle codec is generally referred to as `scodec`. https://github.com/yt-dlp/yt-dlp/pull/2174#discussion_r790156048
* [docs] Remove note about permissions. Closes #3597
Diffstat (limited to 'yt_dlp/utils.py')
| -rw-r--r-- | yt_dlp/utils.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index fc9eb253b..0b28b0926 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -1859,7 +1859,7 @@ def write_string(s, out=None, encoding=None): from .compat import WINDOWS_VT_MODE # Must be imported locally if WINDOWS_VT_MODE: - s = s.replace('\n', ' \n') + s = re.sub(r'([\r\n]+)', r' \1', s) if 'b' in getattr(out, 'mode', ''): byt = s.encode(encoding or preferredencoding(), 'ignore') @@ -3177,7 +3177,7 @@ def parse_codecs(codecs_str): return {} split_codecs = list(filter(None, map( str.strip, codecs_str.strip().strip(',').split(',')))) - vcodec, acodec, tcodec, hdr = None, None, None, None + vcodec, acodec, scodec, hdr = None, None, None, None for full_codec in split_codecs: parts = full_codec.split('.') codec = parts[0].replace('0', '') @@ -3195,16 +3195,16 @@ def parse_codecs(codecs_str): if not acodec: acodec = full_codec elif codec in ('stpp', 'wvtt',): - if not tcodec: - tcodec = full_codec + if not scodec: + scodec = full_codec else: write_string(f'WARNING: Unknown codec {full_codec}\n') - if vcodec or acodec or tcodec: + if vcodec or acodec or scodec: return { 'vcodec': vcodec or 'none', 'acodec': acodec or 'none', 'dynamic_range': hdr, - **({'tcodec': tcodec} if tcodec is not None else {}), + **({'scodec': scodec} if scodec is not None else {}), } elif len(split_codecs) == 2: return { |