Global: puts more fastfetch-only properties into FFdata

src/common/FFPlatform.h

@@ -18,7 +18,7 @@ typedef struct FFPlatform
     FFstrbuf cacheDir; // Trailing slash included
     FFlist configDirs; // List of FFstrbuf, trailing slash included
     FFlist dataDirs;   // List of FFstrbuf, trailing slash included
-    FFstrbuf exePath; // The real path of current exe
+    FFstrbuf exePath;  // The real path of current exe (empty if unavailable)
 
     FFstrbuf userName;
     FFstrbuf fullUserName;

src/common/commandoption.h

@@ -1,16 +1,8 @@
 #pragma once
 
-#include "fastfetch.h"
-
-// Things only needed by fastfetch
-typedef struct FFdata
-{
-    FFstrbuf structure;
-    FFstrbuf structureDisabled;
-    bool configLoaded;
-} FFdata;
+#include "common/ffdata.h"
 
 void ffPrepareCommandOption(FFdata* data);
-void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc);
-void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc);
+void ffPrintCommandOption(FFdata* data);
+void ffMigrateCommandOptionToJsonc(FFdata* data);
 bool ffParseModuleOptions(const char* key, const char* value);

src/common/ffdata.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "common/FFstrbuf.h"
+
+typedef enum __attribute__((__packed__)) FFDataResultDocType
+{
+    FF_RESULT_DOC_TYPE_DEFAULT = 0,
+    FF_RESULT_DOC_TYPE_JSON,
+    FF_RESULT_DOC_TYPE_CONFIG,
+    FF_RESULT_DOC_TYPE_CONFIG_FULL,
+} FFDataResultDocType;
+
+// FFdata aggregates configuration, generation parameters, and output state used by fastfetch.
+// It holds the parsed configuration document, a mutable JSON document for results, and related metadata.
+typedef struct FFdata
+{
+    yyjson_doc* configDoc; // Parsed JSON configuration document
+    yyjson_mut_doc* resultDoc; // Mutable JSON document for storing results
+    FFstrbuf structure; // Custom output structure from command line
+    FFstrbuf structureDisabled; // Disabled modules in the output structure from command line
+    FFstrbuf genConfigPath; // Path to generate configuration file
+    FFDataResultDocType docType; // Type of result document
+    bool configLoaded;
+} FFdata;

src/common/impl/commandoption.c

@@ -127,8 +127,10 @@ void ffPrepareCommandOption(FFdata* data)
     }
 }
 
