Processes: add JSON config

src/modules/jsonconfig/jsonconfig.c

@@ -116,6 +116,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
                 tryModule(instance, type, module, FF_PACKAGES_MODULE_NAME, ffParsePackagesJsonObject) ||
                 tryModule(instance, type, module, FF_PLAYER_MODULE_NAME, ffParsePlayerJsonObject) ||
                 tryModule(instance, type, module, FF_POWERADAPTER_MODULE_NAME, ffParsePowerAdapterJsonObject) ||
+                tryModule(instance, type, module, FF_PROCESSES_MODULE_NAME, ffParseProcessesJsonObject) ||
                 tryModule(instance, type, module, FF_PUBLICIP_MODULE_NAME, ffParsePublicIpJsonObject) ||
                 false;
         }

src/modules/modules.h

@@ -35,6 +35,7 @@
 #include "modules/packages/packages.h"
 #include "modules/player/player.h"
 #include "modules/poweradapter/poweradapter.h"
+#include "modules/processes/processes.h"
 #include "modules/publicip/publicip.h"
 #include "modules/separator/separator.h"
 #include "modules/shell/shell.h"

src/modules/options.h

@@ -33,6 +33,7 @@
 #include "modules/packages/option.h"
 #include "modules/player/option.h"
 #include "modules/poweradapter/option.h"
+#include "modules/processes/option.h"
 #include "modules/publicip/option.h"
 #include "modules/separator/option.h"
 #include "modules/shell/option.h"

src/modules/processes.c

@@ -1,31 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/processes/processes.h"
-
-#define FF_PROCESSES_MODULE_NAME "Processes"
-#define FF_PROCESSES_NUM_FORMAT_ARGS 1
-
-void ffPrintProcesses(FFinstance* instance)
-{
-    uint32_t numProcesses = 0;
-    const char* error = ffDetectProcesses(&numProcesses);
-
-    if(error)
-    {
-        ffPrintError(instance, FF_PROCESSES_MODULE_NAME, 0, &instance->config.processes, "%s", error);
-        return;
-    }
-
-    if(instance->config.processes.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_PROCESSES_MODULE_NAME, 0, &instance->config.processes.key);
-
-        printf("%u\n", numProcesses);
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_PROCESSES_MODULE_NAME, 0, &instance->config.processes, FF_PROCESSES_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_UINT, &numProcesses}
-        });
-    }
-}

src/modules/processes/option.h

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

src/modules/processes/processes.c

@@ -0,0 +1,73 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/processes/processes.h"
+#include "modules/processes/processes.h"
+
+#define FF_PROCESSES_NUM_FORMAT_ARGS 1
+
+void ffPrintProcesses(FFinstance* instance, FFProcessesOptions* options)
+{
+    uint32_t numProcesses = 0;
+    const char* error = ffDetectProcesses(&numProcesses);
+
+    if(error)
+    {
+        ffPrintError(instance, FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
+        return;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        printf("%u\n", numProcesses);
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, FF_PROCESSES_NUM_FORMAT_ARGS, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_UINT, &numProcesses}
+        });
+    }
+}
+
+void ffInitProcessesOptions(FFProcessesOptions* options)
+{
+    options->moduleName = FF_PROCESSES_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_PROCESSES_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyProcessesOptions(FFProcessesOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseProcessesJsonObject(FFinstance* instance, json_object* module)
+{
+    FFProcessesOptions __attribute__((__cleanup__(ffDestroyProcessesOptions))) options;
+    ffInitProcessesOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_PROCESSES_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintProcesses(instance, &options);
+}
+#endif

src/modules/processes/processes.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_PROCESSES_MODULE_NAME "Processes"
+
+void ffPrintProcesses(FFinstance* instance, FFProcessesOptions* options);
+void ffInitProcessesOptions(FFProcessesOptions* options);
+bool ffParseProcessesCommandOptions(FFProcessesOptions* options, const char* key, const char* value);
+void ffDestroyProcessesOptions(FFProcessesOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseProcessesJsonObject(FFinstance* instance, json_object* module);
+#endif