python-pptx2 3.1.0__tar.gz → 3.1.1__tar.gz

{python_pptx2-3.1.0 → python_pptx2-3.1.1}/HISTORY.rst

@@ -15,6 +15,18 @@ can sit beside both ``python-pptx`` (``pptx``) and ``power-pptx``
 .. _`scanny/python-pptx`: https://github.com/scanny/python-pptx
 
 
+3.1.1 (2026-09-03)
+++++++++++++++++++
+
+Changed
+
+- ``render_contact_sheet`` goes straight to the PDF export when a page
+  splitter (``pdftoppm`` or ``pypdfium2``) is available, instead of first
+  paying for a ``--convert-to png`` run that stock LibreOffice 7+ answers
+  with a single slide. Roughly halves the wall-clock of a visual check on
+  a multi-slide deck; ``"auto"`` remains the portable fallback.
+
+
 3.1.0 (2026-09-03)
 ++++++++++++++++++
 

{python_pptx2-3.1.0/src/python_pptx2.egg-info → python_pptx2-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pptx2
-Version: 3.1.0
+Version: 3.1.1
 Summary: Create, read, and update PowerPoint 2007+ (.pptx) files. Fork of power-pptx / python-pptx, published as python-pptx2.
 Author: Matěj Štágl
 Author-email: stagl@wattlescript.org

{python_pptx2-3.1.0 → python_pptx2-3.1.1}/src/pptx2/__init__.py

@@ -65,7 +65,7 @@ from pptx2.parts.slide import (
 if TYPE_CHECKING:
     from pptx2.opc.package import Part
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 sys.modules["pptx2.exceptions"] = exceptions
 del sys

{python_pptx2-3.1.0 → python_pptx2-3.1.1}/src/pptx2/render.py

@@ -324,6 +324,17 @@ def _render_via_pdf(
             pass
 
 
+def _pdf_splitter_available() -> bool:
+    """True when the PDF→PNG step can run (Poppler's pdftoppm or pypdfium2)."""
+    if shutil.which("pdftoppm") is not None:
+        return True
+    try:
+        import pypdfium2  # type: ignore[import-not-found]  # noqa: F401
+    except ImportError:
+        return False
+    return True
+
+
 def _pdf_to_pngs(pdf_path: Path, out_dir: Path, *, dpi: int) -> List[Path]:
     """Split a PDF into one PNG per page in *out_dir* and return the paths.
 
@@ -615,13 +626,18 @@ def render_contact_sheet(
 
     work_dir = Path(tempfile.mkdtemp(prefix="pptx-sheet-"))
     try:
+        # Stock LibreOffice 7+ writes only the first slide through the PNG
+        # filter, so for a multi-slide deck "auto" pays for a wasted soffice
+        # start before falling back to PDF. Go straight to PDF whenever a
+        # page splitter is available; "auto" remains the portable fallback.
+        strategy = "pdf" if _pdf_splitter_available() else "auto"
         paths = render_slide_thumbnails(
             prs,
             out_dir=work_dir,
             slide_indexes=slides,
             soffice_bin=soffice_bin,
             timeout=timeout,
-            strategy="auto",
+            strategy=strategy,
             dpi=dpi,
         )
         if not paths:

{python_pptx2-3.1.0 → python_pptx2-3.1.1/src/python_pptx2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pptx2
-Version: 3.1.0
+Version: 3.1.1
 Summary: Create, read, and update PowerPoint 2007+ (.pptx) files. Fork of power-pptx / python-pptx, published as python-pptx2.
 Author: Matěj Štágl
 Author-email: stagl@wattlescript.org

{python_pptx2-3.1.0 → python_pptx2-3.1.1}/tests/test_render_contact_sheet.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 from pathlib import Path
 from subprocess import CompletedProcess
 from unittest.mock import patch
@@ -30,13 +31,39 @@ def _fake_soffice_run(num_slides: int, size=(320, 180)):
     return _runner
 
 
+def _fake_pdf_pipeline(num_slides: int, size=(320, 180)):
+    """Stand-ins for ``soffice --convert-to pdf`` + the page splitter."""
+
+    def _soffice_pdf(soffice_bin, deck_path, out_dir, timeout):
+        (Path(out_dir) / "_render_input.pdf").write_bytes(b"%PDF-1.4 fake")
+        return CompletedProcess(args=[], returncode=0, stdout=b"", stderr=b"")
+
+    def _split(pdf_path, out_dir, *, dpi):
+        pages = []
+        for i in range(num_slides):
+            p = Path(out_dir) / f"page-{i + 1}.png"
+            Image.new("RGB", size, (200, 200 + i * 10, 200)).save(p)
+            pages.append(p)
+        return pages
+
+    return _soffice_pdf, _split
+
+
+@contextlib.contextmanager
+def _mocked_png_renderer(num_slides: int):
+    """Mock a LibreOffice that writes every slide through the PNG filter and has no PDF splitter."""
+    with (
+        patch("pptx2.render.shutil.which", return_value="/usr/bin/soffice"),
+        patch("pptx2.render._pdf_splitter_available", return_value=False),
+        patch("pptx2.render._run_soffice", side_effect=_fake_soffice_run(num_slides)),
+    ):
+        yield
+
+
 class DescribeRenderContactSheet:
     def it_tiles_every_slide_into_one_png(self, tmp_path, five_slide_prs):
         out = tmp_path / "sheet.png"
-        with (
-            patch("pptx2.render.shutil.which", return_value="/usr/bin/soffice"),
-            patch("pptx2.render._run_soffice", side_effect=_fake_soffice_run(5)),
-        ):
+        with _mocked_png_renderer(5):
             written = render_contact_sheet(five_slide_prs, out, cols=3, thumb_width=160, gap=10)
         assert written == out
         assert out.is_file()
@@ -46,22 +73,32 @@ class DescribeRenderContactSheet:
 
     def it_respects_a_slide_subset(self, tmp_path, five_slide_prs):
         out = tmp_path / "subset.png"
-        with (
-            patch("pptx2.render.shutil.which", return_value="/usr/bin/soffice"),
-            patch("pptx2.render._run_soffice", side_effect=_fake_soffice_run(5)),
-        ):
+        with _mocked_png_renderer(5):
             render_contact_sheet(five_slide_prs, out, slides=[0, 4], cols=2, thumb_width=100, gap=0)
         with Image.open(out) as sheet:
             assert sheet.size == (200, 56)
 
     def it_is_reachable_from_the_presentation(self, tmp_path, five_slide_prs):
         out = tmp_path / "via-prs.png"
+        with _mocked_png_renderer(5):
+            five_slide_prs.render_contact_sheet(out, cols=5, thumb_width=64)
+        assert out.is_file()
+
+    def it_goes_straight_to_pdf_when_a_splitter_exists(self, tmp_path, five_slide_prs):
+        """Stock LibreOffice 7+ only writes slide 1 as PNG; skip that wasted start."""
+        soffice_pdf, split = _fake_pdf_pipeline(5)
+        out = tmp_path / "pdf-path.png"
         with (
             patch("pptx2.render.shutil.which", return_value="/usr/bin/soffice"),
-            patch("pptx2.render._run_soffice", side_effect=_fake_soffice_run(5)),
+            patch("pptx2.render._pdf_splitter_available", return_value=True),
+            patch("pptx2.render._run_soffice") as png_filter,
+            patch("pptx2.render._run_soffice_pdf", side_effect=soffice_pdf),
+            patch("pptx2.render._pdf_to_pngs", side_effect=split),
         ):
-            five_slide_prs.render_contact_sheet(out, cols=5, thumb_width=64)
-        assert out.is_file()
+            render_contact_sheet(five_slide_prs, out, cols=5, thumb_width=64, gap=0)
+        png_filter.assert_not_called()
+        with Image.open(out) as sheet:
+            assert sheet.size == (5 * 64, 36)
 
     def it_raises_unavailable_when_soffice_is_missing(self, tmp_path, five_slide_prs):
         with (