Modules: fix custom key not working if the key is formatted outside

CarterLi · CarterLi · commit d979f55c8e1f · 2024-06-27T17:51:57.000+08:00
Fix fastfetch-cli#1049
diff --git a/src/common/printing.h b/src/common/printing.h
@@ -5,7 +5,7 @@
 
 typedef enum FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,
-    FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0,
+    FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0, // key has been formatted outside
     FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR = 1 << 1,
     FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH = 1 << 2,
     FF_PRINT_TYPE_NO_CUSTOM_OUTPUT_FORMAT = 1 << 3, // reserved
diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c
@@ -50,7 +50,7 @@ void ffPrintBios(FFBiosOptions* options)
 
     if(options->moduleArgs.outputFormat.length == 0)
     {
-        ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
         ffStrbufWriteTo(&bios.version, stdout);
         if (bios.release.length)
             printf(" (%s)\n", bios.release.chars);
@@ -59,7 +59,7 @@ void ffPrintBios(FFBiosOptions* options)
     }
     else
     {
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
             {FF_FORMAT_ARG_TYPE_STRBUF, &bios.date, "date"},
             {FF_FORMAT_ARG_TYPE_STRBUF, &bios.release, "release"},
             {FF_FORMAT_ARG_TYPE_STRBUF, &bios.vendor, "vendor"},
diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c
@@ -12,15 +12,19 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
 
+    char levelStr[4] = "L";
     for (uint32_t i = 0; i < sizeof (result->caches) / sizeof (result->caches[0]) && result->caches[i].length > 0; i++)
     {
         ffStrbufClear(&key);
+        levelStr[1] = (char) ('1' + i);
         if (options->moduleArgs.key.length == 0)
-            ffStrbufAppendF(&key, "%s (L%u)", FF_CPUCACHE_DISPLAY_NAME, i + 1);
+            ffStrbufAppendF(&key, "%s (%s)", FF_CPUCACHE_DISPLAY_NAME, levelStr);
         else
         {
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 1, ((FFformatarg[]){
-                {FF_FORMAT_ARG_TYPE_UINT, &i, "index"},
+            uint32_t index = i + 1;
+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_UINT, &index, "index"},
+                {FF_FORMAT_ARG_TYPE_STRING, levelStr, "level"},
             }));
         }
 
@@ -49,14 +53,14 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption
 
         if(options->moduleArgs.outputFormat.length == 0)
         {
-            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
             ffStrbufPutTo(&buffer, stdout);
         }
         else
         {
             FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate();
             ffParseSize(sum, &buffer2);
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPUCACHE_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_CPUCACHE_NUM_FORMAT_ARGS, ((FFformatarg[]) {
                 {FF_FORMAT_ARG_TYPE_STRBUF, &buffer, "result"},
                 {FF_FORMAT_ARG_TYPE_STRBUF, &buffer2, "sum"},
             }));
diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
@@ -37,7 +37,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
 
     if(error)
     {
-        ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
         return;
     }
 
