external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-24 04:45:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tag: add kb/mb/gb formatters

Browse source
This commit is contained in:
Daniel Eklöf 2021-08-27 21:15:19 +02:00
parent e201cc3d30
commit a6194c63e6
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 58 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -34,6 +34,8 @@
* network: `poll-interval` option (for the new `signal` and
`*-bitrate` tags).
* tags: percentage formatter, for range tags: `{tag_name:%}`.
* tags: percentage tag formatter, for range tags: `{tag_name:%}`.
* tags: kb/mb/gb tag formatters.
### Changed

13
doc/yambar-tags.5.scd
View file

@ -72,6 +72,19 @@ be used.
: format
: Renders a range tag's value as a percentage value
: Range tags
| kb
: format
: Renders a tag's value (in decimal) divided by 1024 (note that no
unit suffix is appended)
| mb
: format
: Renders a tag's value (in decimal) divided by 1024^2 (note that no
unit suffix is appended)
| gb
: format
: Renders a tag's value (in decimal) divided by 1024^3 (note that no
unit suffix is appended)
: All tag types
| min
: selector
: Renders a range tag's mininum value

46
tag.c
View file

@ -459,7 +459,15 @@ tags_expand_template(const char *template, const struct tag_set *tags)
sbuf_append_at_most(&formatted, template, begin - template);
/* Parse arguments */
enum { FMT_DEFAULT, FMT_HEX, FMT_OCT, FMT_PERCENT } format = FMT_DEFAULT;
enum {
FMT_DEFAULT,
FMT_HEX,
FMT_OCT,
FMT_PERCENT,
FMT_KBYTE,
FMT_MBYTE,
FMT_GBYTE,
} format = FMT_DEFAULT;
enum { VALUE_VALUE, VALUE_MIN, VALUE_MAX, VALUE_UNIT } kind = VALUE_VALUE;
for (size_t i = 0; i < MAX_TAG_ARGS; i++) {
@ -471,6 +479,12 @@ 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], "kb") == 0)
format = FMT_KBYTE;
else if (strcmp(tag_args[i], "mb") == 0)
format = FMT_MBYTE;
else if (strcmp(tag_args[i], "gb") == 0)
format = FMT_GBYTE;
else if (strcmp(tag_args[i], "min") == 0)
kind = VALUE_MIN;
else if (strcmp(tag_args[i], "max") == 0)
@ -508,6 +522,21 @@ tags_expand_template(const char *template, const struct tag_set *tags)
sbuf_append(&formatted, str);
break;
}
case FMT_KBYTE:
case FMT_MBYTE:
case FMT_GBYTE: {
const long divider =
format == FMT_KBYTE ? 1024 :
format == FMT_MBYTE ? 1024 * 1024 :
format == FMT_GBYTE ? 1024 * 1024 * 1024 :
1;
char str[24];
snprintf(str, sizeof(str), "%lu", tag->as_int(tag) / divider);
sbuf_append(&formatted, str);
break;
}
}
break;
@ -527,9 +556,20 @@ tags_expand_template(const char *template, const struct tag_set *tags)
value = (value - min) * 100 / (max - min);
fmt = "%lu";
break;
}
case FMT_KBYTE:
case FMT_MBYTE:
case FMT_GBYTE: {
const long divider =
format == FMT_KBYTE ? 1024 :
format == FMT_MBYTE ? 1024 * 1024 :
format == FMT_GBYTE ? 1024 * 1024 * 1024 :
1;
value /= divider;
fmt = "%lu";
break;
}
}
char str[24];
snprintf(str, sizeof(str), fmt, value);