Skip to content

Fix zpool format help #2261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarterLi merged 2 commits into from
Apr 5, 2026
+14 −6
Merged

Fix zpool format help #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fc171
fix(zpool): correct documented format placeholders
lildannita Apr 4, 2026
8aa17ae
fix(help): align format placeholders dynamically
lildannita Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/fastfetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,18 @@ static void printCommandFormatHelp(const char* command) {
puts("To see how a format string is constructed, take a look at https://github.com/fastfetch-cli/fastfetch/wiki/Format-String-Guide.");
puts("The following variables are passed:");

uint32_t maxWidth = 20;
for (unsigned i = 0; i < baseInfo->formatArgs.count; i++) {
uint32_t len = (uint32_t) strlen(baseInfo->formatArgs.args[i].name) + 2;
if (len > maxWidth) {
maxWidth = len;
}
}

for (unsigned i = 0; i < baseInfo->formatArgs.count; i++) {
const FFModuleFormatArg* arg = &baseInfo->formatArgs.args[i];
ffStrbufSetF(&variable, "{%s}", arg->name);
printf("%20s: %s\n", variable.chars, arg->desc);
printf("%*s: %s\n", (int) maxWidth, variable.chars, arg->desc);
}
} else {
fprintf(stderr, "Error: Module '%s' doesn't support output formatting\n", baseInfo->name);
Expand Down
10 changes: 5 additions & 5 deletions src/modules/zpool/zpool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@ FFModuleBaseInfo ffZpoolModuleInfo = {
{ "Zpool name", "name" },
{ "Zpool guid", "guid" },
{ "Zpool state", "state" },
{ "Size used", "used" },
{ "Size allocated", "allocated" },
{ "Size total", "total" },
{ "Size used", "size-used" },
{ "Size allocated", "size-allocated" },
{ "Size total", "size-total" },
{ "Size used percentage num", "used-percentage" },
{ "Size allocated percentage num", "allocated-percentage" },
{ "Fragmentation percentage num", "fragmentation-percentage" },
{ "Fragmentation percentage num", "frag-percentage" },
{ "Size used percentage bar", "used-percentage-bar" },
{ "Size allocated percentage bar", "allocated-percentage-bar" },
{ "Fragmentation percentage bar", "fragmentation-percentage-bar" },
{ "Fragmentation percentage bar", "frag-percentage-bar" },
{ "Is read-only", "is-readonly" },
}))
};
Loading