@@ -55,7 +55,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
 
         if(options->moduleArgs.outputFormat.length == 0)
         {
-            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
             ffParseSize(dev->bytesRead, &buffer);
             if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c
@@ -57,7 +57,7 @@ void ffPrintNetIO(FFNetIOOptions* options)
 
         if(options->moduleArgs.outputFormat.length == 0)
         {
-            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
             ffParseSize(inf->rxBytes, &buffer);
             if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");
diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c
@@ -70,7 +70,7 @@ void ffPrintPhysicalDisk(FFPhysicalDiskOptions* options)
 
         if(options->moduleArgs.outputFormat.length == 0)
         {
-            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
             if (physicalType[0] || removableType[0] || readOnlyType[0])
             {
diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c
@@ -32,11 +32,7 @@ void ffPrintPhysicalMemory(FFPhysicalMemoryOptions* options)
 
         if (options->moduleArgs.outputFormat.length == 0)
         {
-            ffPrintLogoAndKey(
-                FF_PHYSICALMEMORY_DISPLAY_NAME,
-                result.length == 1 ? 0 : (uint8_t) i,
-                &options->moduleArgs,
-                FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_PHYSICALMEMORY_DISPLAY_NAME, result.length == 1 ? 0 : (uint8_t) i, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
             fputs(prettySize.chars, stdout);
             fputs(" - ", stdout);
@@ -53,7 +49,7 @@ void ffPrintPhysicalMemory(FFPhysicalMemoryOptions* options)
         }
         else
         {
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PHYSICALMEMORY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_PHYSICALMEMORY_DISPLAY_NAME, (uint8_t) i, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PHYSICALMEMORY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
                 {FF_FORMAT_ARG_TYPE_UINT64, &device->size, "bytes"},
                 {FF_FORMAT_ARG_TYPE_STRBUF, &prettySize, "size"},
                 {FF_FORMAT_ARG_TYPE_UINT, &device->maxSpeed, "max-speed"},

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void ffPrintBios(FFBiosOptions* options)`
`50`	`50`
`51`	`51`	`if(options->moduleArgs.outputFormat.length == 0)`
`52`	`52`	`{`
`53`		`- ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
	`53`	`+ ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);`
`54`	`54`	`ffStrbufWriteTo(&bios.version, stdout);`
`55`	`55`	`if (bios.release.length)`
`56`	`56`	`printf(" (%s)\n", bios.release.chars);`
`@@ -59,7 +59,7 @@ void ffPrintBios(FFBiosOptions* options)`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`62`		`- FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {`
	`62`	`+ FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {`
`63`	`63`	`{FF_FORMAT_ARG_TYPE_STRBUF, &bios.date, "date"},`
`64`	`64`	`{FF_FORMAT_ARG_TYPE_STRBUF, &bios.release, "release"},`
`65`	`65`	`{FF_FORMAT_ARG_TYPE_STRBUF, &bios.vendor, "vendor"},`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)`
`37`	`37`
`38`	`38`	`if(error)`
`39`	`39`	`{`
`40`		`- ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);`
	`40`	`+ ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`@@ -55,7 +55,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)`
`55`	`55`
`56`	`56`	`if(options->moduleArgs.outputFormat.length == 0)`
`57`	`57`	`{`
`58`		`- ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
	`58`	`+ ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);`
`59`	`59`
`60`	`60`	`ffParseSize(dev->bytesRead, &buffer);`
`61`	`61`	`if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ void ffPrintNetIO(FFNetIOOptions* options)`
`57`	`57`
`58`	`58`	`if(options->moduleArgs.outputFormat.length == 0)`
`59`	`59`	`{`
`60`		`- ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
	`60`	`+ ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);`
`61`	`61`
`62`	`62`	`ffParseSize(inf->rxBytes, &buffer);`
`63`	`63`	`if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void ffPrintPhysicalDisk(FFPhysicalDiskOptions* options)`
`70`	`70`
`71`	`71`	`if(options->moduleArgs.outputFormat.length == 0)`
`72`	`72`	`{`
`73`		`- ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
	`73`	`+ ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);`
`74`	`74`
`75`	`75`	`if (physicalType[0] \|\| removableType[0] \|\| readOnlyType[0])`
`76`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,7 @@ void ffPrintPhysicalMemory(FFPhysicalMemoryOptions* options)`
`32`	`32`
`33`	`33`	`if (options->moduleArgs.outputFormat.length == 0)`
`34`	`34`	`{`
`35`		`- ffPrintLogoAndKey(`
`36`		`- FF_PHYSICALMEMORY_DISPLAY_NAME,`
`37`		`- result.length == 1 ? 0 : (uint8_t) i,`
`38`		`- &options->moduleArgs,`
`39`		`- FF_PRINT_TYPE_DEFAULT);`
	`35`	`+ ffPrintLogoAndKey(FF_PHYSICALMEMORY_DISPLAY_NAME, result.length == 1 ? 0 : (uint8_t) i, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);`
`40`	`36`
`41`	`37`	`fputs(prettySize.chars, stdout);`
`42`	`38`	`fputs(" - ", stdout);`
`@@ -53,7 +49,7 @@ void ffPrintPhysicalMemory(FFPhysicalMemoryOptions* options)`
`53`	`49`	`}`
`54`	`50`	`else`
`55`	`51`	`{`
`56`		`- FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PHYSICALMEMORY_NUM_FORMAT_ARGS, ((FFformatarg[]) {`
	`52`	`+ FF_PRINT_FORMAT_CHECKED(FF_PHYSICALMEMORY_DISPLAY_NAME, (uint8_t) i, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PHYSICALMEMORY_NUM_FORMAT_ARGS, ((FFformatarg[]) {`
`57`	`53`	`{FF_FORMAT_ARG_TYPE_UINT64, &device->size, "bytes"},`
`58`	`54`	`{FF_FORMAT_ARG_TYPE_STRBUF, &prettySize, "size"},`
`59`	`55`	`{FF_FORMAT_ARG_TYPE_UINT, &device->maxSpeed, "max-speed"},`