DiskIO: support --diskio-name-prefix

src/common/commandoption.c

@@ -60,6 +60,9 @@ void ffPrepareCommandOption(FFdata* data)
     if(ffStrbufContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME))
         ffPrepareCPUUsage();
 
+    if(ffStrbufContainIgnCaseS(&data->structure, FF_DISKIO_MODULE_NAME))
+        ffPrepareDiskIO(&instance.config.diskIo);
+
     if(ffStrbufContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME))
         ffPrepareNetIO(&instance.config.netIo);
 

src/common/init.c

@@ -93,7 +93,7 @@ static void defaultConfig(void)
     ffInitDEOptions(&instance.config.de);
     ffInitDateTimeOptions(&instance.config.dateTime);
     ffInitDiskOptions(&instance.config.disk);
-    ffInitDiskIOOptions(&instance.config.diskio);
+    ffInitDiskIOOptions(&instance.config.diskIo);
     ffInitDisplayOptions(&instance.config.display);
     ffInitFontOptions(&instance.config.font);
     ffInitGPUOptions(&instance.config.gpu);
@@ -308,7 +308,7 @@ static void destroyConfig(void)
     ffDestroyDEOptions(&instance.config.de);
     ffDestroyDateTimeOptions(&instance.config.dateTime);
     ffDestroyDiskOptions(&instance.config.disk);
-    ffDestroyDiskIOOptions(&instance.config.diskio);
+    ffDestroyDiskIOOptions(&instance.config.diskIo);
     ffDestroyDisplayOptions(&instance.config.display);
     ffDestroyFontOptions(&instance.config.font);
     ffDestroyGPUOptions(&instance.config.gpu);

src/common/jsonconfig.c

@@ -112,6 +112,14 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module)
                 ffPrepareCPUUsage();
             break;
         }
+        case 'd': case 'D': {
+            if (ffStrEqualsIgnCase(type, FF_DISKIO_MODULE_NAME))
+            {
+                if (module) ffParseDiskIOJsonObject(&cfg->diskIo, module);
+                ffPrepareDiskIO(&cfg->diskIo);
+            }
+            break;
+        }
         case 'n': case 'N': {
             if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME))
             {

src/common/modules.c

@@ -30,7 +30,7 @@ static FFModuleBaseInfo* D[] = {
     (void*) &instance.config.de,
     (void*) &instance.config.display,
     (void*) &instance.config.disk,
-    (void*) &instance.config.diskio,
+    (void*) &instance.config.diskIo,
     NULL,
 };
 

src/detection/diskio/diskio_apple.c

@@ -30,6 +30,9 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
         if (IORegistryEntryGetName(registryEntry, deviceName) != KERN_SUCCESS)
             continue;
 
+        if (options->namePrefix.length && strncmp(deviceName, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
         FF_IOOBJECT_AUTO_RELEASE io_registry_entry_t entryDriver = 0;
         if (IORegistryEntryGetParentEntry(entryPartition, kIOServicePlane, &entryDriver) != KERN_SUCCESS)
             continue;

src/detection/diskio/diskio_linux.c

@@ -82,6 +82,14 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
         }
         ffStrbufReplaceAllC(&device->name, '_', ' ');
 
+        if (options->namePrefix.length && !ffStrbufStartsWith(&device->name, &options->namePrefix))
+        {
+            ffStrbufDestroy(&device->name);
+            ffStrbufDestroy(&device->type);
+            result->length--;
+            continue;
+        }
+
         ffStrbufInitS(&device->devPath, pathDev1);
         device->bytesRead = sectorRead * 512;
         device->bytesWritten = sectorWritten * 512;

src/detection/diskio/diskio_windows.c

@@ -45,6 +45,14 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
             else
                 ffStrbufSetWS(&device->name, szDevice);
 
+            if (options->namePrefix.length && !ffStrbufStartsWith(&device->name, &options->namePrefix))
+            {
+                ffStrbufDestroy(&device->name);
+                ffStrbufDestroy(&device->type);
+                result->length--;
+                continue;
+            }
+
             ffStrbufInitWS(&device->devPath, szDevice);
             device->bytesRead = (uint64_t) diskPerformance.BytesRead.QuadPart;
             device->readCount = (uint64_t) diskPerformance.ReadCount;

src/fastfetch.h

@@ -99,7 +99,7 @@ typedef struct FFconfig
     FFDEOptions de;
     FFDateTimeOptions dateTime;
     FFDiskOptions disk;
-    FFDiskIOOptions diskio;
+    FFDiskIOOptions diskIo;
     FFDisplayOptions display;
     FFFontOptions font;
     FFGPUOptions gpu;