From c68d21e21586f46b6ddbd1d118c52553e7498c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Thu, 2 Jan 2025 10:39:21 +0800
Subject: [PATCH] WM: report version field in custom and JSON output

---
 src/modules/wm/wm.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c
index f84e503b3..f0f0f31b4 100644
--- a/src/modules/wm/wm.c
+++ b/src/modules/wm/wm.c
@@ -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"},
     }))
 };