md->pdf and Reorganize code

Author: Matistjati

problemtools/problem2html.py

@@ -5,7 +5,6 @@
 import string
 import argparse
 import subprocess
-from typing import Optional
 
 from . import tex2html
 from . import md2html

problemtools/problem2pdf.py

@@ -79,39 +79,50 @@ def latex2pdf(options: argparse.Namespace) -> bool:
     problembase = os.path.splitext(os.path.basename(problem_root))[0]
     destfile = string.Template(options.destfile).safe_substitute(problem=problembase)
 
-    # We skip PDF check when verifying problems with markdown statements
-    if os.path.isfile(os.path.join(problem, "problem_statement", "problem.%s.md" % options.language)) and ignore_markdown:
-        return True
+    if statement_common.find_statement_extension(problem_root, language=options.language) == "md":
+        statement_path = statement_common.find_statement(problem_root, extension="md", language=options.language)
 
     # Set up template if necessary
     with template.Template(problem_root, language=options.language) as templ:
         texfile = templ.get_file_name()
 
-        origcwd = os.getcwd()
+        statement_md += samples_md
+        with tempfile.NamedTemporaryFile(mode='w', suffix=".md") as temp_file:
+            temp_file.write(statement_md)
+            temp_file.flush()
+            # Do .read so that the file isn't deleted until pandoc is done
+            os.popen(f"pandoc {temp_file.name} -o {problembase}.pdf --resource-path={statement_dir}").read()
+
+    else:
+        # Set up template if necessary
+        with template.Template(problem_root, language=options.language) as templ:
+            texfile = templ.get_file_name()
+
+            origcwd = os.getcwd()
 
-        os.chdir(os.path.dirname(texfile))
-        params = ['pdflatex', '-interaction=nonstopmode']
-        output = None
-        if options.quiet:
-            output = open(os.devnull, 'w')
-        if options.nopdf:
-            params.append('-draftmode')
+            os.chdir(os.path.dirname(texfile))
+            params = ['pdflatex', '-interaction=nonstopmode']
+            output = None
+            if options.quiet:
+                output = open(os.devnull, 'w')
+            if options.nopdf:
+                params.append('-draftmode')
 
-        params.append(texfile)
+            params.append(texfile)
 
-        status = subprocess.call(params, stdout=output)
-        if status == 0:
             status = subprocess.call(params, stdout=output)
+            if status == 0:
+                status = subprocess.call(params, stdout=output)
 
-        if output is not None:
-            output.close()
+            if output is not None:
+                output.close()
 
-        os.chdir(origcwd)
+            os.chdir(origcwd)
 
-        if status == 0 and not options.nopdf:
-            shutil.move(os.path.splitext(texfile)[0] + '.pdf', destfile)
+            if status == 0 and not options.nopdf:
+                shutil.move(os.path.splitext(texfile)[0] + '.pdf', destfile)
 
-    return status == 0
+        return status == 0
 
 
 def get_parser() -> argparse.ArgumentParser:

problemtools/statement_common.py

@@ -1,11 +1,16 @@
 import os
+<<<<<<< HEAD
 from typing import Optional, List
 import html
 import tempfile
 import subprocess
 import re
 import json
 from pathlib import Path
+=======
+from typing import Optional
+import html
+>>>>>>> 5e2aecf (md->pdf and Reorganize code)
 
 from . import verifyproblem
 
@@ -29,7 +34,6 @@ def find_statement(problem_root: str, extension: str, language: Optional[str]) -
 
 def find_statement_extension(problem_root: str, language: Optional[str]) -> str:
     """Given a language, find whether the extension is tex or md
-
     Args:
         problem_root: path to problem root
     """

problemtools/verifyproblem.py

@@ -30,6 +30,7 @@
 from . import problem2html
 from . import statement_common
 from . import formatversion
+from . import statement_common
 
 from . import config
 from . import languages
@@ -1039,7 +1040,7 @@ def __init__(self, problem: Problem):
         self._problem = problem
         self.languages = []
         glob_path = os.path.join(problem.probdir, 'problem_statement', 'problem.')
-        for extension in problem2html.SUPPORTED_EXTENSIONS:
+        for extension in statement_common.SUPPORTED_EXTENSIONS:
             if glob.glob(glob_path + extension):
                 self.languages.append('')
             for f in glob.glob(glob_path + '[a-z][a-z].%s' % extension):
@@ -1065,7 +1066,7 @@ def check(self, context: Context) -> bool:
                 options.language = lang
                 options.nopdf = True
                 options.quiet = True
-                if not problem2pdf.convert(options, ignore_markdown=True):
+                if not problem2pdf.convert(options):
                     langparam = f' --language {lang}' if lang != '' else ''
                     self.error(f'Could not compile problem statement for language "{lang}".  Run problem2pdf{langparam} on the problem to diagnose.')
             except Exception as e:
@@ -1087,7 +1088,7 @@ def __str__(self) -> str:
 
     def get_config(self) -> dict[str, dict[str, str]]:
         ret: dict[str, dict[str, str]] = {}
-        for extension in problem2html.SUPPORTED_EXTENSIONS:
+        for extension in statement_common.SUPPORTED_EXTENSIONS:
             for lang in self.languages:
                 filename = f'problem.{lang}.{extension}' if lang != '' else 'problem.{extension}'
                 if not os.path.isfile(filename):