Brightness: support JSON config

src/modules/brightness.c

@@ -1,58 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/brightness/brightness.h"
-
-#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
-#define FF_BRIGHTNESS_NUM_FORMAT_ARGS 2
-
-void ffPrintBrightness(FFinstance* instance)
-{
-    FF_LIST_AUTO_DESTROY result;
-    ffListInit(&result, sizeof(FFBrightnessResult));
-    const char* error = ffDetectBrightness(&result);
-
-    if(error)
-    {
-        ffPrintError(instance, FF_BRIGHTNESS_MODULE_NAME, 0, &instance->config.brightness, "%s", error);
-        return;
-    }
-
-    if(result.length == 0)
-    {
-        ffPrintError(instance, FF_BRIGHTNESS_MODULE_NAME, 0, &instance->config.brightness, "No result is detected.");
-        return;
-    }
-
-    FF_STRBUF_AUTO_DESTROY key;
-    ffStrbufInit(&key);
-
-    FF_LIST_FOR_EACH(FFBrightnessResult, item, result)
-    {
-        if(instance->config.brightness.key.length == 0)
-        {
-            ffStrbufAppendF(&key, "%s (%s)", FF_BRIGHTNESS_MODULE_NAME, item->name.chars);
-        }
-        else
-        {
-            ffParseFormatString(&key, &instance->config.brightness.key, 1, (FFformatarg[]){
-                {FF_FORMAT_ARG_TYPE_STRBUF, &item->name}
-            });
-        }
-
-        if(instance->config.brightness.outputFormat.length == 0)
-        {
-            ffPrintLogoAndKey(instance, key.chars, 0, NULL);
-            printf("%.0f%%\n", item->value);
-        }
-        else
-        {
-            ffPrintFormatString(instance, key.chars, 0, NULL, &instance->config.brightness.outputFormat, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) {
-                {FF_FORMAT_ARG_TYPE_STRBUF, &item->value},
-                {FF_FORMAT_ARG_TYPE_FLOAT, &item->name}
-            });
-        }
-
-        ffStrbufClear(&key);
-        ffStrbufDestroy(&item->name);
-    }
-}

src/modules/brightness/brightness.c

@@ -0,0 +1,111 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/brightness/brightness.h"
+#include "modules/brightness/brightness.h"
+
+#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
+#define FF_BRIGHTNESS_NUM_FORMAT_ARGS 2
+
+void ffPrintBrightness(FFinstance* instance, FFBrightnessOptions* options)
+{
+    FF_LIST_AUTO_DESTROY result;
+    ffListInit(&result, sizeof(FFBrightnessResult));
+    const char* error = ffDetectBrightness(&result);
+
+    if(error)
+    {
+        ffPrintError(instance, FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
+        return;
+    }
+
+    if(result.length == 0)
+    {
+        ffPrintError(instance, FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "No result is detected.");
+        return;
+    }
+
+    FF_STRBUF_AUTO_DESTROY key;
+    ffStrbufInit(&key);
+
+    FF_LIST_FOR_EACH(FFBrightnessResult, item, result)
+    {
+        if(options->moduleArgs.key.length == 0)
+        {
+            ffStrbufAppendF(&key, "%s (%s)", FF_BRIGHTNESS_MODULE_NAME, item->name.chars);
+        }
+        else
+        {
+            ffParseFormatString(&key, &options->moduleArgs.key, 1, (FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_STRBUF, &item->name}
+            });
+        }
+
+        if(options->moduleArgs.outputFormat.length == 0)
+        {
+            ffPrintLogoAndKey(instance, key.chars, 0, NULL);
+            printf("%.0f%%\n", item->value);
+        }
+        else
+        {
+            ffPrintFormatString(instance, key.chars, 0, NULL, &options->moduleArgs.outputFormat, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) {
+                {FF_FORMAT_ARG_TYPE_STRBUF, &item->value},
+                {FF_FORMAT_ARG_TYPE_FLOAT, &item->name}
+            });
+        }
+
+        ffStrbufClear(&key);
+        ffStrbufDestroy(&item->name);
+    }
+}
+
+void ffInitBrightnessOptions(FFBrightnessOptions* options)
+{
+    options->moduleName = FF_BRIGHTNESS_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_BRIGHTNESS_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyBrightnessOptions(FFBrightnessOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
+{
+    if (strcasecmp(type, FF_BRIGHTNESS_MODULE_NAME) != 0)
+        return false;
+
+    FFBrightnessOptions __attribute__((__cleanup__(ffDestroyBrightnessOptions))) options;
+    ffInitBrightnessOptions(&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 (ffJsonConfigParseModuleArgs(data, key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_BRIGHTNESS_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintBrightness(instance, &options);
+    return true;
+}
+#endif

src/modules/brightness/brightness.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "fastfetch.h"
+
+void ffPrintBrightness(FFinstance* instance, FFBrightnessOptions* options);
+void ffInitBrightnessOptions(FFBrightnessOptions* options);
+bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value);
+void ffDestroyBrightnessOptions(FFBrightnessOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/config.h"
+bool ffParseBrightnessJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
+#endif

src/modules/brightness/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 FFBrightnessOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+} FFBrightnessOptions;

src/modules/jsonconfig/jsonconfig.c

@@ -18,6 +18,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type,
         ffParseBluetoothJsonObject(instance, type, data, module) ||
         ffParseBoardJsonObject(instance, type, data, module) ||
         ffParseBreakJsonObject(instance, type, data, module) ||
+        ffParseBrightnessJsonObject(instance, type, data, module) ||
         ffParseCommandJsonObject(instance, type, data, module) ||
         ffParseDateTimeJsonObject(instance, type, data, module) ||
         ffParseDisplayJsonObject(instance, type, data, module) ||

src/modules/modules.h

@@ -6,6 +6,7 @@
 #include "modules/battery/battery.h"
 #include "modules/bios/bios.h"
 #include "modules/bluetooth/bluetooth.h"
+#include "modules/brightness/brightness.h"
 #include "modules/board/board.h"
 #include "modules/break/break.h"
 #include "modules/command/command.h"

src/modules/options.h

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