pycaption 2.2.21__tar.gz → 2.2.22__tar.gz

{pycaption-2.2.21/pycaption.egg-info → pycaption-2.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycaption
-Version: 2.2.21
+Version: 2.2.22
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.2.21 → pycaption-2.2.22}/pycaption/scc/__init__.py

@@ -484,8 +484,17 @@ class SCCReader(BaseReader):
 
         # 942c - Erase Displayed Memory - Clear the current screen of any
         # displayed captions or text.
-        elif word == "942c" and self.pop_ons_queue:
-            self._pop_on(end=self.time_translator.get_time())
+        elif word == "942c":
+            edm_time = self.time_translator.get_time()
+            if self.pop_ons_queue:
+                self._pop_on(end=edm_time)
+            if self.buffer_dict.active_key in ("paint", "roll") \
+                    and not self.buffer.is_empty():
+                self.caption_stash.create_and_store(
+                    self.buffer, self.time, edm_time)
+                self.buffer = self.node_creator_factory.new_creator()
+                self.node_creator_factory.position_tracker.reset_for_new_caption()
+                self.time = edm_time
 
         # If command is not one of the aforementioned, add it to buffer
         else:

{pycaption-2.2.21 → pycaption-2.2.22/pycaption.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycaption
-Version: 2.2.21
+Version: 2.2.22
 Summary: Closed caption converter
 Author: Joe Norton
 Author-email: joey@nortoncrew.com

{pycaption-2.2.21 → pycaption-2.2.22}/setup.py

@@ -20,7 +20,7 @@ transcript_dependencies = ["nltk==3.9.1"]
 
 setup(
     name="pycaption",
-    version="2.2.21",
+    version="2.2.22",
     description="Closed caption converter",
     long_description=open(README_PATH).read(),
     author="Joe Norton",

{pycaption-2.2.21 → pycaption-2.2.22}/tests/conftest.py

@@ -123,6 +123,7 @@ from tests.fixtures.scc import (  # noqa: F401
     sample_scc_with_spaces_at_eol_pop,
     sample_scc_with_spaces_at_eol_roll,
     sample_scc_with_unknown_commands,
+    sample_scc_paint_on_edm,
     scc_that_generates_webvtt_with_proper_newlines,
 )
 from tests.fixtures.srt import (

{pycaption-2.2.21 → pycaption-2.2.22}/tests/fixtures/dfxp.py

@@ -963,7 +963,7 @@ def sample_dfxp_from_scc_output():
    <p begin="00:00:20.086" end="00:00:22.088" region="r9" style="default">
     2323
    </p>
-   <p begin="00:00:22.088" end="00:00:26.088" region="r10" style="default">
+   <p begin="00:00:22.088" end="00:00:36.169" region="r10" style="default">
     4545<br/>
     6767<br/>
     8989

{pycaption-2.2.21 → pycaption-2.2.22}/tests/fixtures/scc.py

@@ -643,3 +643,19 @@ Scenarist_SCC V1.0
 00:00:01:24	9429 91d0 c180 c220 91e0 c1c2 2020 2080 92c2 c1c2 2080
 
 """
+
+
+@pytest.fixture(scope="session")
+def sample_scc_paint_on_edm():
+    return """\
+Scenarist_SCC V1.0
+
+00:00:00;00	9429 4920 f468 e96e 6b80
+
+00:00:01;00	942c
+
+00:00:02;00	9429 c8e5 ecec ef80
+
+00:00:04;00	942c
+
+"""

{pycaption-2.2.21 → pycaption-2.2.22}/tests/test_scc.py

@@ -1000,3 +1000,21 @@ class TestTimingCorrectingCaptionList:
         num_captions = len(caption_set.get_captions("en-US"))
 
         assert num_captions == 2
+
+    def test_paint_on_edm_erases_displayed(self, sample_scc_paint_on_edm):
+        caption_set = SCCReader().read(sample_scc_paint_on_edm)
+        captions = caption_set.get_captions("en-US")
+
+        assert len(captions) == 2
+
+        texts = [
+            node.content
+            for caption in captions
+            for node in caption.nodes
+            if node.type_ == CaptionNode.TEXT
+        ]
+        assert texts == ["I think", "Hello"]
+
+        assert captions[0].end > captions[0].start
+        assert captions[1].end > captions[1].start
+        assert captions[0].end <= captions[1].start