flinventory 0.6.1__tar.gz → 0.6.3__tar.gz

{flinventory-0.6.1 → flinventory-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flinventory
-Version: 0.6.1
+Version: 0.6.3
 Summary: An inventory system for self-help repair shops
 Author-Email: flukx <flinventory-flukx@612211124.xyz>
 License: GPL3

{flinventory-0.6.1 → flinventory-0.6.3}/flinventory/constant.py

@@ -283,3 +283,17 @@ def fix_deprecated_language_keys(
                     )
             # else: new_key not in data
             data[new_key] = {language: data[key]}
+
+
+class MissingProgramError(OSError):
+    """Error raised if an external program is called that does not exist."""
+
+    def __init__(self, program_name: str, *args):
+        """Create a MissingProgramError.
+
+        Args:
+            program_name: the name of the missing program
+            see OSError
+        """
+        super().__init__(*args)
+        self.program_name = program_name

{flinventory-0.6.1 → flinventory-0.6.3}/flinventory/signprinter_latex.py

@@ -13,6 +13,7 @@ from typing import Union, Iterable, Optional
 
 from .box import BoxedThing
 from .sign import Sign
+import constant
 
 from . import thingtemplate_latex
 
@@ -23,6 +24,14 @@ TEMPLATE_POST = "signlist-footer.tex"
 TEMPLATE_SIGN = "sign.tex"
 DUMMY_IMAGE = "dummyImage.jpg"
 AUX_DIR = "latexAux"
+LATEXMK_OPTIONS = [
+    "latexmk",
+    f"-aux-directory={AUX_DIR}",
+    "-pdf",
+    "-interaction=nonstopmode",
+    "-f",
+]
+# only the tex file needs to be added to the list
 
 UNIT = "cm"  # todo: replace by length_unit in options, includes scaling the constants
 # estimated by one example word
@@ -478,14 +487,30 @@ class SignPrinterLaTeX:
         return file_signs
 
     def create_signs_pdf(self, things: list[BoxedThing]):
-        """Create a pdf and latex files with signs."""
+        """Create a pdf and latex files with signs.
+
+        Raises:
+            ProgramMissingError: if no latexmk is available
+        """
         self.save_signs_latex(things)
-        latex = subprocess.run(
-            ["latexmk", self.signs_file, f"-aux-directory={AUX_DIR}", "-pdf"],
-            cwd=self.output_dir,
-            capture_output=True,
-            text=True,
-        )  # text=True makes output a str instead of bytes
+        try:
+            latex = subprocess.run(
+                LATEXMK_OPTIONS + [self.signs_file],
+                cwd=self.output_dir,
+                capture_output=True,
+                text=True,
+            )  # text=True makes output a str instead of bytes
+        except FileNotFoundError as program_missing:
+            if program_missing.filename == LATEXMK_OPTIONS[0]:
+                raise constant.MissingProgramError(
+                    LATEXMK_OPTIONS[0],
+                    program_missing.errno,
+                    f"Program {LATEXMK_OPTIONS[0]} missing.",
+                    program_missing.filename,
+                    program_missing.winerror,
+                ) from program_missing
+            else:
+                raise program_missing
         with open(
             os.path.join(self.output_dir, AUX_DIR, "latex_output.txt"), mode="w"
         ) as stdout_file:
@@ -507,6 +532,8 @@ class SignPrinterLaTeX:
             thing: the thing which sign should be created
         Returns:
             path of the created svg file. None if error
+        Raises:
+            ProgramMissingError: if latexmk or pdf2svg is not available
         """
         tex = self.create_latex_single_sign(thing)
         tex_hash = str(abs(hash(tex)))
@@ -521,12 +548,24 @@ class SignPrinterLaTeX:
             return file_svg
         with open(path_tex, mode="w") as file_tex_f:
             file_tex_f.write(tex)
-        latex = subprocess.run(
-            ["latexmk", file_tex, f"-aux-directory={AUX_DIR}", "-pdf"],
-            cwd=self.output_dir,
-            capture_output=True,
-            text=True,
-        )  # text=True makes output a str instead of bytes
+        try:
+            latex = subprocess.run(
+                LATEXMK_OPTIONS + [file_tex],
+                cwd=self.output_dir,
+                capture_output=True,
+                text=True,
+            )  # text=True makes output a str instead of bytes
+        except FileNotFoundError as program_missing:
+            if program_missing.filename == LATEXMK_OPTIONS[0]:
+                raise constant.MissingProgramError(
+                    LATEXMK_OPTIONS[0],
+                    program_missing.errno,
+                    f"Program {LATEXMK_OPTIONS[0]} missing.",
+                    program_missing.filename,
+                    program_missing.winerror,
+                ) from program_missing
+            else:
+                raise program_missing
         with open(
             os.path.join(self.output_dir, AUX_DIR, f"latex_output_{tex_hash}.txt"),
             mode="w",
@@ -546,11 +585,23 @@ class SignPrinterLaTeX:
             self.logger.error(error_message)
             print(error_message)
             return None
-        svg = subprocess.run(
-            ["pdf2svg", path_pdf, path_svg],
-            capture_output=True,
-            text=True,
-        )  # text=True makes output a str instead of bytes
+        try:
+            svg = subprocess.run(
+                ["pdf2svg", path_pdf, path_svg],
+                capture_output=True,
+                text=True,
+            )  # text=True makes output a str instead of bytes
+        except FileNotFoundError as program_missing:
+            if program_missing.filename == "pdf2svg":
+                raise constant.MissingProgramError(
+                    "pdf2svg",
+                    program_missing.errno,
+                    "Program pdf2svg missing.",
+                    program_missing.filename,
+                    program_missing.winerror,
+                ) from program_missing
+            else:
+                raise program_missing
         with open(
             os.path.join(self.output_dir, AUX_DIR, f"svg_output_{tex_hash}.txt"),
             mode="w",

{flinventory-0.6.1 → flinventory-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flinventory"
-version = "0.6.1"
+version = "0.6.3"
 description = "An inventory system for self-help repair shops"
 authors = [
     { name = "flukx", email = "flinventory-flukx@612211124.xyz" },