starred/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:14:37 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

DiskIO: print serial number in json format

Browse Source 
Always init serial property
This commit is contained in:
李通洲
2023-12-17 13:51:17 +08:00
parent 9339a0fb4e
commit e7c787159a
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/diskio/diskio_apple.c
+1
View File
@@ -46,6 +46,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
continue;
FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
ffStrbufInit(&device->serial);
ffStrbufInitS(&device->name, deviceName);
ffStrbufInit(&device->devPath);
device->type = FF_DISKIO_PHYSICAL_TYPE_UNKNOWN;
src/detection/diskio/diskio_bsd.c
+1
View File
@@ -47,6 +47,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
ffStrbufInitF(&device->devPath, "/dev/%s", provider->lg_name);
ffStrbufInit(&device->serial);
ffStrbufInit(&device->interconnect);
switch (snapIter->device_type & DEVSTAT_TYPE_IF_MASK)
{
src/detection/diskio/diskio_windows.c
+4
View File
@@ -66,6 +66,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
DWORD retSize = 0;
ffStrbufInit(&device->serial);
char sddBuffer[4096];
if(DeviceIoControl(
hDevice,
@@ -83,7 +84,10 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
{
STORAGE_DEVICE_DESCRIPTOR* sdd = (STORAGE_DEVICE_DESCRIPTOR*) sddBuffer;
if (sdd->SerialNumberOffset != 0)
{
ffStrbufSetS(&device->serial, (const char*) sddBuffer + sdd->SerialNumberOffset);
ffStrbufTrim(&device->serial, ' ');
}
}
DEVICE_SEEK_PENALTY_DESCRIPTOR dspd = {};
src/modules/diskio/diskio.c
+4 -1
View File
@@ -6,7 +6,7 @@
#include "util/stringUtils.h"
#define FF_DISKIO_DISPLAY_NAME "Disk IO"
#define FF_DISKIO_NUM_FORMAT_ARGS 11
#define FF_DISKIO_NUM_FORMAT_ARGS 12
static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right)
{
@@ -102,6 +102,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
{FF_FORMAT_ARG_TYPE_UINT64, &dev->readCount},
{FF_FORMAT_ARG_TYPE_UINT64, &dev->writeCount},
{FF_FORMAT_ARG_TYPE_STRBUF, &sizePretty},
{FF_FORMAT_ARG_TYPE_STRBUF, &dev->serial},
});
}
++index;
@@ -202,6 +203,7 @@ void ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, y
yyjson_mut_obj_add_uint(doc, obj, "readCount", dev->readCount);
yyjson_mut_obj_add_uint(doc, obj, "writeCount", dev->writeCount);
yyjson_mut_obj_add_uint(doc, obj, "size", dev->size);
yyjson_mut_obj_add_strbuf(doc, obj, "serial", &dev->serial);
}
FF_LIST_FOR_EACH(FFDiskIOResult, dev, result)
@@ -226,6 +228,7 @@ void ffPrintDiskIOHelpFormat(void)
"Number of reads",
"Number of writes",
"Device size (formatted)",
"Serial number",
});
}