Logo: move logo command line option parser to a separate file

Prepare for JSON config support

src/common/init.c

@@ -3,6 +3,7 @@
 #include "common/thread.h"
 #include "detection/displayserver/displayserver.h"
 #include "util/textModifier.h"
+#include "logo/logo.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -36,23 +37,7 @@ static void initModuleArg(FFModuleArgs* args)
 
 static void defaultConfig(FFinstance* instance)
 {
-    ffStrbufInitA(&instance->config.logo.source, 0);
-    instance->config.logo.type = FF_LOGO_TYPE_AUTO;
-    for(uint8_t i = 0; i < (uint8_t) FASTFETCH_LOGO_MAX_COLORS; ++i)
-        ffStrbufInit(&instance->config.logo.colors[i]);
-    instance->config.logo.width = 0;
-    instance->config.logo.height = 0; //preserve aspect ratio
-    instance->config.logo.paddingTop = 0;
-    instance->config.logo.paddingLeft = 0;
-    instance->config.logo.paddingRight = 4;
-    instance->config.logo.printRemaining = true;
-    instance->config.logo.preserveAspectRadio = false;
-
-    instance->config.logo.chafaFgOnly = false;
-    ffStrbufInitS(&instance->config.logo.chafaSymbols, "block+border+space-wide-inverted"); // Chafa default
-    instance->config.logo.chafaCanvasMode = UINT32_MAX;
-    instance->config.logo.chafaColorSpace = UINT32_MAX;
-    instance->config.logo.chafaDitherMode = UINT32_MAX;
+    ffInitLogoOptions(&instance->config.logo);
 
     ffStrbufInit(&instance->config.colorKeys);
     ffStrbufInit(&instance->config.colorTitle);
@@ -304,10 +289,8 @@ static void destroyModuleArg(FFModuleArgs* args)
 
 static void destroyConfig(FFinstance* instance)
 {
-    ffStrbufDestroy(&instance->config.logo.source);
-    ffStrbufDestroy(&instance->config.logo.chafaSymbols);
-    for(uint8_t i = 0; i < (uint8_t) FASTFETCH_LOGO_MAX_COLORS; ++i)
-        ffStrbufDestroy(&instance->config.logo.colors[i]);
+    ffDestroyLogoOptions(&instance->config.logo);
+
     ffStrbufDestroy(&instance->config.colorKeys);
     ffStrbufDestroy(&instance->config.colorTitle);
     ffStrbufDestroy(&instance->config.keyValueSeparator);

src/common/option.c

@@ -14,6 +14,10 @@ const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName)
         return NULL;
 
     subKey += moduleNameLen;
+
+    if(subKey[0] == '\0')
+        return subKey;
+
     if(subKey[0] != '-')
         return NULL;
 
@@ -101,6 +105,40 @@ bool ffOptionParseBoolean(const char* str)
     );
 }
 
+void ffOptionParseColor(const char* key, const char* value, FFstrbuf* buffer)
+{
+    if(value == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <str>\n", key);
+        exit(477);
+    }
+    ffStrbufEnsureFree(buffer, 63);
+
+    while(*value != '\0')
+    {
+        #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
+            if(strncasecmp(value, #prefix, strlen(#prefix))) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); }
+
+        FF_APPEND_COLOR_CODE_COND(reset_, "0;")
+        else FF_APPEND_COLOR_CODE_COND(bright_, "1;")
+        else FF_APPEND_COLOR_CODE_COND(black, "30")
+        else FF_APPEND_COLOR_CODE_COND(red, "31")
+        else FF_APPEND_COLOR_CODE_COND(green, "32")
+        else FF_APPEND_COLOR_CODE_COND(yellow, "33")
+        else FF_APPEND_COLOR_CODE_COND(blue, "34")
+        else FF_APPEND_COLOR_CODE_COND(magenta, "35")
+        else FF_APPEND_COLOR_CODE_COND(cyan, "36")
+        else FF_APPEND_COLOR_CODE_COND(white, "37")
+        else
+        {
+            ffStrbufAppendC(buffer, *value);
+            ++value;
+        }
+
+        #undef FF_APPEND_COLOR_CODE_COND
+    }
+}
+
 void ffOptionInitModuleArg(FFModuleArgs* args)
 {
     ffStrbufInit(&args->key);

src/common/option.h

@@ -21,5 +21,6 @@ void ffOptionParseString(const char* argumentKey, const char* value, FFstrbuf* b
 FF_C_NODISCARD uint32_t ffOptionParseUInt32(const char* argumentKey, const char* value);
 FF_C_NODISCARD int ffOptionParseEnum(const char* argumentKey, const char* requestedKey, FFKeyValuePair pairs[]);
 FF_C_NODISCARD bool ffOptionParseBoolean(const char* str);
+void ffOptionParseColor(const char* key, const char* value, FFstrbuf* buffer);
 void ffOptionInitModuleArg(FFModuleArgs* args);
 void ffOptionDestroyModuleArg(FFModuleArgs* args);