Terminal: support JSON config

src/modules/jsonconfig/jsonconfig.c

@@ -117,6 +117,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
 
         case 'T': {
             return
+                tryModule(instance, type, module, FF_TERMINAL_MODULE_NAME, ffParseTerminalJsonObject) ||
                 tryModule(instance, type, module, FF_TITLE_MODULE_NAME, ffParseTitleJsonObject) ||
                 false;
         }

src/modules/modules.h

@@ -31,6 +31,7 @@
 #include "modules/shell/shell.h"
 #include "modules/sound/sound.h"
 #include "modules/swap/swap.h"
+#include "modules/terminal/terminal.h"
 #include "modules/title/title.h"
 #include "modules/jsonconfig/jsonconfig.h"
 #include "modules/uptime/uptime.h"

src/modules/options.h

@@ -29,6 +29,7 @@
 #include "modules/shell/option.h"
 #include "modules/sound/option.h"
 #include "modules/swap/option.h"
+#include "modules/terminal/option.h"
 #include "modules/title/option.h"
 #include "modules/uptime/option.h"
 #include "modules/wifi/option.h"

src/modules/terminal.c

@@ -1,44 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/terminalshell/terminalshell.h"
-
-#include <string.h>
-
-#define FF_TERMINAL_MODULE_NAME "Terminal"
-#define FF_TERMINAL_NUM_FORMAT_ARGS 10
-
-void ffPrintTerminal(FFinstance* instance)
-{
-    const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
-
-    if(result->terminalProcessName.length == 0)
-    {
-        ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminal, "Couldn't detect terminal");
-        return;
-    }
-
-    if(instance->config.terminal.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminal.key);
-
-        if(result->terminalVersion.length)
-            printf("%s %s\n", result->terminalPrettyName.chars, result->terminalVersion.chars);
-        else
-            ffStrbufPutTo(&result->terminalPrettyName, stdout);
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminal, FF_TERMINAL_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalProcessName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalExe},
-            {FF_FORMAT_ARG_TYPE_STRING, result->terminalExeName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
-            {FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
-            {FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
-        });
-    }
-}

src/modules/terminal/option.h

@@ -0,0 +1,13 @@
+#pragma once
+
+// This file will be included in "fastfetch.h", do NOT put unnecessary things here
+
+#include "common/option.h"
+
+typedef struct FFTerminalOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+
+    bool version;
+} FFTerminalOptions;

src/modules/terminal/terminal.c

@@ -0,0 +1,100 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/terminalshell/terminalshell.h"
+#include "modules/terminal/terminal.h"
+
+#include <string.h>
+
+#define FF_TERMINAL_NUM_FORMAT_ARGS 10
+
+void ffPrintTerminal(FFinstance* instance, FFTerminalOptions* options)
+{
+    const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
+
+    if(result->terminalProcessName.length == 0)
+    {
+        ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, "Couldn't detect terminal");
+        return;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        if(result->terminalVersion.length)
+            printf("%s %s\n", result->terminalPrettyName.chars, result->terminalVersion.chars);
+        else
+            ffStrbufPutTo(&result->terminalPrettyName, stdout);
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_TERMINAL_NUM_FORMAT_ARGS, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalProcessName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalExe},
+            {FF_FORMAT_ARG_TYPE_STRING, result->terminalExeName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
+            {FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
+            {FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
+        });
+    }
+}
+
+void ffInitTerminalOptions(FFTerminalOptions* options)
+{
+    options->moduleName = FF_TERMINAL_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+
+    options->version = true;
+}
+
+bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_TERMINAL_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    if (strcasecmp(subKey, "version") == 0)
+    {
+        options->version = ffOptionParseBoolean(value);
+        return true;
+    }
+
+    return false;
+}
+
+void ffDestroyTerminalOptions(FFTerminalOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseTerminalJsonObject(FFinstance* instance, json_object* module)
+{
+    FFTerminalOptions __attribute__((__cleanup__(ffDestroyTerminalOptions))) options;
+    ffInitTerminalOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            if (strcasecmp(key, "version") == 0)
+            {
+                options.version = (bool) json_object_get_boolean(val);
+                continue;
+            }
+
+            ffPrintError(instance, FF_TERMINAL_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintTerminal(instance, &options);
+}
+#endif

src/modules/terminal/terminal.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_TERMINAL_MODULE_NAME "Terminal"
+
+void ffPrintTerminal(FFinstance* instance, FFTerminalOptions* options);
+void ffInitTerminalOptions(FFTerminalOptions* options);
+bool ffParseTerminalCommandOptions(FFTerminalOptions* options, const char* key, const char* value);
+void ffDestroyTerminalOptions(FFTerminalOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseTerminalJsonObject(FFinstance* instance, json_object* module);
+#endif