-static void genJsonConfig(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* doc)
+static void genJsonConfig(FFdata* data, FFModuleBaseInfo* baseInfo, void* options)
 {
+    yyjson_mut_doc* doc = data->resultDoc;
+
     yyjson_mut_val* modules = yyjson_mut_obj_get(doc->root, "modules");
     if (!modules)
         modules = yyjson_mut_obj_add_arr(doc, doc->root, "modules");
@@ -136,7 +138,7 @@ static void genJsonConfig(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_
     FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
     ffStrbufLowerCase(&type);
 
-    if (instance.state.fullConfig)
+    if (data->docType == FF_RESULT_DOC_TYPE_CONFIG_FULL)
     {
         yyjson_mut_val* module = yyjson_mut_obj(doc);
         yyjson_mut_obj_add_strbuf(doc, module, "type", &type);
@@ -155,8 +157,9 @@ static void genJsonConfig(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_
     }
 }
 
-static void genJsonResult(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* doc)
+static void genJsonResult(FFdata* data, FFModuleBaseInfo* baseInfo, void* options)
 {
+    yyjson_mut_doc* doc = data->resultDoc;
     yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
     yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name);
     if (baseInfo->generateJsonResult)
@@ -166,9 +169,9 @@ static void genJsonResult(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_
 }
 
 static void parseStructureCommand(
+    FFdata* data,
     const char* line,
-    void (*fn)(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* jsonDoc),
-    yyjson_mut_doc* jsonDoc
+    void (*fn)(FFdata*, FFModuleBaseInfo* baseInfo, void* options)
 )
 {
     if(ffCharIsEnglishAlphabet(line[0]))
@@ -180,8 +183,8 @@ static void parseStructureCommand(
             {
                 uint8_t optionBuf[FF_OPTION_MAX_SIZE];
                 baseInfo->initOptions(optionBuf);
-                if (__builtin_expect(jsonDoc != NULL, false))
-                    fn(baseInfo, optionBuf, jsonDoc);
+                if (__builtin_expect(data->resultDoc != NULL, false))
+                    fn(data, baseInfo, optionBuf);
                 else
                     baseInfo->printModule(optionBuf);
                 baseInfo->destroyOptions(optionBuf);
@@ -193,7 +196,7 @@ static void parseStructureCommand(
     ffPrintError(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
 }
 
-void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
+void ffPrintCommandOption(FFdata* data)
 {
     //Parse the structure and call the modules
     int32_t thres = instance.config.display.stat;
@@ -209,16 +212,16 @@ void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
         if(thres >= 0)
             ms = ffTimeGetTick();
 
-        parseStructureCommand(moduleType, genJsonResult, jsonDoc);
+        parseStructureCommand(data, moduleType, genJsonResult);
 
         if(thres >= 0)
         {
             ms = ffTimeGetTick() - ms;
 
-            if (jsonDoc)
+            if (data->resultDoc)
             {
-                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(data->resultDoc->root);
+                yyjson_mut_obj_add_real(data->resultDoc, moduleJson, "stat", ms);
             }
             else
             {
@@ -236,7 +239,7 @@ void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
     }
 }
 
-void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc)
+void ffMigrateCommandOptionToJsonc(FFdata* data)
 {
     //If we don't have a custom structure, use the default one
     if(data->structure.length == 0)
@@ -249,6 +252,6 @@ void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc)
         if (ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleType, ':'))
             continue;
 
-        parseStructureCommand(moduleType, genJsonConfig, jsonDoc);
+        parseStructureCommand(data, moduleType, genJsonConfig);
     }
 }

src/common/impl/init.c

@@ -28,8 +28,6 @@ static void initState(FFstate* state)
     state->titleFqdn = false;
 
     ffPlatformInit(&state->platform);
-    state->configDoc = NULL;
-    state->resultDoc = NULL;
     state->dynamicInterval = 0;
 
     {
@@ -96,8 +94,8 @@ static void exitSignalHandler(FF_MAYBE_UNUSED int signal)
 
 void ffStart(void)
 {
-    ffDisableLinewrap = instance.config.display.disableLinewrap && !instance.config.display.pipe && !instance.state.resultDoc;
-    ffHideCursor = instance.config.display.hideCursor && !instance.config.display.pipe && !instance.state.resultDoc;
+    ffDisableLinewrap = instance.config.display.disableLinewrap && !instance.config.display.pipe;
+    ffHideCursor = instance.config.display.hideCursor && !instance.config.display.pipe;
 
     #ifdef _WIN32
     SetErrorMode(SEM_FAILCRITICALERRORS);
@@ -124,7 +122,7 @@ void ffStart(void)
     #endif
 
     //reset everything to default before we start printing
-    if(!instance.config.display.pipe && !instance.state.resultDoc)
+    if(!instance.config.display.pipe)
         fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
 
     if(ffHideCursor)
@@ -138,8 +136,6 @@ void ffStart(void)
         fputs("\033[?1049h\033[H", stdout); // Enable alternate buffer
         fflush(stdout);
     }
-
-    ffLogoPrint();
 }
 
 void ffFinish(void)
@@ -157,9 +153,6 @@ static void destroyConfig(void)
 static void destroyState(void)
 {
     ffPlatformDestroy(&instance.state.platform);
-    yyjson_doc_free(instance.state.configDoc);
-    yyjson_mut_doc_free(instance.state.resultDoc);
-    ffStrbufDestroy(&instance.state.genConfigPath);
 }
 
 void ffDestroyInstance(void)

src/common/impl/jsonconfig.c

@@ -230,9 +230,10 @@ static bool matchesJsonArray(const char* str, yyjson_val* val)
     return false;
 }
 
-static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
+static const char* printJsonConfig(FFdata* data, bool prepare)
 {
-    yyjson_val* const root = yyjson_doc_get_root(instance.state.configDoc);
+    yyjson_mut_doc* jsonDoc = data->resultDoc;
+    yyjson_val* const root = yyjson_doc_get_root(data->configDoc);
     assert(root);
 
     if (!yyjson_is_obj(root))
@@ -329,9 +330,10 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
     return NULL;
 }
 
-void ffPrintJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
+void ffPrintJsonConfig(FFdata* data, bool prepare)
 {
-    const char* error = printJsonConfig(prepare, jsonDoc);
+    yyjson_mut_doc* jsonDoc = data->resultDoc;
+    const char* error = printJsonConfig(data, prepare);
     if (error)
     {
         if (jsonDoc)

src/common/jsonconfig.h

@@ -1,11 +1,10 @@
 #pragma once
 
-#include "fastfetch.h"
+#include "common/ffdata.h"
+#include "common/option.h"
 
 bool ffJsonConfigParseModuleArgs(yyjson_val* key, yyjson_val* val, FFModuleArgs* moduleArgs);
 const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[]);
-void ffPrintJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc);
-void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* moduleArgs);
 
 yyjson_api_inline yyjson_mut_val* yyjson_mut_strbuf(yyjson_mut_doc *doc, const FFstrbuf* buf) {
     return yyjson_mut_strncpy(doc, buf->chars, buf->length);
@@ -23,3 +22,6 @@ yyjson_api_inline bool yyjson_mut_arr_add_strbuf(yyjson_mut_doc *doc,
                                                   const FFstrbuf* buf) {
     return yyjson_mut_arr_add_strncpy(doc, obj, buf->chars, buf->length);
 }
+
+void ffPrintJsonConfig(FFdata* data, bool prepare);
+void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFModuleArgs* moduleArgs);