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

Command: extends useStdErr to useOutput

Browse Source
This commit is contained in:
Carter Li committed 2026-10-10 14:00:30 +08:00
1 parent 0806145f4d
commit 07a7211526
9 files changed
+89 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/modules/command/command.c
+34 -3
View File
@@ -85,7 +85,24 @@ void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) {
}
if (unsafe_yyjson_equals_str(key, "useStdErr")) {
options->useStdErr = yyjson_get_bool(val);
options->useOutput = yyjson_get_bool(val) ? FF_PROCESS_OUTPUT_STDERR_BIT : FF_PROCESS_OUTPUT_STDOUT_BIT;
ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "useStdErr is deprecated, use useOutput instead");
continue;
}
if (unsafe_yyjson_equals_str(key, "useOutput")) {
int value;
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
{ "stdout", FF_PROCESS_OUTPUT_STDOUT_BIT },
{ "stderr", FF_PROCESS_OUTPUT_STDERR_BIT },
{ "both", FF_PROCESS_OUTPUT_BOTH },
{},
});
if (error) {
ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->useOutput = (FFProcessOutputType) value;
}
continue;
}
@@ -110,7 +127,19 @@ void ffGenerateCommandJsonConfig(FFCommandOptions* options, yyjson_mut_doc* doc,
yyjson_mut_obj_add_strbuf(doc, module, "shell", &options->shell);
yyjson_mut_obj_add_strbuf(doc, module, "param", &options->param);
yyjson_mut_obj_add_strbuf(doc, module, "text", &options->text);
yyjson_mut_obj_add_bool(doc, module, "useStdErr", options->useStdErr);
switch (options->useOutput) {
case FF_PROCESS_OUTPUT_STDOUT_BIT:
yyjson_mut_obj_add_str(doc, module, "useOutput", "stdout");
break;
case FF_PROCESS_OUTPUT_STDERR_BIT:
yyjson_mut_obj_add_str(doc, module, "useOutput", "stderr");
break;
case FF_PROCESS_OUTPUT_BOTH:
yyjson_mut_obj_add_str(doc, module, "useOutput", "both");
break;
default:
break;
}
yyjson_mut_obj_add_bool(doc, module, "parallel", options->parallel);
yyjson_mut_obj_add_bool(doc, module, "splitLines", options->splitLines);
}
@@ -168,7 +197,9 @@ void ffInitCommandOptions(FFCommandOptions* options) {
#endif
);
ffStrbufInit(&options->text);
options->useStdErr = false;
// Capture both streams by default: most tools log to stdout or stderr without saying which, and
// the previous single-stream default silently dropped one of them.
options->useOutput = FF_PROCESS_OUTPUT_BOTH;
options->parallel = true;
options->splitLines = false;
}
src/modules/command/option.h
+2 -1
View File
@@ -1,6 +1,7 @@
#pragma once
#include "common/option.h"
#include "common/processing.h" // FFProcessOutputType
typedef struct FFCommandOptions {
FFModuleArgs moduleArgs;
@@ -8,7 +9,7 @@ typedef struct FFCommandOptions {
FFstrbuf shell;
FFstrbuf param;
FFstrbuf text;
bool useStdErr;
FFProcessOutputType useOutput;
bool parallel;
bool splitLines;
} FFCommandOptions;