Fix several --help command related issues (#572)

iamrasel · web-flow · commit 1dfa0315dbbb · 2023-10-05T19:59:24.000+08:00
* Help: fix wrong output for irrelevant commands

* Help: fix `module-format` related issues

* Help: remove unnecessary code
diff --git a/src/fastfetch.c b/src/fastfetch.c
@@ -94,7 +94,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "bios-format"))
     {
-        constructAndPrintCommandHelpFormat("bios", "{2} {3}", 4,
+        constructAndPrintCommandHelpFormat("bios", "{4} ({2})", 4,
             "bios date",
             "bios release",
             "bios vendor",
@@ -103,15 +103,15 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "board-format"))
     {
-        constructAndPrintCommandHelpFormat("board", "{2} {3}", 3,
+        constructAndPrintCommandHelpFormat("board", "{1} ({3})", 3,
             "board name",
             "board vendor",
             "board version"
         );
     }
     else if(ffStrEqualsIgnCase(command, "chassis-format"))
     {
-        constructAndPrintCommandHelpFormat("chassis", "{2} {3}", 4,
+        constructAndPrintCommandHelpFormat("chassis", "{1}", 3,
             "chassis type",
             "chassis vendor",
             "chassis version"
@@ -127,7 +127,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "uptime-format"))
     {
-        constructAndPrintCommandHelpFormat("uptime", "{} days {} hours {} mins", 4,
+        constructAndPrintCommandHelpFormat("uptime", "{1} days {2} hours {3} mins", 4,
             "Days",
             "Hours",
             "Minutes",
@@ -136,7 +136,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "processes-format"))
     {
-        constructAndPrintCommandHelpFormat("processes", "{}", 1,
+        constructAndPrintCommandHelpFormat("processes", "{1}", 1,
             "Count"
         );
     }
@@ -182,7 +182,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "display-format"))
     {
-        constructAndPrintCommandHelpFormat("display", "{}x{} @ {}Hz", 7,
+        constructAndPrintCommandHelpFormat("display", "{1}x{2} @ {3}Hz", 8,
             "Screen width",
             "Screen height",
             "Screen refresh rate",
@@ -202,7 +202,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "monitor-format"))
     {
-        constructAndPrintCommandHelpFormat("monitor", "{}", 6,
+        constructAndPrintCommandHelpFormat("monitor", "{2}x{3} px - {4}x{5} mm ({6} inches, {7} ppi)", 7,
             "Display name",
             "Display native resolution width in pixels",
             "Display native resolution height in pixels",
@@ -230,31 +230,31 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "wmtheme-format"))
     {
-        constructAndPrintCommandHelpFormat("wmtheme", "{}", 1,
+        constructAndPrintCommandHelpFormat("wmtheme", "{1}", 1,
             "WM theme name"
         );
     }
     else if(ffStrEqualsIgnCase(command, "theme-format"))
     {
-        constructAndPrintCommandHelpFormat("theme", "{}", 1,
+        constructAndPrintCommandHelpFormat("theme", "{1}", 1,
             "Combined themes"
         );
     }
     else if(ffStrEqualsIgnCase(command, "icons-format"))
     {
-        constructAndPrintCommandHelpFormat("icons", "{}", 1,
+        constructAndPrintCommandHelpFormat("icons", "{1}", 1,
             "Combined icons"
         );
     }
     else if(ffStrEqualsIgnCase(command, "wallpaper-format"))
     {
-        constructAndPrintCommandHelpFormat("wallpaper", "{}", 1,
+        constructAndPrintCommandHelpFormat("wallpaper", "{1}", 1,
             "Wallpaper image file"
         );
     }
     else if(ffStrEqualsIgnCase(command, "font-format"))
     {
-        constructAndPrintCommandHelpFormat("font", "{} [QT], {} [GTK2], {} [GTK3], {} [GTK4]", 4,
+        constructAndPrintCommandHelpFormat("font", "{1} [QT], {2} [GTK2], {3} [GTK3], {4} [GTK4]", 4,
             "Font 1",
             "Font 2",
             "Font 3",
@@ -263,14 +263,14 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "cursor-format"))
     {
-        constructAndPrintCommandHelpFormat("cursor", "{} ({}pt)", 2,
+        constructAndPrintCommandHelpFormat("cursor", "{1}", 2,
             "Cursor theme",
             "Cursor size"
         );
     }
     else if(ffStrEqualsIgnCase(command, "terminal-format"))
     {
-        constructAndPrintCommandHelpFormat("terminal", "{3}", 10,
+        constructAndPrintCommandHelpFormat("terminal", "{5} {6}", 6,
             "Terminal process name",
             "Terminal path with exe name",
             "Terminal exe name",
@@ -281,7 +281,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "terminalfont-format"))
     {
-        constructAndPrintCommandHelpFormat("terminalfont", "{}", 4,
+        constructAndPrintCommandHelpFormat("terminalfont", "{1}", 4,
             "Terminal font",
             "Terminal font name",
             "Termianl font size",
@@ -290,7 +290,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "cpu-format"))
     {
-        constructAndPrintCommandHelpFormat("cpu", "{1} ({5}) @ {7}GHz", 8,
+        constructAndPrintCommandHelpFormat("cpu", "{1} ({5}) @ {7} GHz", 8,
             "Name",
             "Vendor",
             "Physical core count",
@@ -303,13 +303,13 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "cpuusage-format"))
     {
-        constructAndPrintCommandHelpFormat("cpuusage", "{0}%", 1,
+        constructAndPrintCommandHelpFormat("cpuusage", "{1}", 1,
             "CPU usage without percent mark"
         );
     }
     else if(ffStrEqualsIgnCase(command, "gpu-format"))
     {
-        constructAndPrintCommandHelpFormat("gpu", "{} {}", 6,
+        constructAndPrintCommandHelpFormat("gpu", "{1} {2}", 6,
             "GPU vendor",
             "GPU name",
             "GPU driver",
@@ -320,23 +320,23 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "memory-format"))
     {
-        constructAndPrintCommandHelpFormat("memory", "{} / {} ({}%)", 3,
+        constructAndPrintCommandHelpFormat("memory", "{1} / {2} ({3})", 3,
             "Used size",
             "Total size",
             "Percentage used"
         );
     }
     else if(ffStrEqualsIgnCase(command, "swap-format"))
     {
-        constructAndPrintCommandHelpFormat("swap", "{} / {} ({}%)", 3,
+        constructAndPrintCommandHelpFormat("swap", "{1} / {2} ({3})", 3,
             "Used size",
             "Total size",
             "Percentage used"
         );
     }
     else if(ffStrEqualsIgnCase(command, "disk-format"))
     {
-        constructAndPrintCommandHelpFormat("disk", "{1} / {2} ({3}%)", 9,
+        constructAndPrintCommandHelpFormat("disk", "{1} / {2} ({3}) - {9}", 9,
             "Size used",
             "Size total",
             "Size percentage",
@@ -370,20 +370,21 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "lm-format"))
     {
-        constructAndPrintCommandHelpFormat("lm", "{} ({})", 2,
+        constructAndPrintCommandHelpFormat("lm", "{1} {3} ({2})", 3,
             "LM service",
-            "LM type"
+            "LM type",
+            "LM version"
         );
     }
     else if(ffStrEqualsIgnCase(command, "locale-format"))
     {
-        constructAndPrintCommandHelpFormat("locale", "{}", 1,
+        constructAndPrintCommandHelpFormat("locale", "{1}", 1,
             "Locale code"
         );
     }
     else if(ffStrEqualsIgnCase(command, "localip-format"))
     {
-        constructAndPrintCommandHelpFormat("localip", "{}", 5,
+        constructAndPrintCommandHelpFormat("localip", "{1}{5}", 5,
             "Local IPv4 address",
             "Local IPv6 address",
             "Physical (MAC) address",
@@ -393,13 +394,14 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "publicip-format"))
     {
-        constructAndPrintCommandHelpFormat("publicip", "{}", 1,
-            "Public IP address"
+        constructAndPrintCommandHelpFormat("publicip", "{1} ({2})", 2,
+            "Public IP address",
+            "Location"
         );
     }
     else if(ffStrEqualsIgnCase(command, "netio-format"))
     {
-        constructAndPrintCommandHelpFormat("netio", "{}", 3,
+        constructAndPrintCommandHelpFormat("netio", "{1} (IN) - {2} (OUT){4}", 4,
             "Size of data received per second (formatted)",
             "Size of data sent per second (formatted)",
             "Interface name",
@@ -408,7 +410,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "wifi-format"))
     {
-        constructAndPrintCommandHelpFormat("wifi", "{4} - {6}", 3,
+        constructAndPrintCommandHelpFormat("wifi", "{4} - {10}", 10,
             "Interface description",
             "Interface status",
             "Connection status",
@@ -439,7 +441,7 @@ static inline void printCommandHelp(const char* command)
             "Album name"
         );
     }
-    else if(ffStrEqualsIgnCase(command, "datetime-format") == 0 || ffStrEqualsIgnCase(command, "date-format") || ffStrEqualsIgnCase(command, "time-format"))
+    else if(ffStrEqualsIgnCase(command, "datetime-format"))
     {
         constructAndPrintCommandHelpFormat("[date][time]", "{1}-{4}-{11} {14}:{18}:{20}", 20,
             "year",
@@ -466,7 +468,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "version-format"))
     {
-        constructAndPrintCommandHelpFormat("version", "{1} {2}{3} (5)", 6,
+        constructAndPrintCommandHelpFormat("version", "{1} {2}{3} ({5})", 8,
             "Project name",
             "Version",
             "Version tweak",
@@ -487,7 +489,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "opengl-format"))
     {
-        constructAndPrintCommandHelpFormat("opengl", "{}", 3,
+        constructAndPrintCommandHelpFormat("opengl", "{1}", 4,
             "version",
             "renderer",
             "vendor",
@@ -513,7 +515,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "sound-format"))
     {
-        constructAndPrintCommandHelpFormat("sound", "{2} (3%)", 4,
+        constructAndPrintCommandHelpFormat("sound", "{2} ({3}%)", 4,
             "Main",
             "Name",
             "Volume",
@@ -522,13 +524,13 @@ static inline void printCommandHelp(const char* command)
     }
     else if(ffStrEqualsIgnCase(command, "gamepad-format"))
     {
-        constructAndPrintCommandHelpFormat("gamepad", "{1}", 1,
+        constructAndPrintCommandHelpFormat("gamepad", "{1}", 2,
             "Name",
             "Identifier"
         );
     }
     else
-        fprintf(stderr, "No specific help for command %s provided\n", command);
+        fprintf(stderr, "No specific help for command '%s' provided\n", command);
 }
 
 static void listAvailablePresets(void)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static inline void printCommandHelp(const char* command)`
`94`	`94`	`}`
`95`	`95`	`else if(ffStrEqualsIgnCase(command, "bios-format"))`
`96`	`96`	`{`
`97`		`- constructAndPrintCommandHelpFormat("bios", "{2} {3}", 4,`
	`97`	`+ constructAndPrintCommandHelpFormat("bios", "{4} ({2})", 4,`
`98`	`98`	`"bios date",`
`99`	`99`	`"bios release",`
`100`	`100`	`"bios vendor",`
`@@ -103,15 +103,15 @@ static inline void printCommandHelp(const char* command)`
`103`	`103`	`}`
`104`	`104`	`else if(ffStrEqualsIgnCase(command, "board-format"))`
`105`	`105`	`{`
`106`		`- constructAndPrintCommandHelpFormat("board", "{2} {3}", 3,`
	`106`	`+ constructAndPrintCommandHelpFormat("board", "{1} ({3})", 3,`
`107`	`107`	`"board name",`
`108`	`108`	`"board vendor",`
`109`	`109`	`"board version"`
`110`	`110`	`);`
`111`	`111`	`}`
`112`	`112`	`else if(ffStrEqualsIgnCase(command, "chassis-format"))`
`113`	`113`	`{`
`114`		`- constructAndPrintCommandHelpFormat("chassis", "{2} {3}", 4,`
	`114`	`+ constructAndPrintCommandHelpFormat("chassis", "{1}", 3,`
`115`	`115`	`"chassis type",`
`116`	`116`	`"chassis vendor",`
`117`	`117`	`"chassis version"`
`@@ -127,7 +127,7 @@ static inline void printCommandHelp(const char* command)`
`127`	`127`	`}`
`128`	`128`	`else if(ffStrEqualsIgnCase(command, "uptime-format"))`
`129`	`129`	`{`
`130`		`- constructAndPrintCommandHelpFormat("uptime", "{} days {} hours {} mins", 4,`
	`130`	`+ constructAndPrintCommandHelpFormat("uptime", "{1} days {2} hours {3} mins", 4,`
`131`	`131`	`"Days",`
`132`	`132`	`"Hours",`
`133`	`133`	`"Minutes",`
`@@ -136,7 +136,7 @@ static inline void printCommandHelp(const char* command)`
`136`	`136`	`}`
`137`	`137`	`else if(ffStrEqualsIgnCase(command, "processes-format"))`
`138`	`138`	`{`
`139`		`- constructAndPrintCommandHelpFormat("processes", "{}", 1,`
	`139`	`+ constructAndPrintCommandHelpFormat("processes", "{1}", 1,`
`140`	`140`	`"Count"`
`141`	`141`	`);`
`142`	`142`	`}`
`@@ -182,7 +182,7 @@ static inline void printCommandHelp(const char* command)`
`182`	`182`	`}`
`183`	`183`	`else if(ffStrEqualsIgnCase(command, "display-format"))`
`184`	`184`	`{`
`185`		`- constructAndPrintCommandHelpFormat("display", "{}x{} @ {}Hz", 7,`
	`185`	`+ constructAndPrintCommandHelpFormat("display", "{1}x{2} @ {3}Hz", 8,`
`186`	`186`	`"Screen width",`
`187`	`187`	`"Screen height",`
`188`	`188`	`"Screen refresh rate",`
`@@ -202,7 +202,7 @@ static inline void printCommandHelp(const char* command)`
`202`	`202`	`}`
`203`	`203`	`else if(ffStrEqualsIgnCase(command, "monitor-format"))`
`204`	`204`	`{`
`205`		`- constructAndPrintCommandHelpFormat("monitor", "{}", 6,`
	`205`	`+ constructAndPrintCommandHelpFormat("monitor", "{2}x{3} px - {4}x{5} mm ({6} inches, {7} ppi)", 7,`
`206`	`206`	`"Display name",`
`207`	`207`	`"Display native resolution width in pixels",`
`208`	`208`	`"Display native resolution height in pixels",`
`@@ -230,31 +230,31 @@ static inline void printCommandHelp(const char* command)`
`230`	`230`	`}`
`231`	`231`	`else if(ffStrEqualsIgnCase(command, "wmtheme-format"))`
`232`	`232`	`{`
`233`		`- constructAndPrintCommandHelpFormat("wmtheme", "{}", 1,`
	`233`	`+ constructAndPrintCommandHelpFormat("wmtheme", "{1}", 1,`
`234`	`234`	`"WM theme name"`
`235`	`235`	`);`
`236`	`236`	`}`
`237`	`237`	`else if(ffStrEqualsIgnCase(command, "theme-format"))`
`238`	`238`	`{`
`239`		`- constructAndPrintCommandHelpFormat("theme", "{}", 1,`
	`239`	`+ constructAndPrintCommandHelpFormat("theme", "{1}", 1,`
`240`	`240`	`"Combined themes"`
`241`	`241`	`);`
`242`	`242`	`}`
`243`	`243`	`else if(ffStrEqualsIgnCase(command, "icons-format"))`
`244`	`244`	`{`
`245`		`- constructAndPrintCommandHelpFormat("icons", "{}", 1,`
	`245`	`+ constructAndPrintCommandHelpFormat("icons", "{1}", 1,`
`246`	`246`	`"Combined icons"`
`247`	`247`	`);`
`248`	`248`	`}`
`249`	`249`	`else if(ffStrEqualsIgnCase(command, "wallpaper-format"))`
`250`	`250`	`{`
`251`		`- constructAndPrintCommandHelpFormat("wallpaper", "{}", 1,`
	`251`	`+ constructAndPrintCommandHelpFormat("wallpaper", "{1}", 1,`
`252`	`252`	`"Wallpaper image file"`
`253`	`253`	`);`
`254`	`254`	`}`
`255`	`255`	`else if(ffStrEqualsIgnCase(command, "font-format"))`
`256`	`256`	`{`
`257`		`- constructAndPrintCommandHelpFormat("font", "{} [QT], {} [GTK2], {} [GTK3], {} [GTK4]", 4,`
	`257`	`+ constructAndPrintCommandHelpFormat("font", "{1} [QT], {2} [GTK2], {3} [GTK3], {4} [GTK4]", 4,`
`258`	`258`	`"Font 1",`
`259`	`259`	`"Font 2",`
`260`	`260`	`"Font 3",`
`@@ -263,14 +263,14 @@ static inline void printCommandHelp(const char* command)`
`263`	`263`	`}`
`264`	`264`	`else if(ffStrEqualsIgnCase(command, "cursor-format"))`
`265`	`265`	`{`
`266`		`- constructAndPrintCommandHelpFormat("cursor", "{} ({}pt)", 2,`
	`266`	`+ constructAndPrintCommandHelpFormat("cursor", "{1}", 2,`
`267`	`267`	`"Cursor theme",`
`268`	`268`	`"Cursor size"`
`269`	`269`	`);`
`270`	`270`	`}`
`271`	`271`	`else if(ffStrEqualsIgnCase(command, "terminal-format"))`
`272`	`272`	`{`
`273`		`- constructAndPrintCommandHelpFormat("terminal", "{3}", 10,`
	`273`	`+ constructAndPrintCommandHelpFormat("terminal", "{5} {6}", 6,`
`274`	`274`	`"Terminal process name",`
`275`	`275`	`"Terminal path with exe name",`
`276`	`276`	`"Terminal exe name",`
`@@ -281,7 +281,7 @@ static inline void printCommandHelp(const char* command)`
`281`	`281`	`}`
`282`	`282`	`else if(ffStrEqualsIgnCase(command, "terminalfont-format"))`
`283`	`283`	`{`
`284`		`- constructAndPrintCommandHelpFormat("terminalfont", "{}", 4,`
	`284`	`+ constructAndPrintCommandHelpFormat("terminalfont", "{1}", 4,`
`285`	`285`	`"Terminal font",`
`286`	`286`	`"Terminal font name",`
`287`	`287`	`"Termianl font size",`
`@@ -290,7 +290,7 @@ static inline void printCommandHelp(const char* command)`
`290`	`290`	`}`
`291`	`291`	`else if(ffStrEqualsIgnCase(command, "cpu-format"))`
`292`	`292`	`{`
`293`		`- constructAndPrintCommandHelpFormat("cpu", "{1} ({5}) @ {7}GHz", 8,`
	`293`	`+ constructAndPrintCommandHelpFormat("cpu", "{1} ({5}) @ {7} GHz", 8,`
`294`	`294`	`"Name",`
`295`	`295`	`"Vendor",`
`296`	`296`	`"Physical core count",`
`@@ -303,13 +303,13 @@ static inline void printCommandHelp(const char* command)`
`303`	`303`	`}`
`304`	`304`	`else if(ffStrEqualsIgnCase(command, "cpuusage-format"))`
`305`	`305`	`{`
`306`		`- constructAndPrintCommandHelpFormat("cpuusage", "{0}%", 1,`
	`306`	`+ constructAndPrintCommandHelpFormat("cpuusage", "{1}", 1,`
`307`	`307`	`"CPU usage without percent mark"`
`308`	`308`	`);`
`309`	`309`	`}`
`310`	`310`	`else if(ffStrEqualsIgnCase(command, "gpu-format"))`
`311`	`311`	`{`
`312`		`- constructAndPrintCommandHelpFormat("gpu", "{} {}", 6,`
	`312`	`+ constructAndPrintCommandHelpFormat("gpu", "{1} {2}", 6,`
`313`	`313`	`"GPU vendor",`
`314`	`314`	`"GPU name",`
`315`	`315`	`"GPU driver",`
`@@ -320,23 +320,23 @@ static inline void printCommandHelp(const char* command)`
`320`	`320`	`}`
`321`	`321`	`else if(ffStrEqualsIgnCase(command, "memory-format"))`
`322`	`322`	`{`
`323`		`- constructAndPrintCommandHelpFormat("memory", "{} / {} ({}%)", 3,`
	`323`	`+ constructAndPrintCommandHelpFormat("memory", "{1} / {2} ({3})", 3,`
`324`	`324`	`"Used size",`
`325`	`325`	`"Total size",`
`326`	`326`	`"Percentage used"`
`327`	`327`	`);`
`328`	`328`	`}`
`329`	`329`	`else if(ffStrEqualsIgnCase(command, "swap-format"))`
`330`	`330`	`{`
`331`		`- constructAndPrintCommandHelpFormat("swap", "{} / {} ({}%)", 3,`
	`331`	`+ constructAndPrintCommandHelpFormat("swap", "{1} / {2} ({3})", 3,`
`332`	`332`	`"Used size",`
`333`	`333`	`"Total size",`
`334`	`334`	`"Percentage used"`
`335`	`335`	`);`
`336`	`336`	`}`
`337`	`337`	`else if(ffStrEqualsIgnCase(command, "disk-format"))`
`338`	`338`	`{`
`339`		`- constructAndPrintCommandHelpFormat("disk", "{1} / {2} ({3}%)", 9,`
	`339`	`+ constructAndPrintCommandHelpFormat("disk", "{1} / {2} ({3}) - {9}", 9,`
`340`	`340`	`"Size used",`
`341`	`341`	`"Size total",`
`342`	`342`	`"Size percentage",`
`@@ -370,20 +370,21 @@ static inline void printCommandHelp(const char* command)`
`370`	`370`	`}`
`371`	`371`	`else if(ffStrEqualsIgnCase(command, "lm-format"))`
`372`	`372`	`{`
`373`		`- constructAndPrintCommandHelpFormat("lm", "{} ({})", 2,`
	`373`	`+ constructAndPrintCommandHelpFormat("lm", "{1} {3} ({2})", 3,`
`374`	`374`	`"LM service",`
`375`		`- "LM type"`
	`375`	`+ "LM type",`
	`376`	`+ "LM version"`
`376`	`377`	`);`
`377`	`378`	`}`
`378`	`379`	`else if(ffStrEqualsIgnCase(command, "locale-format"))`
`379`	`380`	`{`
`380`		`- constructAndPrintCommandHelpFormat("locale", "{}", 1,`
	`381`	`+ constructAndPrintCommandHelpFormat("locale", "{1}", 1,`
`381`	`382`	`"Locale code"`
`382`	`383`	`);`
`383`	`384`	`}`
`384`	`385`	`else if(ffStrEqualsIgnCase(command, "localip-format"))`
`385`	`386`	`{`
`386`		`- constructAndPrintCommandHelpFormat("localip", "{}", 5,`
	`387`	`+ constructAndPrintCommandHelpFormat("localip", "{1}{5}", 5,`
`387`	`388`	`"Local IPv4 address",`
`388`	`389`	`"Local IPv6 address",`
`389`	`390`	`"Physical (MAC) address",`
`@@ -393,13 +394,14 @@ static inline void printCommandHelp(const char* command)`
`393`	`394`	`}`
`394`	`395`	`else if(ffStrEqualsIgnCase(command, "publicip-format"))`
`395`	`396`	`{`
`396`		`- constructAndPrintCommandHelpFormat("publicip", "{}", 1,`
`397`		`- "Public IP address"`
	`397`	`+ constructAndPrintCommandHelpFormat("publicip", "{1} ({2})", 2,`
	`398`	`+ "Public IP address",`
	`399`	`+ "Location"`
`398`	`400`	`);`
`399`	`401`	`}`
`400`	`402`	`else if(ffStrEqualsIgnCase(command, "netio-format"))`
`401`	`403`	`{`
`402`		`- constructAndPrintCommandHelpFormat("netio", "{}", 3,`
	`404`	`+ constructAndPrintCommandHelpFormat("netio", "{1} (IN) - {2} (OUT){4}", 4,`
`403`	`405`	`"Size of data received per second (formatted)",`
`404`	`406`	`"Size of data sent per second (formatted)",`
`405`	`407`	`"Interface name",`
`@@ -408,7 +410,7 @@ static inline void printCommandHelp(const char* command)`
`408`	`410`	`}`
`409`	`411`	`else if(ffStrEqualsIgnCase(command, "wifi-format"))`
`410`	`412`	`{`
`411`		`- constructAndPrintCommandHelpFormat("wifi", "{4} - {6}", 3,`
	`413`	`+ constructAndPrintCommandHelpFormat("wifi", "{4} - {10}", 10,`
`412`	`414`	`"Interface description",`
`413`	`415`	`"Interface status",`
`414`	`416`	`"Connection status",`
`@@ -439,7 +441,7 @@ static inline void printCommandHelp(const char* command)`
`439`	`441`	`"Album name"`
`440`	`442`	`);`
`441`	`443`	`}`
`442`		`- else if(ffStrEqualsIgnCase(command, "datetime-format") == 0 \|\| ffStrEqualsIgnCase(command, "date-format") \|\| ffStrEqualsIgnCase(command, "time-format"))`
	`444`	`+ else if(ffStrEqualsIgnCase(command, "datetime-format"))`
`443`	`445`	`{`
`444`	`446`	`constructAndPrintCommandHelpFormat("[date][time]", "{1}-{4}-{11} {14}:{18}:{20}", 20,`
`445`	`447`	`"year",`
`@@ -466,7 +468,7 @@ static inline void printCommandHelp(const char* command)`
`466`	`468`	`}`
`467`	`469`	`else if(ffStrEqualsIgnCase(command, "version-format"))`
`468`	`470`	`{`
`469`		`- constructAndPrintCommandHelpFormat("version", "{1} {2}{3} (5)", 6,`
	`471`	`+ constructAndPrintCommandHelpFormat("version", "{1} {2}{3} ({5})", 8,`
`470`	`472`	`"Project name",`
`471`	`473`	`"Version",`
`472`	`474`	`"Version tweak",`
`@@ -487,7 +489,7 @@ static inline void printCommandHelp(const char* command)`
`487`	`489`	`}`
`488`	`490`	`else if(ffStrEqualsIgnCase(command, "opengl-format"))`
`489`	`491`	`{`
`490`		`- constructAndPrintCommandHelpFormat("opengl", "{}", 3,`
	`492`	`+ constructAndPrintCommandHelpFormat("opengl", "{1}", 4,`
`491`	`493`	`"version",`
`492`	`494`	`"renderer",`
`493`	`495`	`"vendor",`
`@@ -513,7 +515,7 @@ static inline void printCommandHelp(const char* command)`
`513`	`515`	`}`
`514`	`516`	`else if(ffStrEqualsIgnCase(command, "sound-format"))`
`515`	`517`	`{`
`516`		`- constructAndPrintCommandHelpFormat("sound", "{2} (3%)", 4,`
	`518`	`+ constructAndPrintCommandHelpFormat("sound", "{2} ({3}%)", 4,`
`517`	`519`	`"Main",`
`518`	`520`	`"Name",`
`519`	`521`	`"Volume",`
`@@ -522,13 +524,13 @@ static inline void printCommandHelp(const char* command)`
`522`	`524`	`}`
`523`	`525`	`else if(ffStrEqualsIgnCase(command, "gamepad-format"))`
`524`	`526`	`{`
`525`		`- constructAndPrintCommandHelpFormat("gamepad", "{1}", 1,`
	`527`	`+ constructAndPrintCommandHelpFormat("gamepad", "{1}", 2,`
`526`	`528`	`"Name",`
`527`	`529`	`"Identifier"`
`528`	`530`	`);`
`529`	`531`	`}`
`530`	`532`	`else`
`531`		`- fprintf(stderr, "No specific help for command %s provided\n", command);`
	`533`	`+ fprintf(stderr, "No specific help for command '%s' provided\n", command);`
`532`	`534`	`}`
`533`	`535`
`534`	`536`	`static void listAvailablePresets(void)`