CPU: support JSON config

src/modules/cpu.c

@@ -1,56 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/cpu/cpu.h"
-
-#define FF_CPU_MODULE_NAME "CPU"
-#define FF_CPU_NUM_FORMAT_ARGS 8
-
-void ffPrintCPU(FFinstance* instance)
-{
-    const FFCPUResult* cpu = ffDetectCPU(instance);
-
-    if(cpu->vendor.length == 0 && cpu->name.length == 0 && cpu->coresOnline <= 1)
-    {
-        ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu, "No CPU detected");
-        return;
-    }
-
-    if(instance->config.cpu.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu.key);
-
-        if(cpu->name.length > 0)
-            ffStrbufWriteTo(&cpu->name, stdout);
-        else if(cpu->vendor.length > 0)
-        {
-            ffStrbufWriteTo(&cpu->vendor, stdout);
-            fputs(" CPU", stdout);
-        }
-        else
-            fputs("CPU", stdout);
-
-        if(cpu->coresOnline > 1)
-            printf(" (%u)", cpu->coresOnline);
-
-        if(cpu->frequencyMax > 0.0)
-            printf(" @ %.9g GHz", cpu->frequencyMax);
-
-        if(cpu->temperature == cpu->temperature) //FF_CPU_TEMP_UNSET
-            printf(" - %.1f°C", cpu->temperature);
-
-        putchar('\n');
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu, FF_CPU_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->name},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->vendor},
-            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresPhysical},
-            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresLogical},
-            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresOnline},
-            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMin},
-            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMax},
-            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->temperature}
-        });
-    }
-}

src/modules/cpu/cpu.c

@@ -0,0 +1,111 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/cpu/cpu.h"
+#include "modules/cpu/cpu.h"
+
+#define FF_CPU_NUM_FORMAT_ARGS 8
+
+void ffPrintCPU(FFinstance* instance, FFCPUOptions* options)
+{
+    const FFCPUResult* cpu = ffDetectCPU(instance);
+
+    if(cpu->vendor.length == 0 && cpu->name.length == 0 && cpu->coresOnline <= 1)
+    {
+        ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "No CPU detected");
+        return;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_CPU_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        if(cpu->name.length > 0)
+            ffStrbufWriteTo(&cpu->name, stdout);
+        else if(cpu->vendor.length > 0)
+        {
+            ffStrbufWriteTo(&cpu->vendor, stdout);
+            fputs(" CPU", stdout);
+        }
+        else
+            fputs("CPU", stdout);
+
+        if(cpu->coresOnline > 1)
+            printf(" (%u)", cpu->coresOnline);
+
+        if(cpu->frequencyMax > 0.0)
+            printf(" @ %.9g GHz", cpu->frequencyMax);
+
+        if(cpu->temperature == cpu->temperature) //FF_CPU_TEMP_UNSET
+            printf(" - %.1f°C", cpu->temperature);
+
+        putchar('\n');
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_CPU_NUM_FORMAT_ARGS, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->name},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->vendor},
+            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresPhysical},
+            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresLogical},
+            {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresOnline},
+            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMin},
+            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMax},
+            {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->temperature}
+        });
+    }
+}
+
+void ffInitCPUOptions(FFCPUOptions* options)
+{
+    options->moduleName = FF_CPU_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+    options->temp = false;
+}
+
+bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_CPU_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    if (strcasecmp(subKey, "temp") == 0)
+    {
+        options->temp = ffOptionParseBoolean(value);
+        return true;
+    }
+
+    return false;
+}
+
+void ffDestroyCPUOptions(FFCPUOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseCPUJsonObject(FFinstance* instance, json_object* module)
+{
+    FFCPUOptions __attribute__((__cleanup__(ffDestroyCPUOptions))) options;
+    ffInitCPUOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            if (strcasecmp(key, "temp") == 0)
+            {
+                options.temp = (bool) json_object_get_boolean(val);
+                continue;
+            }
+
+            ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintCPU(instance, &options);
+}
+#endif

src/modules/cpu/cpu.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_CPU_MODULE_NAME "CPU"
+
+void ffPrintCPU(FFinstance* instance, FFCPUOptions* options);
+void ffInitCPUOptions(FFCPUOptions* options);
+bool ffParseCPUCommandOptions(FFCPUOptions* options, const char* key, const char* value);
+void ffDestroyCPUOptions(FFCPUOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseCPUJsonObject(FFinstance* instance, json_object* module);
+#endif

src/modules/cpu/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 FFCPUOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+
+    bool temp;
+} FFCPUOptions;

src/modules/cpuUsage.c

@@ -13,7 +13,7 @@ void ffPrintCPUUsage(FFinstance* instance)
 
     if(error)
     {
-        ffPrintError(instance, FF_CPU_USAGE_MODULE_NAME, 0, &instance->config.cpu, "%s", error);
+        ffPrintError(instance, FF_CPU_USAGE_MODULE_NAME, 0, &instance->config.cpuUsage, "%s", error);
         return;
     }
 

src/modules/jsonconfig/jsonconfig.c

@@ -39,6 +39,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
 
         case 'C': {
             return
+                tryModule(instance, type, module, FF_CPU_MODULE_NAME, ffParseCPUJsonObject) ||
                 tryModule(instance, type, module, FF_COMMAND_MODULE_NAME, ffParseCommandJsonObject) ||
                 tryModule(instance, type, module, FF_COLORS_MODULE_NAME, ffParseColorsJsonObject) ||
                 false;

src/modules/modules.h

@@ -9,6 +9,7 @@
 #include "modules/brightness/brightness.h"
 #include "modules/board/board.h"
 #include "modules/break/break.h"
+#include "modules/cpu/cpu.h"
 #include "modules/command/command.h"
 #include "modules/colors/colors.h"
 #include "modules/datetime/datetime.h"

src/modules/options.h

@@ -7,6 +7,7 @@
 #include "modules/bluetooth/option.h"
 #include "modules/board/option.h"
 #include "modules/brightness/option.h"
+#include "modules/cpu/option.h"
 #include "modules/command/option.h"
 #include "modules/datetime/option.h"
 #include "modules/display/option.h"