From ee56bc87c22a32ee401713d9420071a83abbe73f Mon Sep 17 00:00:00 2001 From: rlaphoenix Date: Fri, 12 Jan 2024 00:51:06 +0000 Subject: [PATCH] Use new Subtitle.convert() in dl command for --sub-format --- devine/commands/dl.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/devine/commands/dl.py b/devine/commands/dl.py index 30eca40..c67b170 100644 --- a/devine/commands/dl.py +++ b/devine/commands/dl.py @@ -22,7 +22,6 @@ from uuid import UUID import click import jsonpickle -import pycaption import yaml from construct import ConstError from pymediainfo import MediaInfo @@ -583,28 +582,7 @@ class dl: with console.status(f"Converting Subtitles to {sub_format.name}..."): for subtitle in title.tracks.subtitles: if subtitle.codec != sub_format: - writer = { - Subtitle.Codec.SubRip: pycaption.SRTWriter, - Subtitle.Codec.SubStationAlpha: None, - Subtitle.Codec.SubStationAlphav4: None, - Subtitle.Codec.TimedTextMarkupLang: pycaption.DFXPWriter, - Subtitle.Codec.WebVTT: pycaption.WebVTTWriter, - # MPEG-DASH box-encapsulated subtitle formats - Subtitle.Codec.fTTML: None, - Subtitle.Codec.fVTT: None, - }[sub_format] - if writer is None: - self.log.error(f"Cannot yet convert {subtitle.codec} to {sub_format.name}...") - sys.exit(1) - - caption_set = subtitle.parse(subtitle.path.read_bytes(), subtitle.codec) - subtitle.merge_same_cues(caption_set) - - subtitle_text = writer().write(caption_set) - subtitle.path.write_text(subtitle_text, encoding="utf8") - - subtitle.codec = sub_format - subtitle.move(subtitle.path.with_suffix(f".{sub_format.value.lower()}")) + subtitle.convert(sub_format) with console.status("Repackaging tracks with FFMPEG..."): has_repacked = False