Merge branch 'main' into gramupdate

Author: deefrawley

plugin/ui.py

@@ -88,10 +88,14 @@ def query(self, param: str) -> List[dict]:
                             _("Check documentation for accepted units"),
                         )
                 else:
+                    c = do_convert["converted"]
+                    p = plugin.utils.smart_precision(
+                        locale.localeconv()["decimal_point"], c, 3
+                    )
                     self.sendNormalMess(
                         (do_convert["category"]),
                         (
-                            f"{locale.format_string('%.6g', float(args[0]), grouping=True)} {args[1]} = {locale.format_string('%f', do_convert['converted'], grouping=True)} {args[2]}"
+                            f"{locale.format_string('%.10g', float(args[0]), grouping=True)} {args[1]} = {locale.format_string(f'%.{p}f', c, grouping=True)} {args[2]}"
                         ),
                         f"assets/{do_convert['category']}.ico",
                     )

plugin/utils.py

@@ -1,3 +1,4 @@
+import re
 import plugin.units as gc_units
 from plugin.extensions import _
 
@@ -109,3 +110,19 @@ def gen_convert(amount: float, from_unit: str, to_unit: str):
             "Problem converting {} and {}".format(from_unit, to_unit)
         )
     return conversions
+
+
+def smart_precision(separator, amount, preferred=3):
+    str_amt = str(amount)
+    dec_places = str_amt[::-1].find(separator)
+    # whole number
+    if dec_places == -1:
+        return 0
+    frac_part = str_amt[-dec_places::]
+    # fraction is just zeroes
+    if int(frac_part) == 0:
+        return 0
+    fnz = re.search(r"[1-9]", frac_part).start()
+    if fnz < preferred:
+        return preferred
+    return fnz + 1