flinventory 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

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/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.dist-info → flinventory-0.6.3.dist-info}/METADATA

@@ -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.dist-info → flinventory-0.6.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
-flinventory-0.6.1.dist-info/METADATA,sha256=o8gLB774_aSvpZRmX5VwJ4XcVRCmm-hzQbGKaEQDPmk,4907
-flinventory-0.6.1.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-flinventory-0.6.1.dist-info/entry_points.txt,sha256=De3jjbHfy68_ZrwdjywlgrSUCn4QhqZGI0CJJt9S8_c,78
-flinventory-0.6.1.dist-info/licenses/LICENSE,sha256=9c-AWlAEeFMmn1aODEfabsw2he-SpQeykurYw-KqSdw,34478
+flinventory-0.6.3.dist-info/METADATA,sha256=nOBNNUxpd1398oquOYvcKheoGbu00MQ4-0h6B4--NU0,4907
+flinventory-0.6.3.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+flinventory-0.6.3.dist-info/entry_points.txt,sha256=De3jjbHfy68_ZrwdjywlgrSUCn4QhqZGI0CJJt9S8_c,78
+flinventory-0.6.3.dist-info/licenses/LICENSE,sha256=9c-AWlAEeFMmn1aODEfabsw2he-SpQeykurYw-KqSdw,34478
 flinventory/__init__.py,sha256=0HTGxw9J-2KnbxQbzX6HH-Pztkp0BEjiHANhndfbtYM,270
 flinventory/__main__.py,sha256=5U_RxWDlnhzlC98RaE8SkejjiYjv27OLdm5DPYgL4Gw,1295
 flinventory/box.py,sha256=rk7yrAjVdxcrpvmTMt3jkMVOAoQNJfqoSig9U2S3yJ0,10480
-flinventory/constant.py,sha256=pPNCwScLon_MOKL9_jjD_sxqB7Q2WW6rZqtrBl7SyWk,10283
+flinventory/constant.py,sha256=4qb7gX-pQdr7fGq25dTkESe6B53yi4yILOF4Y8KtWk0,10672
 flinventory/datacleanup.py,sha256=_CImmWJhq5uKz21jJQUqKYoQfbHEYA0000RyPRt5BI0,11363
 flinventory/defaulted_data.py,sha256=KAy6V2KLcifLg7zHBFnx_eFLp31sCWih1Btp6cE0bQc,21585
 flinventory/generate_labels.py,sha256=wjlyta9gowWOLvVfOVUQ8Ktpv3eg85JbAfDzI4Ok2V4,8476
 flinventory/inventory_io.py,sha256=OWThcf9nzeZNqvNpzQiBhESQAnVXC7hUA8DEVzq-w-Y,12561
 flinventory/location.py,sha256=UgJlbno16ipuFa4yUZK3SLrid70ACwE5He9Dd4P2SMU,16875
 flinventory/sign.py,sha256=8G7fsne3Nsf8zZKKTUl40uWMNsWIv7FYV2KcqBR2MQI,5515
-flinventory/signprinter_latex.py,sha256=mPu7C1AxOW3-qdA0XFkAhk9w5Z32nnRcZPD38kaqYDU,22940
+flinventory/signprinter_latex.py,sha256=3-5fUKYT4uzR8lEIsfMg4meJMgP_oiHQmqAzrNN7dgs,24819
 flinventory/thing.py,sha256=86fXj3RwTbkCdVVWrbyO-VEW_e5lKJlV8PPt1Xf8ejY,5079
 flinventory/thingtemplate_latex/.gitignore,sha256=DTF250Ttj8O2lxrQBwMNrQ73rWPvdwCytipfZSLFtlU,51
 flinventory/thingtemplate_latex/dummyImage.jpg,sha256=bIBH5Lrxlr5qJ42nP1cpJXPRNGLOwyEuzwXFSvNwTSk,147857
@@ -20,4 +20,4 @@ flinventory/thingtemplate_latex/sign.tex,sha256=cVlOjImuS97Gf19MGW27HiP6Uw8JNnob
 flinventory/thingtemplate_latex/signlist-footer.tex,sha256=LcZw5__h8SqgMmYxs5oLbXLaFTQlx_X5rtYnpxwUh9Y,14
 flinventory/thingtemplate_latex/signlist-header.tex,sha256=F1J4aSPq6QO_Ved4Zn7-rytP1vDkdWTqjjtGJpe_FDg,297
 flinventory/thingtemplate_latex/signs-example.tex,sha256=J6eCcPhP0Xklgn8xnSenDOvjzmc_NGmakWU4RGbeUtM,3090
-flinventory-0.6.1.dist-info/RECORD,,
+flinventory-0.6.3.dist-info/RECORD,,