Separator: init support of JSON config

src/modules/separator/option.h

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

src/modules/separator/separator.c

@@ -0,0 +1,90 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "modules/separator/separator.h"
+
+#define FF_SEPARATOR_MODULE_NAME "Separator"
+
+void ffPrintSeparator(FFinstance* instance, FFSeparatorOptions* options)
+{
+    uint32_t titleLength = instance->state.platform.userName.length + 1 + (instance->config.titleFQDN ?
+        instance->state.platform.domainName.length :
+        instance->state.platform.hostName.length
+    );
+
+    ffLogoPrintLine(instance);
+
+    if(options->string.length == 0)
+    {
+        ffPrintCharTimes('-', titleLength);
+    }
+    else
+    {
+        //Write the whole separator as often as it fits fully into titleLength
+        for(uint32_t i = 0; i < titleLength / options->string.length; i++)
+            ffStrbufWriteTo(&options->string, stdout);
+
+        //Write as much of the separator as needed to fill titleLength
+        for(uint32_t i = 0; i < titleLength % options->string.length; i++)
+            putchar(options->string.chars[i]);
+    }
+    putchar('\n');
+}
+
+void ffInitSeparatorOptions(FFSeparatorOptions* options)
+{
+    options->moduleName = FF_SEPARATOR_MODULE_NAME;
+    ffStrbufInit(&options->string);
+}
+
+bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_SEPARATOR_MODULE_NAME);
+    if (!subKey) return false;
+
+    if (strcasecmp(subKey, "string") == 0)
+    {
+        ffOptionParseString(key, value, &options->string);
+        return true;
+    }
+
+    return false;
+}
+
+void ffDestroySeparatorOptions(FFSeparatorOptions* options)
+{
+    ffStrbufDestroy(&options->string);
+}
+
+#ifdef FF_HAVE_JSONC
+bool ffParseSeparatorJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
+{
+    if (strcasecmp(type, FF_SEPARATOR_MODULE_NAME) != 0)
+        return false;
+
+    FFSeparatorOptions __attribute__((__cleanup__(ffDestroySeparatorOptions))) options;
+    ffInitSeparatorOptions(&options);
+
+    if (module)
+    {
+        struct lh_entry* entry;
+        lh_foreach(data->ffjson_object_get_object(module), entry)
+        {
+            const char* key = (const char *)lh_entry_k(entry);
+            if (strcasecmp(key, "type") == 0)
+                continue;
+            json_object* val = (struct json_object *)lh_entry_v(entry);
+
+            if (strcasecmp(key, "string") == 0)
+            {
+                ffStrbufSetS(&options.string, data->ffjson_object_get_string(val));
+                continue;
+            }
+
+            ffPrintErrorString(instance, FF_SEPARATOR_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintSeparator(instance, &options);
+    return true;
+}
+#endif

src/modules/separator/separator.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "fastfetch.h"
+#include "modules/separator/option.h"
+
+void ffPrintSeparator(FFinstance* instance, FFSeparatorOptions* options);
+void ffInitSeparatorOptions(FFSeparatorOptions* options);
+bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key, const char* value);
+void ffDestroySeparatorOptions(FFSeparatorOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/config.h"
+bool ffParseSeparatorJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
+#endif