From 31fe37178279b5bfdb49351b176e394f431cc1b4 Mon Sep 17 00:00:00 2001 From: JayZed Date: Sat, 22 Mar 2025 14:44:45 -0400 Subject: [PATCH] Fix for prior uppercase mod fix --- custom_libs/subzero/modification/main.py | 2 +- custom_libs/subzero/modification/mods/__init__.py | 2 +- custom_libs/subzero/modification/mods/common.py | 2 +- custom_libs/subzero/modification/mods/hearing_impaired.py | 4 ++-- custom_libs/subzero/modification/mods/ocr_fixes.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/custom_libs/subzero/modification/main.py b/custom_libs/subzero/modification/main.py index 849a77f76..011aaacf3 100644 --- a/custom_libs/subzero/modification/main.py +++ b/custom_libs/subzero/modification/main.py @@ -118,7 +118,7 @@ class SubtitleModifications(object): identifier, self.language) continue - if mod_cls.only_uppercase and not self.mostly_uppercase: + if mod_cls.mostly_uppercase and not self.mostly_uppercase: if self.debug: logger.debug("Skipping %s, because the subtitle isn't all uppercase", identifier) continue diff --git a/custom_libs/subzero/modification/mods/__init__.py b/custom_libs/subzero/modification/mods/__init__.py index b1a828ad4..3b894e80d 100644 --- a/custom_libs/subzero/modification/mods/__init__.py +++ b/custom_libs/subzero/modification/mods/__init__.py @@ -19,7 +19,7 @@ class SubtitleModification(object): order = None modifies_whole_file = False # operates on the whole file, not individual entries apply_last = False - only_uppercase = False + mostly_uppercase = False pre_processors = [] processors = [] post_processors = [] diff --git a/custom_libs/subzero/modification/mods/common.py b/custom_libs/subzero/modification/mods/common.py index d507347ae..c10d74bf4 100644 --- a/custom_libs/subzero/modification/mods/common.py +++ b/custom_libs/subzero/modification/mods/common.py @@ -175,7 +175,7 @@ class FixUppercase(SubtitleModification): modifies_whole_file = True exclusive = True order = 41 - only_uppercase = True + mostly_uppercase = True apply_last = True long_description = "Some subtitles are in all-uppercase letters. This at least makes them readable." diff --git a/custom_libs/subzero/modification/mods/hearing_impaired.py b/custom_libs/subzero/modification/mods/hearing_impaired.py index 49bf57096..ae86ef751 100644 --- a/custom_libs/subzero/modification/mods/hearing_impaired.py +++ b/custom_libs/subzero/modification/mods/hearing_impaired.py @@ -73,7 +73,7 @@ class HearingImpaired(SubtitleTextModification): # all caps line (at least 4 consecutive uppercase chars) NReProcessor(re.compile(r'(?u)(^(?=.*[A-ZÀ-Ž&+]{4,})[A-ZÀ-Ž-_\s&+]+$)'), "", name="HI_all_caps", - supported=lambda p: not p.only_uppercase), + supported=lambda p: not p.mostly_uppercase), # remove MAN: NReProcessor(re.compile(r'(?suxi)(\b(?:WO)MAN:\s*)'), "", name="HI_remove_man"), @@ -83,7 +83,7 @@ class HearingImpaired(SubtitleTextModification): # all caps at start before new sentence NReProcessor(re.compile(r'(?u)^(?=[A-ZÀ-Ž]{4,})[A-ZÀ-Ž-_\s]+\s([A-ZÀ-Ž][a-zà-ž].+)'), r"\1", - name="HI_starting_upper_then_sentence", supported=lambda p: not p.only_uppercase), + name="HI_starting_upper_then_sentence", supported=lambda p: not p.mostly_uppercase), ] post_processors = empty_line_post_processors diff --git a/custom_libs/subzero/modification/mods/ocr_fixes.py b/custom_libs/subzero/modification/mods/ocr_fixes.py index 1b2940dcd..f50ffd41f 100644 --- a/custom_libs/subzero/modification/mods/ocr_fixes.py +++ b/custom_libs/subzero/modification/mods/ocr_fixes.py @@ -41,7 +41,7 @@ class FixOCR(SubtitleTextModification): # don't modify stuff inside quotes #NReProcessor(re.compile(r'(?u)(^[^"\'’ʼ❜‘‛”“‟„]*(?<=[A-ZÀ-Ž]{3})[A-ZÀ-Ž-_\s0-9]+)' # r'(["\'’ʼ❜‘‛”“‟„]*[.,‚،⹁、;]+)(\s*)(?!["\'’ʼ❜‘‛”“‟„])'), - # r"\1:\3", name="OCR_fix_HI_colons", supported=lambda p: not p.only_uppercase), + # r"\1:\3", name="OCR_fix_HI_colons", supported=lambda p: not p.mostly_uppercase), # fix F'bla NReProcessor(re.compile(r'(?u)(\bF)(\')([A-zÀ-ž]*\b)'), r"\1\3", name="OCR_fix_F"), WholeLineProcessor(self.data_dict["WholeLines"], name="OCR_replace_line"),