fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-08 06:00:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: support for named format arguments

Browse Source 
Fix #796
This commit is contained in:
Carter Li
2024-05-27 16:41:37 +08:00
parent 965777323e
commit c8451cab52
65 changed files with 855 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uptime/uptime.c
+12 -12
View File
@@ -79,12 +79,12 @@ void ffPrintUptime(FFUptimeOptions* options)
else
{
FF_PRINT_FORMAT_CHECKED(FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_UPTIME_NUM_FORMAT_ARGS, ((FFformatarg[]){
{FF_FORMAT_ARG_TYPE_UINT, &days},
{FF_FORMAT_ARG_TYPE_UINT, &hours},
{FF_FORMAT_ARG_TYPE_UINT, &minutes},
{FF_FORMAT_ARG_TYPE_UINT, &seconds},
{FF_FORMAT_ARG_TYPE_UINT, &milliseconds},
{FF_FORMAT_ARG_TYPE_STRING, ffTimeToShortStr(result.uptime)},
{FF_FORMAT_ARG_TYPE_UINT, &days, "days"},
{FF_FORMAT_ARG_TYPE_UINT, &hours, "hours"},
{FF_FORMAT_ARG_TYPE_UINT, &minutes, "minutes"},
{FF_FORMAT_ARG_TYPE_UINT, &seconds, "seconds"},
{FF_FORMAT_ARG_TYPE_UINT, &milliseconds, "milliseconds"},
{FF_FORMAT_ARG_TYPE_STRING, ffTimeToShortStr(result.uptime), "boot-time"},
}));
}
}
@@ -143,12 +143,12 @@ void ffGenerateUptimeJsonResult(FF_MAYBE_UNUSED FFUptimeOptions* options, yyjson
void ffPrintUptimeHelpFormat(void)
{
FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_UPTIME_MODULE_NAME, "{1} days {2} hours {3} mins", FF_UPTIME_NUM_FORMAT_ARGS, ((const char* []) {
"Days",
"Hours",
"Minutes",
"Seconds",
"Milliseconds",
"Boot time in local timezone",
"Days - days",
"Hours - hours",
"Minutes - minutes",
"Seconds - seconds",
"Milliseconds - milliseconds",
"Boot time in local timezone - boot-time",
}));
}