pycaption 2.2.8__tar.gz → 2.2.10__tar.gz

{pycaption-2.2.8/pycaption.egg-info → pycaption-2.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.8
+Version: 2.2.10
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.2.8 → pycaption-2.2.10}/pycaption/scc/__init__.py

@@ -313,15 +313,17 @@ class SCCReader(BaseReader):
         for idx, word in enumerate(word_list):
             # ignore empty results or invalid commands
             word = word.strip()
-            previous_is_pac = idx > 0 and _is_pac_command(word_list[idx-1])
+            previous_is_pac_or_tab = idx > 0 and (
+                _is_pac_command(word_list[idx-1]) or word_list[idx-1] in PAC_TAB_OFFSET_COMMANDS
+            )
             if len(word) == 4:
                 self._translate_word(
                     word=word,
-                    previous_is_pac=previous_is_pac,
+                    previous_is_pac_or_tab=previous_is_pac_or_tab,
                     pacs_are_doubled=pacs_are_doubled
                 )
 
-    def _translate_word(self, word, previous_is_pac, pacs_are_doubled):
+    def _translate_word(self, word, previous_is_pac_or_tab, pacs_are_doubled):
         if self._handle_double_command(word, pacs_are_doubled):
             # count frames for timing
             self.time_translator.increment_frames()
@@ -330,7 +332,7 @@ class SCCReader(BaseReader):
         # TODO - check that all the positioning commands are here, or use
         # some other strategy to determine if the word is a command.
         if word in COMMANDS or _is_pac_command(word):
-            self._translate_command(word=word, previous_is_pac=previous_is_pac)
+            self._translate_command(word=word, previous_is_pac_or_tab=previous_is_pac_or_tab)
 
         # second, check if word is a special character
         elif word in SPECIAL_CHARS:
@@ -354,14 +356,12 @@ class SCCReader(BaseReader):
         # If we have doubled commands we're skipping also
         # doubled special characters and doubled extended characters
         # with only one member of each pair being displayed.
-        actionable_commands = {
-            key: COMMANDS[key] for key in COMMANDS.keys() if key != "94a1"
-        }
-        doubled_types = word in actionable_commands or _is_pac_command(word)
+        doubled_types = word in COMMANDS or _is_pac_command(word)
         if pacs_are_doubled:
             doubled_types = doubled_types or word in SPECIAL_CHARS or word in EXTENDED_CHARS
 
         if doubled_types and word == self.last_command:
+            self.last_command = ''
             return True
             # Fix for the <position> <tab offset> <position> <tab offset>
             # repetition
@@ -379,8 +379,6 @@ class SCCReader(BaseReader):
         return False
 
     def _translate_special_char(self, word):
-        self.buffer.handle_backspace(word)
-        # add to buffer
         self.buffer.add_chars(SPECIAL_CHARS[word])
 
     def _translate_extended_char(self, word):
@@ -395,7 +393,7 @@ class SCCReader(BaseReader):
         # add to buffer
         self.buffer.add_chars(EXTENDED_CHARS[word])
 
-    def _translate_command(self, word, previous_is_pac):
+    def _translate_command(self, word, previous_is_pac_or_tab):
         # if command is pop_up
         if word == '9420':
             self.buffer_dict.set_active('pop')
@@ -466,7 +464,7 @@ class SCCReader(BaseReader):
         else:
             self.buffer.interpret_command(
                 command=word,
-                previous_is_pac=previous_is_pac
+                previous_is_pac_or_tab=previous_is_pac_or_tab
             )
 
     def _translate_characters(self, word):

{pycaption-2.2.8 → pycaption-2.2.10}/pycaption/scc/specialized_collections.py

@@ -337,14 +337,15 @@ class InstructionNodeCreator:
 
         node.add_chars(*chars)
 
-    def interpret_command(self, command, previous_is_pac=None):
+    def interpret_command(self, command, previous_is_pac_or_tab=False):
         """Given a command determines whether to turn italics on or off,
         or to set the positioning
 
         This is mostly used to convert from the legacy-style commands
 
         :type command: str
-        :type mode: pop or roll or paint
+        :type previous_is_pac_or_tab: previous command code is for a PAC command
+        or a PAC_TAB_OFFSET_COMMANDS
         """
         self._update_positioning(command)
 
@@ -382,8 +383,7 @@ class InstructionNodeCreator:
 
         # mid row code that is not first code on the line
         # (previous node is not a break node)
-        # fixes OCTO-11022
-        if command in MID_ROW_CODES and not previous_is_pac:
+        if command in MID_ROW_CODES and not previous_is_pac_or_tab:
             if self.last_style == "italics off":
                 self.add_chars(' ')
             else:
@@ -456,12 +456,11 @@ class InstructionNodeCreator:
             return
         last_char = node.text[-1]
         delete_previous_condition = (
-            (word in SPECIAL_CHARS and last_char not in SPECIAL_CHARS.values()) or
             (word in EXTENDED_CHARS and last_char not in EXTENDED_CHARS.values()) or
             word == "94a1"
         )
-        # in case of special / extended char, perform backspace
-        # only if the previous character in not also special / extended
+        # in case extended char, perform backspace
+        # only if the previous character in not also extended
         if delete_previous_condition:
             node.text = node.text[:-1]
 

{pycaption-2.2.8 → pycaption-2.2.10/pycaption.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycaption
-Version: 2.2.8
+Version: 2.2.10
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.2.8 → pycaption-2.2.10}/setup.py

