Uptime: support JSON config

src/modules/jsonconfig/jsonconfig.c

@@ -107,6 +107,12 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
                 false;
         }
 
+        case 'U': {
+            return
+                tryModule(instance, type, module, FF_UPTIME_MODULE_NAME, ffParseUptimeJsonObject) ||
+                false;
+        }
+
         default:
             return false;
     }

src/modules/modules.h

@@ -29,3 +29,4 @@
 #include "modules/sound/sound.h"
 #include "modules/title/title.h"
 #include "modules/jsonconfig/jsonconfig.h"
+#include "modules/uptime/uptime.h"

src/modules/options.h

@@ -26,3 +26,4 @@
 #include "modules/separator/option.h"
 #include "modules/sound/option.h"
 #include "modules/title/option.h"
+#include "modules/uptime/option.h"

src/modules/uptime.c

@@ -1,79 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/uptime/uptime.h"
-
-#define FF_UPTIME_MODULE_NAME "Uptime"
-#define FF_UPTIME_NUM_FORMAT_ARGS 4
-
-void ffPrintUptime(FFinstance* instance)
-{
-    uint64_t uptime;
-
-    const char* error = ffDetectUptime(&uptime);
-
-    if(error)
-    {
-        ffPrintError(instance, FF_UPTIME_MODULE_NAME, 0, &instance->config.uptime, "%s", error);
-        return;
-    }
-
-    uint32_t days    = (uint32_t)  uptime / 86400;
-    uint32_t hours   = (uint32_t) (uptime - (days * 86400)) / 3600;
-    uint32_t minutes = (uint32_t) (uptime - (days * 86400) - (hours * 3600)) / 60;
-    uint32_t seconds = (uint32_t)  uptime - (days * 86400) - (hours * 3600) - (minutes * 60);
-
-    if(instance->config.uptime.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_UPTIME_MODULE_NAME, 0, &instance->config.uptime.key);
-
-        if(days == 0 && hours == 0 && minutes == 0)
-        {
-            printf("%u seconds\n", seconds);
-            return;
-        }
-
-        if(days > 0)
-        {
-            printf("%u day", days);
-
-            if(days > 1)
-                putchar('s');
-
-            if(days >= 100)
-                fputs("(!)", stdout);
-
-            if(hours > 0 || minutes > 0)
-                fputs(", ", stdout);
-        }
-
-        if(hours > 0)
-        {
-            printf("%u hour", hours);
-
-            if(hours > 1)
-                putchar('s');
-
-            if(minutes > 0)
-                fputs(", ", stdout);
-        }
-
-        if(minutes > 0)
-        {
-            printf("%u min", minutes);
-
-            if(minutes > 1)
-                putchar('s');
-        }
-
-        putchar('\n');
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_UPTIME_MODULE_NAME, 0, &instance->config.uptime, FF_UPTIME_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_UINT, &days},
-            {FF_FORMAT_ARG_TYPE_UINT, &hours},
-            {FF_FORMAT_ARG_TYPE_UINT, &minutes},
-            {FF_FORMAT_ARG_TYPE_UINT, &seconds}
-        });
-    }
-}

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

src/modules/uptime/uptime.c

@@ -0,0 +1,121 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/uptime/uptime.h"
+#include "modules/uptime/uptime.h"
+
+#define FF_UPTIME_NUM_FORMAT_ARGS 4
+
+void ffPrintUptime(FFinstance* instance, FFUptimeOptions* options)
+{
+    uint64_t uptime;
+
+    const char* error = ffDetectUptime(&uptime);
+
+    if(error)
+    {
+        ffPrintError(instance, FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
+        return;
+    }
+
+    uint32_t days    = (uint32_t)  uptime / 86400;
+    uint32_t hours   = (uint32_t) (uptime - (days * 86400)) / 3600;
+    uint32_t minutes = (uint32_t) (uptime - (days * 86400) - (hours * 3600)) / 60;
+    uint32_t seconds = (uint32_t)  uptime - (days * 86400) - (hours * 3600) - (minutes * 60);
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        if(days == 0 && hours == 0 && minutes == 0)
+        {
+            printf("%u seconds\n", seconds);
+            return;
+        }
+
+        if(days > 0)
+        {
+            printf("%u day", days);
+
+            if(days > 1)
+                putchar('s');
+
+            if(days >= 100)
+                fputs("(!)", stdout);
+
+            if(hours > 0 || minutes > 0)
+                fputs(", ", stdout);
+        }
+
+        if(hours > 0)
+        {
+            printf("%u hour", hours);
+
+            if(hours > 1)
+                putchar('s');
+
+            if(minutes > 0)
+                fputs(", ", stdout);
+        }
+
+        if(minutes > 0)
+        {
+            printf("%u min", minutes);
+
+            if(minutes > 1)
+                putchar('s');
+        }
+
+        putchar('\n');
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_UPTIME_MODULE_NAME, 0, &options->moduleArgs, FF_UPTIME_NUM_FORMAT_ARGS, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_UINT, &days},
+            {FF_FORMAT_ARG_TYPE_UINT, &hours},
+            {FF_FORMAT_ARG_TYPE_UINT, &minutes},
+            {FF_FORMAT_ARG_TYPE_UINT, &seconds}
+        });
+    }
+}
+
+void ffInitUptimeOptions(FFUptimeOptions* options)
+{
+    options->moduleName = FF_UPTIME_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_UPTIME_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyUptimeOptions(FFUptimeOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseUptimeJsonObject(FFinstance* instance, json_object* module)
+{
+    FFUptimeOptions __attribute__((__cleanup__(ffDestroyUptimeOptions))) options;
+    ffInitUptimeOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_UPTIME_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintUptime(instance, &options);
+}
+#endif

src/modules/uptime/uptime.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "fastfetch.h"
+#include "modules/title/option.h"
+
+#define FF_UPTIME_MODULE_NAME "Uptime"
+
+void ffPrintUptime(FFinstance* instance, FFUptimeOptions* options);
+void ffInitUptimeOptions(FFUptimeOptions* options);
+bool ffParseUptimeCommandOptions(FFUptimeOptions* options, const char* key, const char* value);
+void ffDestroyUptimeOptions(FFUptimeOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseUptimeJsonObject(FFinstance* instance, json_object* module);
+#endif