Global: init support for JSON config file migration (WIP)

src/common/commandoption.c

@@ -1,6 +1,7 @@
 #include "commandoption.h"
 #include "common/printing.h"
 #include "common/time.h"
+#include "common/jsonconfig.h"
 #include "fastfetch_datatext.h"
 #include "modules/modules.h"
 #include "util/stringUtils.h"
@@ -8,7 +9,27 @@
 #include <ctype.h>
 #include <inttypes.h>
 
-static inline yyjson_mut_val* genJson(FFModuleBaseInfo* baseInfo)
+static inline yyjson_mut_val* genJsonConfig(FFModuleBaseInfo* baseInfo)
+{
+    yyjson_mut_doc* doc = instance.state.migrateConfigDoc;
+    if (__builtin_expect(!doc, true)) return NULL;
+
+    yyjson_mut_val* modules = yyjson_mut_obj_get(doc->root, "modules");
+    if (!modules)
+        modules = yyjson_mut_obj_add_arr(doc, doc->root, "modules");
+
+    yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, modules);
+    FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
+    ffStrbufLowerCase(&type);
+    yyjson_mut_obj_add_strbuf(doc, module, "type", &type);
+
+    if (baseInfo->generateJsonConfig)
+        baseInfo->generateJsonConfig(baseInfo, doc, module);
+
+    return module;
+}
+
+static inline yyjson_mut_val* genJsonResult(FFModuleBaseInfo* baseInfo)
 {
     yyjson_mut_doc* doc = instance.state.resultDoc;
     if (__builtin_expect(!doc, true)) return NULL;
@@ -31,7 +52,7 @@ bool ffParseModuleCommand(const char* type)
         FFModuleBaseInfo* baseInfo = *modules;
         if (ffStrEqualsIgnCase(type, baseInfo->name))
         {
-            if (!genJson(baseInfo))
+            if (!genJsonConfig(baseInfo) && !genJsonResult(baseInfo))
                 baseInfo->printModule(baseInfo);
             return true;
         }
@@ -88,7 +109,7 @@ static void parseStructureCommand(const char* line, FFlist* customValues)
             if (customValue->printKey)
                 ffStrbufAppend(&options.moduleArgs.key, &customValue->key);
             ffStrbufAppend(&options.moduleArgs.outputFormat, &customValue->value);
-            ffPrintCustom(&options);
+            if (!genJsonConfig((FFModuleBaseInfo*) &options)) ffPrintCustom(&options);
             return;
         }
     }
@@ -135,9 +156,19 @@ void ffPrintCommandOption(FFdata* data)
         }
 
         #if defined(_WIN32)
-            if (!instance.config.noBuffer) fflush(stdout);
+            if (!resultDoc && !instance.config.noBuffer) fflush(stdout);
         #endif
 
         startIndex = colonIndex + 1;
     }
 }
+
+void ffMigrateCommandOptionToJsonc(FFdata* data)
+{
+    //If we don't have a custom structure, use the default one
+    if(data->structure.length == 0)
+        ffStrbufAppendS(&data->structure, FASTFETCH_DATATEXT_STRUCTURE);
+    instance.config.stat = false;
+    ffPrintCommandOption(data);
+    yyjson_mut_write_fp(stdout, instance.state.migrateConfigDoc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
+}

src/common/commandoption.h

@@ -24,5 +24,6 @@ bool ffParseModuleCommand(const char* type);
 bool ffParseModuleOptions(const char* key, const char* value);
 void ffPrepareCommandOption(FFdata* data);
 void ffPrintCommandOption(FFdata* data);
+void ffMigrateCommandOptionToJsonc(FFdata* data);
 
 #endif

src/common/init.c

@@ -381,6 +381,7 @@ static void destroyState(void)
     ffPlatformDestroy(&instance.state.platform);
     yyjson_doc_free(instance.state.configDoc);
     yyjson_mut_doc_free(instance.state.resultDoc);
+    yyjson_mut_doc_free(instance.state.migrateConfigDoc);
 }
 
 void ffDestroyInstance(void)

src/common/jsonconfig.c

@@ -35,6 +35,18 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*
     return false;
 }
 
+void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* defaultModuleArgs, FFModuleArgs* moduleArgs)
+{
+    if (!ffStrbufEqual(&defaultModuleArgs->key, &moduleArgs->key))
+        yyjson_mut_obj_add_strbuf(doc, module, "key", &moduleArgs->key);
+    if (!ffStrbufEqual(&defaultModuleArgs->outputFormat, &moduleArgs->outputFormat))
+        yyjson_mut_obj_add_strbuf(doc, module, "format", &moduleArgs->outputFormat);
+    if (!ffStrbufEqual(&defaultModuleArgs->keyColor, &moduleArgs->keyColor))
+        yyjson_mut_obj_add_strbuf(doc, module, "keyColor", &moduleArgs->keyColor);
+    if (moduleArgs->keyWidth != defaultModuleArgs->keyWidth)
+        yyjson_mut_obj_add_uint(doc, module, "keyWidth", moduleArgs->keyWidth);
+}
+
 const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[])
 {
     if (yyjson_is_int(val))

src/common/jsonconfig.h

@@ -8,6 +8,7 @@ void ffPrintJsonConfig(bool prepare);
 const char* ffParseGeneralJsonConfig(void);
 const char* ffParseDisplayJsonConfig(void);
 const char* ffParseLibraryJsonConfig(void);
+void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* defaultModuleArgs, FFModuleArgs* moduleArgs);
 
 yyjson_api_inline bool yyjson_mut_obj_add_strbuf(yyjson_mut_doc *doc,
                                                   yyjson_mut_val *obj,

src/common/option.h

@@ -19,6 +19,7 @@ typedef struct FFModuleBaseInfo
     void (*printModule)(void* options);
     void (*generateJsonResult)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module);
     void (*printHelpFormat)(void);
+    void (*generateJsonConfig)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* obj);
 } FFModuleBaseInfo;
 
 static inline void ffOptionInitModuleBaseInfo(
@@ -28,7 +29,8 @@ static inline void ffOptionInitModuleBaseInfo(
     void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module)
     void* printModule, // void (*const printModule)(void* options)
     void* generateJsonResult, // void (*const generateJsonResult)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj)
-    void (*printHelpFormat)(void)
+    void (*printHelpFormat)(void),
+    void* generateJsonConfig // void (*const generateJsonConfig)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj)
 )
 {
     baseInfo->name = name;
@@ -37,6 +39,7 @@ static inline void ffOptionInitModuleBaseInfo(
     baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule;
     baseInfo->generateJsonResult = (__typeof__(baseInfo->generateJsonResult)) generateJsonResult;
     baseInfo->printHelpFormat = printHelpFormat;
+    baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig;
 }
 
 typedef struct FFModuleArgs