@@ -24,7 +24,7 @@ transcript_dependencies = [
 
 setup(
     name='pycaption',
-    version='2.2.8',
+    version='2.2.10',
     description='Closed caption converter',
     long_description=open(README_PATH).read(),
     author='Joe Norton',

{pycaption-2.2.8 → pycaption-2.2.10}/tests/fixtures/dfxp.py

@@ -920,10 +920,10 @@ def sample_dfxp_from_scc_output():
    <region tts:displayAlign="before" tts:origin="40% 53%" tts:textAlign="left" xml:id="r5"/>
    <region tts:displayAlign="before" tts:origin="70% 17%" tts:textAlign="left" xml:id="r6"/>
    <region tts:displayAlign="before" tts:origin="20% 35%" tts:textAlign="left" xml:id="r7"/>
-   <region tts:displayAlign="before" tts:origin="25% 83%" tts:textAlign="left" xml:id="r8"/>
+   <region tts:displayAlign="before" tts:origin="20% 83%" tts:textAlign="left" xml:id="r8"/>
    <region tts:displayAlign="before" tts:origin="70% 11%" tts:textAlign="left" xml:id="r9"/>
    <region tts:displayAlign="before" tts:origin="40% 41%" tts:textAlign="left" xml:id="r10"/>
-   <region tts:displayAlign="before" tts:origin="25% 71%" tts:textAlign="left" xml:id="r11"/>
+   <region tts:displayAlign="before" tts:origin="20% 71%" tts:textAlign="left" xml:id="r11"/>
   </layout>
  </head>
  <body>

{pycaption-2.2.8 → pycaption-2.2.10}/tests/test_scc.py

@@ -77,10 +77,10 @@ class TestSCCReader(ReaderTestingMixIn):
             ((40.0, UnitEnum.PERCENT), (53.0, UnitEnum.PERCENT)),
             ((70.0, UnitEnum.PERCENT), (17.0, UnitEnum.PERCENT)),
             ((20.0, UnitEnum.PERCENT), (35.0, UnitEnum.PERCENT)),
-            ((25.0, UnitEnum.PERCENT), (83.0, UnitEnum.PERCENT)),
+            ((20.0, UnitEnum.PERCENT), (83.0, UnitEnum.PERCENT)),
             ((70.0, UnitEnum.PERCENT), (11.0, UnitEnum.PERCENT)),
             ((40.0, UnitEnum.PERCENT), (41.0, UnitEnum.PERCENT)),
-            ((25.0, UnitEnum.PERCENT), (71.0, UnitEnum.PERCENT))
+            ((20.0, UnitEnum.PERCENT), (71.0, UnitEnum.PERCENT))
         ]
         actual_positioning = [
             caption_.layout_info.origin.serialized()
@@ -204,10 +204,10 @@ class TestSCCReader(ReaderTestingMixIn):
 
     def test_skip_duplicate_tab_offset(self, sample_scc_duplicate_tab_offset):
         expected_lines = [
-            '[Radio reporter] ',
-            'The I-10 Santa Monica Freeway ',
+            '[Radio reporter]',
+            'The I-10 Santa Monica Freeway',
             'westbound is jammed,',
-            'due to a three-car accident ',
+            'due to a three-car accident',
             'blocking lanes 1 and 2'
         ]
 
@@ -218,15 +218,14 @@ class TestSCCReader(ReaderTestingMixIn):
             for node in cap_.nodes
             if node.type_ == CaptionNode.TEXT
         ]
-
         assert expected_lines == actual_lines
 
     def test_skip_duplicate_special_characters(
             self, sample_scc_duplicate_special_characters):
         expected_lines = [
-            '®°½¿™¢£♪à èâêîôû',   # double commands so we skip one
-            '®°½¿™¢£♪à èâêîôû',   # no double command, nothing skipped equal with above
-            '®°A½¿™¢£♪à èâêAîôû'  # no skips but a couple of normal chars "c1c1" = AA
+            '®°½¿™¢£♪à èâêîôû',
+            '®°½¿™¢£♪à èâêîôû',
+            '®°AA½¿™¢£♪à èâêAAîôû'
         ]
 
         caption_set = SCCReader().read(sample_scc_duplicate_special_characters)
@@ -274,21 +273,21 @@ class TestCoverageOnly:
         actual_texts = [cap_.nodes[0].content for cap_ in captions]
         expected_texts = [
             '>>> HI.',
-             "I'M KEVIN CUNNING AND AT",
-             "INVESTOR'S BANK WE BELIEVE IN",
-             'HELPING THE LOCAL NEIGHBORHOODS',
-             'AND IMPROVING THE LIVES OF ALL',
-             'WE SERVE.',
-             '®°½',
-             'Aû',
-             'ÁÉÓ¡',
-             "WHERE YOU'RE STANDING NOW,",
-             "LOOKING OUT THERE, THAT'S AL",
-             'THE CROWD.',
-             '>> IT WAS GOOD TO BE IN TH',
-             "And restore Iowa's land, water",
-             'And wildlife.',
-             '>> Bike Iowa, your source for'
+            "I'M KEVIN CUNNING AND AT",
+            "INVESTOR'S BANK WE BELIEVE IN",
+            'HELPING THE LOCAL NEIGHBORHOODS',
+            'AND IMPROVING THE LIVES OF ALL',
+            'WE SERVE.',
+            '®°½',
+            'ABû',
+            'ÁÉÓ¡',
+            "WHERE YOU'RE STANDING NOW,",
+            "LOOKING OUT THERE, THAT'S AL",
+            'THE CROWD.',
+            '>> IT WAS GOOD TO BE IN TH',
+            "And restore Iowa's land, water",
+            'And wildlife.',
+            '>> Bike Iowa, your source for'
         ]
         assert expected_texts == actual_texts