From 700bf5b28c3f060ed629ac9bf782e0ff2ec76636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 20 Aug 2024 14:34:45 +0200
Subject: [PATCH] tag: add 'b' formatter

Divides the tag's decimal value by 8.

Closes #392
---
 CHANGELOG.md          |  3 +++
 doc/yambar-tags.5.scd |  7 +++++-
 tag.c                 | 51 +++++++++++++++++++++++++++++++------------
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 461e6db..33e12b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,9 +20,12 @@
   environment variable.
 * network: `type` tag ([#380][380]).
 * network: `type`  and `kind` tags ([#380][380]).
+* tags: `b` tag formatter; divides the tag's decimal value with `8`
+  ([#392][392]).
 
 [96]: https://codeberg.org/dnkl/yambar/issues/96
 [380]: https://codeberg.org/dnkl/yambar/issues/380
+[392]: https://codeberg.org/dnkl/yambar/issues/392
 
 
 ### Changed
diff --git a/doc/yambar-tags.5.scd b/doc/yambar-tags.5.scd
index b778154..adda208 100644
--- a/doc/yambar-tags.5.scd
+++ b/doc/yambar-tags.5.scd
@@ -86,11 +86,16 @@ be used.
 :  format
 :  Range tags
 :  Renders a range tag's value as a percentage value
+|  b
+:  format
+:  All tag types
+:  Renders a tag's value (in decimal) divided by 8. Note: no unit
+   suffix is appended
 |  kb, mb, gb
 :  format
 :  All tag types
 :  Renders a tag's value (in decimal) divided by 1000, 1000^2 or
-   1000^3. Note: no unit suffix is appended)
+   1000^3. Note: no unit suffix is appended
 |  kib, mib, gib
 :  format
 :  All tag types
diff --git a/tag.c b/tag.c
index e95b1c7..438af64 100644
--- a/tag.c
+++ b/tag.c
@@ -510,6 +510,7 @@ tags_expand_template(const char *template, const struct tag_set *tags)
             FMT_HEX,
             FMT_OCT,
             FMT_PERCENT,
+            FMT_BYTE,
             FMT_KBYTE,
             FMT_MBYTE,
             FMT_GBYTE,
@@ -541,6 +542,8 @@ tags_expand_template(const char *template, const struct tag_set *tags)
                 format = FMT_OCT;
             else if (strcmp(tag_args[i], "%") == 0)
                 format = FMT_PERCENT;
+            else if (strcmp(tag_args[i], "b") == 0)
+                format = FMT_BYTE;
             else if (strcmp(tag_args[i], "kb") == 0)
                 format = FMT_KBYTE;
             else if (strcmp(tag_args[i], "mb") == 0)
@@ -634,19 +637,29 @@ tags_expand_template(const char *template, const struct tag_set *tags)
                 break;
             }
 
+            case FMT_BYTE:
             case FMT_KBYTE:
             case FMT_MBYTE:
             case FMT_GBYTE:
             case FMT_KIBYTE:
             case FMT_MIBYTE:
             case FMT_GIBYTE: {
-                const long divider = format == FMT_KBYTE    ? 1000
-                                     : format == FMT_MBYTE  ? 1000 * 1000
-                                     : format == FMT_GBYTE  ? 1000 * 1000 * 1000
-                                     : format == FMT_KIBYTE ? 1024
-                                     : format == FMT_MIBYTE ? 1024 * 1024
-                                     : format == FMT_GIBYTE ? 1024 * 1024 * 1024
-                                                            : 1;
+                const long divider =
+                    format == FMT_BYTE
+                        ? 8
+                        : format == FMT_KBYTE
+                            ? 1000
+                            : format == FMT_MBYTE
+                                ? 1000 * 1000
+                                : format == FMT_GBYTE
+                                    ? 1000 * 1000 * 1000
+                                    : format == FMT_KIBYTE
+                                        ? 1024
+                                        : format == FMT_MIBYTE
+                                            ? 1024 * 1024
+                                            : format == FMT_GIBYTE
+                                                ? 1024 * 1024 * 1024
+                                                : 1;
 
                 char str[24];
                 if (tag->type(tag) == TAG_TYPE_FLOAT) {
@@ -684,19 +697,29 @@ tags_expand_template(const char *template, const struct tag_set *tags)
                 fmt = zero_pad ? "%0*lu" : "%*lu";
                 break;
 
+            case FMT_BYTE:
             case FMT_KBYTE:
             case FMT_MBYTE:
             case FMT_GBYTE:
             case FMT_KIBYTE:
             case FMT_MIBYTE:
             case FMT_GIBYTE: {
-                const long divider = format == FMT_KBYTE    ? 1024
-                                     : format == FMT_MBYTE  ? 1024 * 1024
-                                     : format == FMT_GBYTE  ? 1024 * 1024 * 1024
-                                     : format == FMT_KIBYTE ? 1000
-                                     : format == FMT_MIBYTE ? 1000 * 1000
-                                     : format == FMT_GIBYTE ? 1000 * 1000 * 1000
-                                                            : 1;
+                const long divider =
+                    format == FMT_BYTE
+                        ? 8
+                        : format == FMT_KBYTE
+                            ? 1024
+                            : format == FMT_MBYTE
+                                ? 1024 * 1024
+                                : format == FMT_GBYTE
+                                    ? 1024 * 1024 * 1024
+                                    : format == FMT_KIBYTE
+                                        ? 1000
+                                        : format == FMT_MIBYTE
+                                            ? 1000 * 1000
+                                            : format == FMT_GIBYTE
+                                                ? 1000 * 1000 * 1000
+                                                : 1;
                 value /= divider;
                 fmt = zero_pad ? "%0*lu" : "%*lu";
                 break;