Merge pull request #252 from pehrsoderman/restructure-problem2html

Restructure problem2html and problem2pdf

Author: pehrsoderman

problemtools/problem2html.py

@@ -14,9 +14,7 @@
 from .ProblemPlasTeX import ProblemsetMacros
 from . import template
 
-def convert(args: list[str]|None = None) -> None:
-    options = parse_args(args)
-
+def convert(options: argparse.Namespace) -> None:
     problem = os.path.realpath(options.problem)
 
     problembase = os.path.splitext(os.path.basename(problem))[0]
@@ -111,7 +109,7 @@ def convert(args: list[str]|None = None) -> None:
         os.chdir(origcwd)
 
 
-def parse_args(args: list[str]|None) -> argparse.Namespace:
+def get_parser() -> argparse.Namespace:
     parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('-b', '--body-only', dest='bodyonly', action='store_true', help='only generate HTML body, no HTML headers', default=False)
@@ -123,18 +121,15 @@ def parse_args(args: list[str]|None) -> argparse.Namespace:
     parser.add_argument('-l', '--language', dest='language', help='choose alternate language (2-letter code)', default=None)
     parser.add_argument('-L', '--log-level', dest='loglevel', help='set log level (debug, info, warning, error, critical)', default='warning')
     parser.add_argument('-q', '--quiet', dest='quiet', action='store_true', help="quiet", default=False)
+    parser.add_argument('-i', '--imgbasedir', dest='imgbasedir', default='')
     parser.add_argument('problem', help='the problem to convert')
 
-    if args is not None:
-        options = parser.parse_args(args)
-    else:
-        options = parser.parse_args()
-
-    options.imgbasedir = ''
-    return options
+    return parser
 
 def main() -> None:
-    convert()
+    parser = get_parser()
+    options = parser.parse_args()
+    convert(options)
 
 
 if __name__ == '__main__':

problemtools/problem2pdf.py

@@ -8,8 +8,7 @@
 from . import template
 
 
-def convert(args: list[str]|None = None) -> bool:
-    options = parse_args(args)
+def convert(options: argparse.Namespace) -> bool:
 
     problem = os.path.realpath(options.problem)
     problembase = os.path.splitext(os.path.basename(problem))[0]
@@ -46,7 +45,7 @@ def convert(args: list[str]|None = None) -> bool:
 
     return status == 0
 
-def parse_args(args: list[str]|None) -> argparse.Namespace:
+def get_parser() -> argparse.Namespace:
     parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('-o', '--output', dest='destfile', help="output file name", default='${problem}.pdf')
@@ -55,14 +54,13 @@ def parse_args(args: list[str]|None) -> argparse.Namespace:
     parser.add_argument('-n', '--no-pdf', dest='nopdf', action='store_true', help='run pdflatex in -draftmode', default=False)
     parser.add_argument('problem', help='the problem to convert')
 
-    if args is not None:
-        return parser.parse_args(args)
-
-    return parser.parse_args()
+    return parser
 
 
 def main() -> None:
-    convert()
+    parser = get_parser()
+    options = parser.parse_args()
+    convert(options)
 
 
 if __name__ == '__main__':

problemtools/verifyproblem.py

@@ -15,6 +15,8 @@
 import sys
 import copy
 import random
+import traceback
+
 import argparse
 import shlex
 
@@ -398,6 +400,10 @@ def get_subgroups(self) -> list[TestCaseGroup]:
         return [child for child in self._items if isinstance(child, TestCaseGroup)]
 
 
+    def get_subgroup(self, name):
+        return next((child for child in self._items if isinstance(child, TestCaseGroup) and os.path.basename(child._datadir) == name), None)
+
+
     def has_custom_groups(self) -> bool:
         return any(group.get_subgroups() for group in self.get_subgroups())
 
@@ -1076,16 +1082,26 @@ def check(self, args: argparse.Namespace) -> bool:
 
         for lang in self.languages:
             try:
-                if not problem2pdf.convert([self._problem.probdir, '--language', lang, '--no-pdf', '--quiet']):
+                options = problem2pdf.get_parser().parse_args([None])
+                options.problem = self._problem.probdir
+                options.language = lang
+                options.nopdf = True
+                options.quiet = 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:
-                self.error(f'Error raised when checking problem statement for language {lang}:\n{e}')
+                self.error(f'Error raised when checking problem statement for language {lang}:\n{e}\n{traceback.format_exc()}')
             try:
-                problem2html.convert([self._problem.probdir, '--dest-dir', os.path.join(self._problem.tmpdir, 'html'), '--language', lang, '--quiet'])
-            except Exception:
+                options = problem2html.get_parser().parse_args([None])
+                options.problem = self._problem.probdir
+                options.destdir = os.path.join(self._problem.tmpdir, 'html')
+                options.language = lang
+                options.quiet = True
+                problem2html.convert(options)
+            except Exception as e:
                 langparam = f' --language {lang}' if lang != '' else ''
-                self.error(f'Could not convert problem statement to html for language "{lang}".  Run problem2html{langparam} on the problem to diagnose.')
+                self.error(f'Could not convert problem statement to html for language "{lang}".  Run problem2html{langparam} on the problem to diagnose.\n{e}\n{traceback.format_exc()}')
         return self._check_res
 
     def __str__(self) -> str:
@@ -1138,6 +1154,11 @@ def check(self, args: argparse.Namespace) -> bool:
 
         return self._check_res
 
+
+    def get_attachment_paths(self):
+        return self.attachments
+
+
     def __str__(self) -> str:
         return 'attachments'