From 7ab57ab37a24cad97095575a897b9ec6efa69a21 Mon Sep 17 00:00:00 2001
From: Piotr Wegrzyn <piotro@piotro.eu>
Date: Tue, 6 Feb 2024 16:03:30 +0100
Subject: [PATCH] format+net: skip trailing .0 in linkSpeed

---
 include/util/format.hpp | 22 ++++++++++++++--------
 src/modules/network.cpp |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/util/format.hpp b/include/util/format.hpp
index 069d8897..1875fd8a 100644
--- a/include/util/format.hpp
+++ b/include/util/format.hpp
@@ -5,12 +5,13 @@
 
 class pow_format {
  public:
-  pow_format(long long val, std::string&& unit, bool binary = false)
-      : val_(val), unit_(unit), binary_(binary){};
+  pow_format(long long val, std::string&& unit, bool binary = false, bool skip_decimal = false)
+      : val_(val), unit_(unit), binary_(binary), skip_decimal_(skip_decimal){};
 
   long long val_;
   std::string unit_;
   bool binary_;
+  bool skip_decimal_;
 };
 
 namespace fmt {
@@ -49,17 +50,21 @@ struct formatter<pow_format> {
     const char* units[] = {"", "k", "M", "G", "T", "P", nullptr};
 
     auto base = s.binary_ ? 1024ull : 1000ll;
+    auto div = 1ll;
     auto fraction = (double)s.val_;
 
     int pow;
     for (pow = 0; units[pow + 1] != nullptr && fraction / base >= 1; ++pow) {
       fraction /= base;
+      div *= base;
     }
 
-    auto number_width = 5              // coeff in {:.1f} format
-                        + s.binary_;   // potential 4th digit before the decimal point
-    auto max_width = number_width + 1  // prefix from units array
-                     + s.binary_       // for the 'i' in GiB.
+    auto fixed_precision = (s.skip_decimal_ && ((s.val_%div) == 0)) ? 0 : 1;
+    auto number_width = 3 + fixed_precision     // coeff in {:.{fixed_precision}f} format
+                        + (fixed_precision != 0)// float dot
+                        + s.binary_;            // potential digit before the decimal point
+    auto max_width = number_width + 1           // prefix from units array
+                     + s.binary_                // for the 'i' in GiB.
                      + s.unit_.length();
 
     const char* format;
@@ -70,15 +75,16 @@ struct formatter<pow_format> {
       case '<':
         return fmt::format_to(ctx.out(), "{:<{}}", fmt::format("{}", s), max_width);
       case '=':
-        format = "{coefficient:<{number_width}.1f}{padding}{prefix}{unit}";
+        format = "{coefficient:<{number_width}.{fixed_precision}f}{padding}{prefix}{unit}";
         break;
       case 0:
       default:
-        format = "{coefficient:.1f}{prefix}{unit}";
+        format = "{coefficient:.{fixed_precision}f}{prefix}{unit}";
         break;
     }
     return fmt::format_to(
         ctx.out(), fmt::runtime(format), fmt::arg("coefficient", fraction),
+        fmt::arg("fixed_precision", fixed_precision),
         fmt::arg("number_width", number_width),
         fmt::arg("prefix", std::string() + units[pow] + ((s.binary_ && pow) ? "i" : "")),
         fmt::arg("unit", s.unit_),
diff --git a/src/modules/network.cpp b/src/modules/network.cpp
index e095055d..3c1421fe 100644
--- a/src/modules/network.cpp
+++ b/src/modules/network.cpp
@@ -368,7 +368,7 @@ auto waybar::modules::Network::update() -> void {
       fmt::arg("bandwidthUpBytes", pow_format(bandwidth_up / interval_.count(), "B/s")),
       fmt::arg("bandwidthTotalBytes",
                pow_format((bandwidth_up + bandwidth_down) / interval_.count(), "B/s")),
-      fmt::arg("linkSpeed", pow_format(link_speed_ * 1000000ull, "b/s")));
+      fmt::arg("linkSpeed", pow_format(link_speed_ * 1000000ull, "b/s", false, true)));
   if (text.compare(label_.get_label()) != 0) {
     label_.set_markup(text);
     if (text.empty()) {
@@ -402,7 +402,7 @@ auto waybar::modules::Network::update() -> void {
           fmt::arg("bandwidthUpBytes", pow_format(bandwidth_up / interval_.count(), "B/s")),
           fmt::arg("bandwidthTotalBytes",
                    pow_format((bandwidth_up + bandwidth_down) / interval_.count(), "B/s")),
-          fmt::arg("linkSpeed", pow_format(link_speed_ * 1000000ull, "b/s")));
+          fmt::arg("linkSpeed", pow_format(link_speed_ * 1000000ull, "b/s", false, true)));
       if (label_.get_tooltip_text() != tooltip_text) {
         label_.set_tooltip_markup(tooltip_text);
       }