Fix formatting small numb ers in crypto plugin

Author: linuxdaemon

plugins/cryptocurrency.py

@@ -12,6 +12,7 @@
 import inspect
 import time
 import warnings
+from decimal import Decimal
 from numbers import Real
 from operator import itemgetter
 from threading import RLock
@@ -628,9 +629,9 @@ def crypto_command(text, event):
     quote = data.quote[currency]
     change = cast(Union[int, float], quote.percent_change_24h)
     if change > 0:
-        change_str = "$(dark_green)+{}%$(clear)".format(change)
+        change_str = colors.parse("$(dark_green)+{}%$(clear)").format(change)
     elif change < 0:
-        change_str = "$(dark_red){}%$(clear)".format(change)
+        change_str = colors.parse("$(dark_red){}%$(clear)").format(change)
     else:
         change_str = "{}%".format(change)
 
@@ -642,20 +643,31 @@ def crypto_command(text, event):
     else:
         btc = ""
 
+    num_format = format_price(quote.price)
+
     return colors.parse(
-        (
-            "{} ({}) // $(orange){}{:,.2f}$(clear) {} " + btc + "// {} change"
-        ).format(
-            data.symbol,
-            data.slug,
-            currency_sign,
-            quote.price,
-            currency,
-            change_str,
-        )
+        "{} ({}) // $(orange){}{}$(clear) {} " + btc + "// {} change"
+    ).format(
+        data.symbol,
+        data.slug,
+        currency_sign,
+        num_format,
+        currency,
+        change_str,
     )
 
 
+def format_price(price: Union[int, float, Real]) -> str:
+    price = float(price)
+    if price < 1:
+        precision = max(2, min(10, -Decimal(str(price)).as_tuple().exponent))
+        num_format = "{:01,.{}f}".format(price, precision)
+    else:
+        num_format = "{:,.2f}".format(price)
+
+    return num_format
+
+
 @hook.command("currencies", "currencylist", autohelp=False)
 def currency_list():
     """- List all available currencies from the API"""

tests/plugin_tests/test_cryptocurrency.py

@@ -58,6 +58,7 @@ def init_response(
     check_api_key=False,
     pct_change=18.9,
     show_btc=True,
+    price=50000000000.0,
 ):
     if check_api_key:
         cryptocurrency.init_api(bot.get())
@@ -134,7 +135,7 @@ def init_response(
                 "tags": [],
                 "quote": {
                     "USD": {
-                        "price": 50000000000,
+                        "price": price,
                         "volume_24h": 20,
                         "market_cap": 92,
                         "percent_change_1h": 14.5,
@@ -279,6 +280,24 @@ def test_cache(freeze_time):
     assert c.get("foo") is None
 
 
+@pytest.mark.parametrize(
+    "price,out",
+    [
+        (1, "1.00"),
+        (50000, "50,000.00"),
+        (10.2548, "10.25"),
+        (0.1, "0.10"),
+        (0.0241, "0.0241"),
+        (0.00241, "0.00241"),
+        (0.000241, "0.000241"),
+        (0.0000241, "0.0000241"),
+        (0.001231549654135151564, "0.0012315497"),
+    ],
+)
+def test_format_price(price, out):
+    assert cryptocurrency.format_price(price) == out
+
+
 def test_crypto_cmd(mock_requests):
     init_response(mock_requests)