Ghostscript fixes and tests

Author: Matistjati

problemtools/problem2pdf.py

@@ -133,25 +133,27 @@ def latex2pdf(options: argparse.Namespace) -> bool:
     if status:
         return False
 
-    try:
-        with tempfile.NamedTemporaryFile(suffix='.pdf') as f:
-            command = [
-                'gs',
-                '-q',
-                '-dBATCH',
-                '-sDEVICE=pdfwrite',
-                '-dNOPAUSE',
-                '-dCompatibilityLevel=1.7',
-                f'-sOutputFile={f.name}',
-                destfile,
-            ]
-            gs_status = subprocess.run(command, capture_output=True, text=True, shell=False, check=True)
-            if gs_status:
-                return False
-            shutil.copy(f.name, destfile)
-    except subprocess.CalledProcessError as e:
-        print(f'Error sanitizing PDF: {e} {e.stderr}')
-        raise
+    # We only sanitize if a PDF was created
+    if not options.nopdf:
+        try:
+            with tempfile.NamedTemporaryFile(suffix='.pdf') as f:
+                command = [
+                    'gs',
+                    '-q',
+                    '-dBATCH',
+                    '-sDEVICE=pdfwrite',
+                    '-dNOPAUSE',
+                    '-dCompatibilityLevel=1.7',
+                    f'-sOutputFile={f.name}',
+                    destfile,
+                ]
+                gs_status = subprocess.run(command, capture_output=True, text=True, shell=False, check=True)
+                if gs_status.returncode != 0:
+                    return False
+                shutil.copy(f.name, destfile)
+        except subprocess.CalledProcessError as e:
+            print(f'Error sanitizing PDF: {e} {e.stderr}')
+            raise
 
     return True
 

tests/test_latex.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+import tempfile
+
+from problemtools import problem2pdf
+
+
+def test_pdf_render_verifyproblem():
+    # Same options as in verifyproblem
+    options = problem2pdf.get_parser().parse_args([''])
+    problem_path = Path(__file__).parent / '..' / 'examples' / 'guess'
+    options.problem = str(problem_path.resolve())
+    options.language = 'en'
+    options.nopdf = True
+    options.quiet = True
+    if not problem2pdf.convert(options):
+        assert False, 'PDF conversion failed'
+
+
+def test_pdf_render_problem2pdf():
+    # Same options as typical problem2pdf usage
+    with tempfile.TemporaryDirectory() as temp_dir:
+        options = problem2pdf.get_parser().parse_args([''])
+        problem_path = Path(__file__).parent / '..' / 'examples' / 'guess'
+        options.problem = str(problem_path.resolve())
+        options.language = 'en'
+        options.quiet = True
+        options.dest_dir = str(temp_dir)
+        if not problem2pdf.convert(options):
+            assert False, 'PDF conversion failed'

tests/test_markdown.py

@@ -1,7 +1,17 @@
 from pathlib import Path
+
+import pytest
 from tests.test_xss import render, renderpdf
 from problemtools.statement_util import find_footnotes
-import pytest
+
+# TODO: add when guess is updated to 2023-07
+# def test_pdf_render():
+#     with tempfile.TemporaryDirectory() as temp_dir:
+#         problem_path = Path(__file__).parent / '..' / 'examples' / 'guess'
+#         args, _unknown = problem2pdf.get_parser().parse_known_args(
+#                 ['--problem', str(problem_path.resolve()), '-l', 'sv', '--dest-dir', str(temp_dir)]
+#             )
+#         problem2pdf.convert(args)
 
 
 def test_sample_escaping():