github-mirrors/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-04-24 06:37:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed unwanted removal of subtitles format tags when using any mods. #2846

Browse source
This commit is contained in:
morpheus65535 2025-03-05 09:13:40 -05:00
parent 6cad2feeda
commit 1a93eb4049
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
custom_libs/subliminal_patch/subtitle.py
View file

@ -414,7 +414,7 @@ class Subtitle(Subtitle_):
encoding=self.get_encoding())
submods = SubtitleModifications(debug=debug)
if submods.load(content=self.text, language=self.language):
if submods.load(content=self.text, language=self.language, mods=self.mods):
logger.info("Applying mods: %s", self.mods)
submods.modify(*self.mods)
self.mods = submods.mods_used

11
custom_libs/subzero/modification/main.py
View file

@ -32,15 +32,18 @@ class SubtitleModifications(object):
self.initialized_mods = {}
self.mods_used = []
def load(self, fn=None, content=None, language=None, encoding="utf-8"):
def load(self, fn=None, content=None, language=None, encoding="utf-8", mods=None):
"""
:param encoding: used for decoding the content when fn is given, not used in case content is given
:param language: babelfish.Language language of the subtitle
:param fn: filename
:param content: unicode
:param mods: list of mods to be applied to subtitles
:return:
"""
if mods is None:
mods = []
if language:
self.language = Language.rebuild(language, forced=False)
self.initialized_mods = {}
@ -48,7 +51,11 @@ class SubtitleModifications(object):
if fn:
self.f = pysubs2.load(fn, encoding=encoding)
elif content:
self.f = pysubs2.SSAFile.from_string(content)
from_string_additional_kwargs = {}
if 'remove_tags' not in mods:
from_string_additional_kwargs = {'keep_html_tags': True, 'keep_unknown_html_tags': True,
'keep_ssa_tags': True}
self.f = pysubs2.SSAFile.from_string(content, **from_string_additional_kwargs)
except (IOError,
UnicodeDecodeError,
pysubs2.exceptions.UnknownFPSError,