flinventory 0.6.5__py3-none-any.whl → 0.6.9__py3-none-any.whl

flinventory/defaulted_data.py

@@ -106,7 +106,7 @@ class DefaultedDict(SuperDict):
         return tuple(self._lists)
 
     @property
-    def default_order(self) -> tuple[str]:
+    def default_order(self) -> tuple[str, ...]:
         """Default order of keys. Not changable."""
         return tuple(self._default_order)
 

flinventory/signprinter_latex.py

@@ -136,7 +136,9 @@ class SignPrinterLaTeX:
         try:
             value = float(value)
         except ValueError:
-            self.logger.error(f"{key} {value} is not a number. Use {backup} {UNIT} instead.")
+            self.logger.error(
+                f"{key} {value} is not a number. Use {backup} {UNIT} instead."
+            )
             return backup
         if value <= 0:
             self.logger.error(
@@ -163,6 +165,34 @@ class SignPrinterLaTeX:
             thing.sign, key="height", backup=STANDARD_HEIGHT, max=MAX_HEIGHT
         )
 
+    def image_height_vspace(
+        self, thing: BoxedThing, sign_height: Union[int, float]
+    ) -> tuple[Union[int, float], Union[int, float]]:
+        """Get the height of the image in the portrait sign.
+
+        In UNIT.
+        Args:
+            thing: the thing for which the sign is
+            sign_height: height of the sign. Needed for backup height.
+        """
+        if sign_height < MINIMAL_HEIGHT_FOR_IMAGE:
+            return (
+                self.controlled_length(
+                    thing.sign, key="imageheight", backup=0, max=sign_height
+                ),
+                r"-1.5\baselineskip",
+            )
+        else:
+            return (
+                self.controlled_length(
+                    thing.sign,
+                    key="imageheight",
+                    backup=sign_height * IMAGE_SHARE,
+                    max=sign_height,
+                ),
+                "1pt",
+            )
+
     def if_use_landscape_template(self, thing: BoxedThing):
         """Return if we want to use the landscape template for this thing.
 
@@ -357,7 +387,7 @@ class SignPrinterLaTeX:
         """Create latex code (as str) that shows one sign in a minimal document."""
         return "\n".join(
             (
-                r"\documentclass{standalone}",
+                r"\documentclass[12pt]{standalone}",
                 *(self.pre.splitlines()[2:]),
                 self.create_sign(thing),
                 self.post,
@@ -418,13 +448,9 @@ class SignPrinterLaTeX:
         if not insertions["location"]:  # empty string
             logging.warning(f"Print sign for {german} ({english}) without location.")
 
-        # todo: make image height configurable
-        if height < MINIMAL_HEIGHT_FOR_IMAGE:
-            insertions["imageheight"] = 0
-            insertions["vspace"] = r"-1.5\baselineskip"
-        else:
-            insertions["imageheight"] = height * IMAGE_SHARE
-            insertions["vspace"] = "1pt"
+        insertions["imageheight"], insertions["vspace"] = self.image_height_vspace(
+            thing, height
+        )
 
         # at first only portrait sign, landscape sign can be implemented later
         # if self.if_use_landscape_template(thing):  # would need different condition
@@ -506,7 +532,6 @@ class SignPrinterLaTeX:
                     program_missing.errno,
                     f"Program {LATEXMK_OPTIONS[0]} missing.",
                     program_missing.filename,
-                    program_missing.winerror,
                 ) from program_missing
             else:
                 raise program_missing
@@ -544,7 +569,7 @@ class SignPrinterLaTeX:
         path_svg = os.path.join(self.output_dir, file_svg)
         if os.path.isfile(path_tex) and os.path.isfile(path_svg):
             self.logger.info(f"Do not regenerate {tex_hash}.")
-            return file_svg
+            return path_svg
         with open(path_tex, mode="w") as file_tex_f:
             file_tex_f.write(tex)
         try:
@@ -561,7 +586,6 @@ class SignPrinterLaTeX:
                     program_missing.errno,
                     f"Program {LATEXMK_OPTIONS[0]} missing.",
                     program_missing.filename,
-                    program_missing.winerror,
                 ) from program_missing
             else:
                 raise program_missing
@@ -597,7 +621,6 @@ class SignPrinterLaTeX:
                     program_missing.errno,
                     "Program pdf2svg missing.",
                     program_missing.filename,
-                    program_missing.winerror,
                 ) from program_missing
             else:
                 raise program_missing

{flinventory-0.6.5.dist-info → flinventory-0.6.9.dist-info}/METADATA

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

{flinventory-0.6.5.dist-info → flinventory-0.6.9.dist-info}/RECORD

@@ -1,18 +1,18 @@
-flinventory-0.6.5.dist-info/METADATA,sha256=H7LRbD0_D_yuRhxNPbqGxQCfPrM1uN45c7GBN9vPpNw,4907
-flinventory-0.6.5.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-flinventory-0.6.5.dist-info/entry_points.txt,sha256=De3jjbHfy68_ZrwdjywlgrSUCn4QhqZGI0CJJt9S8_c,78
-flinventory-0.6.5.dist-info/licenses/LICENSE,sha256=9c-AWlAEeFMmn1aODEfabsw2he-SpQeykurYw-KqSdw,34478
+flinventory-0.6.9.dist-info/METADATA,sha256=ty2_JtfVbc87G_ubjtViXq7KuTG1Ble19jdVU_rxB9Y,4907
+flinventory-0.6.9.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+flinventory-0.6.9.dist-info/entry_points.txt,sha256=De3jjbHfy68_ZrwdjywlgrSUCn4QhqZGI0CJJt9S8_c,78
+flinventory-0.6.9.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=4qb7gX-pQdr7fGq25dTkESe6B53yi4yILOF4Y8KtWk0,10672
 flinventory/datacleanup.py,sha256=_CImmWJhq5uKz21jJQUqKYoQfbHEYA0000RyPRt5BI0,11363
-flinventory/defaulted_data.py,sha256=KAy6V2KLcifLg7zHBFnx_eFLp31sCWih1Btp6cE0bQc,21585
+flinventory/defaulted_data.py,sha256=WbchY7w4jg4K5gQMzoqkqX1utcSEs8y7234gMeEPi4E,21590
 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=f8v4wM5GguIpk6cxD_V4OeymFqPGwVsRgIFKvhq1zt8,24842
+flinventory/signprinter_latex.py,sha256=0mSW9p_v-55aHZ2Do0reZ2B-Qpk32lF1q0Yijvk9Vtw,25481
 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.5.dist-info/RECORD,,
+flinventory-0.6.9.dist-info/RECORD,,