malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WM: report version field in custom and JSON output

Browse Source
This commit is contained in:
李通洲 2025-01-02 10:39:21 +08:00 committed by Carter Li
parent f14cd2c6e8
commit c68d21e215
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/wm/wm.c
View File

@ -20,7 +20,8 @@ void ffPrintWM(FFWMOptions* options)
ffDetectWMPlugin(&pluginName);
FF_STRBUF_AUTO_DESTROY version = ffStrbufCreate();
ffDetectWMVersion(&result->wmPrettyName, &version, options);
if (instance.config.general.detectVersion)
ffDetectWMVersion(&result->wmProcessName, &version, options);
if(options->moduleArgs.outputFormat.length == 0)
{
@ -57,6 +58,7 @@ void ffPrintWM(FFWMOptions* options)
FF_FORMAT_ARG(result->wmPrettyName, "pretty-name"),
FF_FORMAT_ARG(result->wmProtocolName, "protocol-name"),
FF_FORMAT_ARG(pluginName, "plugin-name"),
FF_FORMAT_ARG(version, "version"),
}));
}
}
@ -125,11 +127,16 @@ void ffGenerateWMJsonResult(FF_MAYBE_UNUSED FFWMOptions* options, yyjson_mut_doc
if(options->detectPlugin)
ffDetectWMPlugin(&pluginName);
FF_STRBUF_AUTO_DESTROY version = ffStrbufCreate();
if (instance.config.general.detectVersion)
ffDetectWMVersion(&result->wmProcessName, &version, options);
yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
yyjson_mut_obj_add_strbuf(doc, obj, "processName", &result->wmProcessName);
yyjson_mut_obj_add_strbuf(doc, obj, "prettyName", &result->wmPrettyName);
yyjson_mut_obj_add_strbuf(doc, obj, "protocolName", &result->wmProtocolName);
yyjson_mut_obj_add_strbuf(doc, obj, "pluginName", &pluginName);
yyjson_mut_obj_add_strbuf(doc, obj, "version", &version);
}
static FFModuleBaseInfo ffModuleInfo = {
@ -145,6 +152,7 @@ static FFModuleBaseInfo ffModuleInfo = {
{"WM pretty name", "pretty-name"},
{"WM protocol name", "protocol-name"},
{"WM plugin name", "plugin-name"},
{"WM version", "version"},
}))
};