Command: major code refactoring

ditto; and multi-command support was removed in favor of JSON config
support

src/modules/command.c

@@ -1,67 +0,0 @@
-#include "fastfetch.h"
-
-#include "common/printing.h"
-#include "common/processing.h"
-#include "util/textModifier.h"
-
-#define FF_COMMAND_MODULE_NAME "Command"
-
-static void printError(FFinstance* instance, const char* key, const char* error)
-{
-    ffPrintLogoAndKey(instance, key, 0, NULL);
-
-    if(instance->config.pipe)
-        fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout);
-
-    fputs(error, stdout);
-
-    if(!instance->config.pipe)
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-
-    putchar('\n');
-}
-
-void ffPrintCommand(FFinstance* instance)
-{
-    FF_STRBUF_AUTO_DESTROY key;
-    ffStrbufInit(&key);
-
-    if(!ffListShift(&instance->config.commandKeys, &key))
-        ffStrbufInitS(&key, FF_COMMAND_MODULE_NAME);
-
-    FF_STRBUF_AUTO_DESTROY text;
-    ffStrbufInit(&text);
-    if(!ffListShift(&instance->config.commandTexts, &text))
-    {
-        printError(instance, key.chars, "No command text left");
-        return;
-    }
-
-    FF_STRBUF_AUTO_DESTROY result;
-    ffStrbufInit(&result);
-    const char* error = ffProcessAppendStdOut(&result, (char* const[]){
-        instance->config.commandShell.chars,
-        #ifdef _WIN32
-        "/c",
-        #else
-        "-c",
-        #endif
-        text.chars,
-        NULL
-    });
-
-    if(error)
-    {
-        printError(instance, key.chars, error);
-        return;
-    }
-
-    if(!result.length)
-    {
-        printError(instance, key.chars, "No result printed");
-        return;
-    }
-
-    ffPrintLogoAndKey(instance, key.chars, 0, NULL);
-    puts(result.chars);
-}

src/modules/command/command.c

@@ -0,0 +1,85 @@
+#include "fastfetch.h"
+
+#include "common/printing.h"
+#include "common/processing.h"
+#include "modules/command/command.h"
+
+#define FF_COMMAND_MODULE_NAME "Command"
+
+void ffPrintCommand(FFinstance* instance, FFCommandOptions* options)
+{
+    FF_STRBUF_AUTO_DESTROY result;
+    ffStrbufInit(&result);
+    const char* error = ffProcessAppendStdOut(&result, (char* const[]){
+        options->shell.chars,
+        #ifdef _WIN32
+        "/c",
+        #else
+        "-c",
+        #endif
+        options->text.chars,
+        NULL
+    });
+
+    if(error)
+    {
+        ffPrintError(instance, FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
+        return;
+    }
+
+    if(!result.length)
+    {
+        ffPrintError(instance, FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "No result printed");
+        return;
+    }
+
+    ffPrintLogoAndKey(instance, FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs.key);
+    ffStrbufPutTo(&result, stdout);
+}
+
+void ffInitCommandOptions(FFCommandOptions* options)
+{
+    options->moduleName = FF_COMMAND_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+
+    ffStrbufInitS(&options->shell,
+        #ifdef _WIN32
+        "cmd"
+        #elif defined(__FreeBSD__)
+        "csh"
+        #else
+        "bash"
+        #endif
+    );
+
+    ffStrbufInit(&options->text);
+}
+
+bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_COMMAND_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    if(strcasecmp(subKey, "shell") == 0)
+    {
+        ffOptionParseString(key, value, &options->shell);
+        return true;
+    }
+
+    if(strcasecmp(subKey, "text") == 0)
+    {
+        ffOptionParseString(key, value, &options->text);
+        return true;
+    }
+
+    return false;
+}
+
+void ffDestroyCommandOptions(FFCommandOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+    ffStrbufDestroy(&options->shell);
+    ffStrbufDestroy(&options->text);
+}

src/modules/command/command.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "fastfetch.h"
+#include "modules/command/option.h"
+
+void ffPrintCommand(FFinstance* instance, FFCommandOptions* options);
+void ffInitCommandOptions(FFCommandOptions* options);
+bool ffParseCommandCommandOptions(FFCommandOptions* options, const char* key, const char* value);
+void ffDestroyCommandOptions(FFCommandOptions* options);

src/modules/command/option.h

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

src/modules/modules.h

@@ -4,3 +4,4 @@
 
 #include "modules/os/os.h"
 #include "modules/battery/battery.h"
+#include "modules/command/command.h"

src/modules/options.h

@@ -4,3 +4,4 @@
 
 #include "modules/battery/option.h"
 #include "modules/os/option.h"
+#include "modules/command/option.h"

src/modules/os/os.c

@@ -108,7 +108,7 @@ void ffPrintOS(FFinstance* instance, FFOSOptions* options)
 
     if(options->moduleArgs.outputFormat.length == 0)
     {
-        FFstrbuf result;
+        FF_STRBUF_AUTO_DESTROY result;
         ffStrbufInit(&result);
 
         if(ffStrbufIgnCaseCompS(&os->id, "nixos") == 0)
@@ -118,7 +118,6 @@ void ffPrintOS(FFinstance* instance, FFOSOptions* options)
 
         ffPrintLogoAndKey(instance, FF_OS_MODULE_NAME, 0, &options->moduleArgs.key);
         ffStrbufPutTo(&result, stdout);
-        ffStrbufDestroy(&result);
     }
     else
     {