flinventory 2.2.2__tar.gz → 2.2.3__tar.gz

{flinventory-2.2.2 → flinventory-2.2.3}/PKG-INFO

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

{flinventory-2.2.2 → flinventory-2.2.3}/flinventory/labelprinter_typst.py

@@ -134,7 +134,7 @@ class LabelPrinter:
             thing: thing with sign and location. Use information from sign if it has it.
                 Otherwise, from label in location. Otherwise, None.
             key: the queried dimension
-            maximum: Maximum value. If None, do not check for maximum.
+            maximum: Maximum value (in unit `unit`). If None, do not check for maximum.
             unit: unit of the output
         """
         assert not isinstance(
@@ -143,8 +143,9 @@ class LabelPrinter:
         value = self.in_unit(self.get_label_value(thing, key), default_unit=unit)
         if value is None:
             return None
+        value = value / TYPST_UNITS[unit]
         value = value if maximum is None else min(value, maximum)
-        return f"{value}{unit}" if isinstance(value, int) else f"{value:3f}{unit}"
+        return f"{value}{unit}" if int(value) == value else f"{value:.3f}{unit}"
 
     def thing_data(self, thing: BoxedThing) -> dict[str, str]:
         """Get values for the insertion into the templates for one thing."""
@@ -154,13 +155,13 @@ class LabelPrinter:
             "name_1": thing.sign.get(("name", 0), None),
             "name_1_height": self.get_label_value(thing, ("name_height", 0)),
             "name_1_font_size": self.controlled_length(
-                thing, ("font_size", 0), unit="pt"
+                thing, ("font_size", 0), unit=FONT_UNIT
             ),
             "lang_1": thing.options.languages[0],  # one language is guaranteed
             "name_2": thing.sign.get(("name", 1), None),
             "name_2_height": self.get_label_value(thing, ("name_height", 1)),
             "name_2_font_size": self.controlled_length(
-                thing, ("font_size", 1), unit="pt"
+                thing, ("font_size", 1), unit=FONT_UNIT
             ),
             "lang_2": (thing.options.languages + [None])[1],  # None is default
             # Following 8 cases exist:
@@ -181,7 +182,7 @@ class LabelPrinter:
                 else str(thing.where)
             ),
             "where_font_size": self.controlled_length(
-                thing, "font_size_location", unit="pt"
+                thing, "font_size_location", unit=FONT_UNIT
             ),
         }
 

{flinventory-2.2.2 → flinventory-2.2.3}/pyproject.toml

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