Icons: split detection code

src/detection/icons/icons.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_icons
+#define FF_INCLUDED_detection_icons
+
+#include "fastfetch.h"
+
+const char* ffDetectIcons(const FFinstance* instance, FFstrbuf* result);
+
+#endif

src/detection/icons/icons_linux.c

@@ -0,0 +1,36 @@
+#include "icons.h"
+#include "common/parsing.h"
+#include "detection/gtk_qt/gtk_qt.h"
+#include "detection/displayserver/displayserver.h"
+
+const char* ffDetectIcons(const FFinstance* instance, FFstrbuf* result)
+{
+    const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
+
+    if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0)
+        return "Icons aren't supported in TTY";
+
+    const FFstrbuf* plasma = &ffDetectQt(instance)->icons;
+    const FFstrbuf* gtk2 = &ffDetectGTK2(instance)->icons;
+    const FFstrbuf* gtk3 = &ffDetectGTK3(instance)->icons;
+    const FFstrbuf* gtk4 = &ffDetectGTK4(instance)->icons;
+
+    if(plasma->length == 0 && gtk2->length == 0 && gtk3->length == 0 && gtk4->length == 0)
+        return "No icons could be found";
+
+    FF_STRBUF_AUTO_DESTROY gtkPretty;
+    ffStrbufInit(&gtkPretty);
+    ffParseGTK(&gtkPretty, gtk2, gtk3, gtk4);
+
+    if(plasma->length > 0)
+    {
+        ffStrbufAppend(result, plasma);
+        ffStrbufAppendS(result, " [QT]");
+
+        if(gtkPretty.length > 0)
+            ffStrbufAppendS(result, ", ");
+    }
+    ffStrbufAppend(result, &gtkPretty);
+
+    return NULL;
+}

src/detection/icons/icons_nosupport.c

@@ -0,0 +1,6 @@
+#include "icons.h"
+
+const char* ffDetectIcons(FF_MAYBE_UNUSED const FFinstance* instance, FF_MAYBE_UNUSED FFstrbuf* result)
+{
+    return "Not supported on this platform";
+}

src/fastfetch.c

@@ -219,12 +219,8 @@ static inline void printCommandHelp(const char* command)
     }
     else if(strcasecmp(command, "icons-format") == 0)
     {
-        constructAndPrintCommandHelpFormat("icons", "{} [Plasma], {5}", 5,
-            "Plasma icons",
-            "GTK2 icons",
-            "GTK3 icons",
-            "GTK4 icons",
-            "Combined GTK icons"
+        constructAndPrintCommandHelpFormat("icons", "{}", 1,
+            "Combined icons"
         );
     }
     else if(strcasecmp(command, "font-format") == 0)

src/modules/icons.c

@@ -1,70 +1,31 @@
 #include "fastfetch.h"
 #include "common/printing.h"
-#include "common/parsing.h"
-#include "detection/gtk_qt/gtk_qt.h"
-#include "detection/displayserver/displayserver.h"
+#include "detection/icons/icons.h"
 
 #define FF_ICONS_MODULE_NAME "Icons"
-#define FF_ICONS_NUM_FORMAT_ARGS 5
+#define FF_ICONS_NUM_FORMAT_ARGS 1
 
 void ffPrintIcons(FFinstance* instance)
 {
-    #if defined(__ANDROID__) || defined(__APPLE__) || defined(_WIN32)
+    FF_STRBUF_AUTO_DESTROY icons;
+    ffStrbufInit(&icons);
+    const char* error = ffDetectIcons(instance, &icons);
 
-    FF_UNUSED(instance);
-    ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "Icons detection is not supported");
-    return;
-
-    #else
-
-    const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
-
-    if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0)
+    if(error)
     {
-        ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "Icons aren't supported in TTY");
+        ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "%s", error);
         return;
     }
 
-    const FFstrbuf* plasma = &ffDetectQt(instance)->icons;
-    const FFstrbuf* gtk2 = &ffDetectGTK2(instance)->icons;
-    const FFstrbuf* gtk3 = &ffDetectGTK3(instance)->icons;
-    const FFstrbuf* gtk4 = &ffDetectGTK4(instance)->icons;
-
-    if(plasma->length == 0 && gtk2->length == 0 && gtk3->length == 0 && gtk4->length == 0)
-    {
-        ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "No icons could be found");
-        return;
-    }
-
-    FF_STRBUF_AUTO_DESTROY gtkPretty;
-    ffStrbufInit(&gtkPretty);
-    ffParseGTK(&gtkPretty, gtk2, gtk3, gtk4);
-
     if(instance->config.icons.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons.key);
-
-        if(plasma->length > 0)
-        {
-            ffStrbufWriteTo(plasma, stdout);
-            fputs(" [QT]", stdout);
-
-            if(gtkPretty.length > 0)
-                fputs(", ", stdout);
-        }
-
-        ffStrbufPutTo(&gtkPretty, stdout);
+        ffStrbufPutTo(&icons, stdout);
     }
     else
     {
         ffPrintFormat(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, FF_ICONS_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, plasma},
-            {FF_FORMAT_ARG_TYPE_STRBUF, gtk2},
-            {FF_FORMAT_ARG_TYPE_STRBUF, gtk3},
-            {FF_FORMAT_ARG_TYPE_STRBUF, gtk4},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &gtkPretty}
+            {FF_FORMAT_ARG_TYPE_STRBUF, &icons}
         });
     }
-
-    #endif
 }