malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Host (Windows): detect serial number and UUID

Browse Source
This commit is contained in:
李通洲 2024-01-05 22:44:40 +08:00
parent 6bcd75835e
commit 21f3875c4f
11 changed files with 104 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -631,7 +631,7 @@ elseif(WIN32)
src/detection/displayserver/displayserver_windows.c
src/detection/font/font_windows.c
src/detection/gpu/gpu_windows.c
src/detection/host/host_windows.c
src/detection/host/host_windows.cpp
src/detection/icons/icons_windows.c
src/detection/libc/libc_windows.cpp
src/detection/lm/lm_nosupport.c

31
doc/json_schema.json
View File

@ -676,10 +676,6 @@
"const": "gamepad",
"description": "List connected gamepads"
},
{
"const": "host",
"description": "Print product name of your computer"
},
{
"const": "icons",
"description": "Print icon style name"
@ -1221,6 +1217,33 @@
},
"additionalProperties": false
},
{
"title": "Host",
"properties": {
"type": {
"const": "host",
"description": "Print product name of your computer",
},
"useWmi": {
"description": "Set if WMI query should be used on Windows, which detects more information but slower",
"type": "boolean",
"default": false
},
"key": {
"$ref": "#/$defs/key"
},
"keyColor": {
"$ref": "#/$defs/keyColor"
},
"keyWidth": {
"$ref": "#/$defs/keyWidth"
},
"format": {
"$ref": "#/$defs/format"
}
},
"additionalProperties": false
},
{
"title": "Local IP",
"properties": {

14
src/data/help.json
View File

@ -842,10 +842,20 @@
"default": "default"
}
},
{
"long": "host-use-wmi",
"desc": "Set if WMI query should be used on Windows when detecting host",
"remark": "WMI query detects more information (UUID and serial number) but is slower. Windows only",
"arg": {
"type": "bool",
"optional": true,
"default": false
}
},
{
"long": "chassis-use-wmi",
"desc": "Set if WMI query should be used on Windows",
"remark": "WMI query detects more information but is slower. Windows only",
"desc": "Set if WMI query should be used on Windows when detecting chassis",
"remark": "WMI query detects more information (vendor and version) but is slower. Windows only",
"arg": {
"type": "bool",
"optional": true,

2
src/detection/host/host.h
View File

@ -13,4 +13,4 @@ typedef struct FFHostResult
FFstrbuf vendor;
} FFHostResult;
const char* ffDetectHost(FFHostResult* host);
const char* ffDetectHost(FFHostResult* host, FFHostOptions* options);

2
src/detection/host/host_android.c
View File

@ -2,7 +2,7 @@
#include "common/settings.h"
#include <ctype.h>
const char* ffDetectHost(FFHostResult* host)
const char* ffDetectHost(FFHostResult* host, FF_MAYBE_UNUSED FFHostOptions* options)
{
// http://newandroidbook.com/ddb/
ffSettingsGetAndroidProperty("ro.product.device", &host->family);

2
src/detection/host/host_apple.c
View File

@ -201,7 +201,7 @@ const char* getOthersByIokit(FFHostResult* host)
return NULL;
}
const char* ffDetectHost(FFHostResult* host)
const char* ffDetectHost(FFHostResult* host, FF_MAYBE_UNUSED FFHostOptions* options)
{
const char* error = ffSysctlGetString("hw.model", &host->family);
if (error) return error;

2
src/detection/host/host_bsd.c
View File

@ -2,7 +2,7 @@
#include "common/settings.h"
#include "util/smbiosHelper.h"
const char* ffDetectHost(FFHostResult* host)
const char* ffDetectHost(FFHostResult* host, FF_MAYBE_UNUSED FFHostOptions* options)
{
ffSettingsGetFreeBSDKenv("smbios.system.product", &host->name);
ffCleanUpSmbiosValue(&host->name);

2
src/detection/host/host_linux.c
View File

@ -27,7 +27,7 @@ static void getHostProductName(FFstrbuf* name)
ffStrbufClear(name);
}
const char* ffDetectHost(FFHostResult* host)
const char* ffDetectHost(FFHostResult* host, FF_MAYBE_UNUSED FFHostOptions* options)
{
ffGetSmbiosValue("/sys/devices/virtual/dmi/id/product_family", "/sys/class/dmi/id/product_family", &host->family);
getHostProductName(&host->name);

27
src/detection/host/host_windows.c → src/detection/host/host_windows.cpp
View File

@ -1,8 +1,30 @@
extern "C"
{
#include "host.h"
#include "util/windows/registry.h"
#include "util/smbiosHelper.h"
}
#include "util/windows/wmi.hpp"
#include "util/windows/unicode.hpp"
const char* ffDetectHost(FFHostResult* host)
const char* detectWithWmi(FFHostResult* host)
{
FFWmiQuery query(L"SELECT IdentifyingNumber, UUID FROM Win32_ComputerSystemProduct", nullptr, FFWmiNamespace::CIMV2);
if(!query)
return "Query WMI service failed";
if (FFWmiRecord record = query.next())
{
if (auto identifyingNumber = record.get(L"IdentifyingNumber"))
ffStrbufSetWSV(&host->serial, identifyingNumber.get<std::wstring_view>());
if (auto uuid = record.get(L"UUID"))
ffStrbufSetWSV(&host->uuid, uuid.get<std::wstring_view>());
return NULL;
}
return "No WMI result returned";
}
const char* ffDetectHost(FFHostResult* host, FFHostOptions* options)
{
FF_HKEY_AUTO_DESTROY hKey = NULL;
@ -20,5 +42,8 @@ const char* ffDetectHost(FFHostResult* host)
ffRegReadStrbuf(hKey, L"SystemManufacturer", &host->vendor, NULL);
ffCleanUpSmbiosValue(&host->vendor);
if (options->useWmi)
detectWithWmi(host);
return NULL;
}

33
src/modules/host/host.c
View File

@ -16,8 +16,8 @@ void ffPrintHost(FFHostOptions* options)
ffStrbufInit(&host.serial);
ffStrbufInit(&host.uuid);
ffStrbufInit(&host.vendor);
const char* error = ffDetectHost(&host);
const char* error = ffDetectHost(&host, options);
if(error)
{
ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
@ -76,6 +76,14 @@ bool ffParseHostCommandOptions(FFHostOptions* options, const char* key, const ch
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
#ifdef _WIN32
if (ffStrEqualsIgnCase(subKey, "use-wmi"))
{
options->useWmi = ffOptionParseBoolean(value);
return true;
}
#endif
return false;
}
@ -92,6 +100,14 @@ void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module)
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
#ifdef _WIN32
if (ffStrEqualsIgnCase(key, "useWmi"))
{
options->useWmi = yyjson_get_bool(val);
continue;
}
#endif
ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
@ -102,6 +118,11 @@ void ffGenerateHostJsonConfig(FFHostOptions* options, yyjson_mut_doc* doc, yyjso
ffInitHostOptions(&defaultOptions);
ffJsonConfigGenerateModuleArgsConfig(doc, module, &defaultOptions.moduleArgs, &options->moduleArgs);
#ifdef _WIN32
if (options->useWmi != defaultOptions.useWmi)
yyjson_mut_obj_add_bool(doc, module, "useWmi", options->useWmi);
#endif
}
void ffGenerateHostJsonResult(FF_MAYBE_UNUSED FFHostOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
@ -114,8 +135,8 @@ void ffGenerateHostJsonResult(FF_MAYBE_UNUSED FFHostOptions* options, yyjson_mut
ffStrbufInit(&host.serial);
ffStrbufInit(&host.uuid);
ffStrbufInit(&host.vendor);
const char* error = ffDetectHost(&host);
const char* error = ffDetectHost(&host, options);
if (error)
{
yyjson_mut_obj_add_str(doc, module, "error", error);
@ -133,9 +154,9 @@ void ffGenerateHostJsonResult(FF_MAYBE_UNUSED FFHostOptions* options, yyjson_mut
yyjson_mut_obj_add_strbuf(doc, obj, "name", &host.name);
yyjson_mut_obj_add_strbuf(doc, obj, "version", &host.version);
yyjson_mut_obj_add_strbuf(doc, obj, "sku", &host.sku);
yyjson_mut_obj_add_strbuf(doc, obj, "vender", &host.vendor);
yyjson_mut_obj_add_strbuf(doc, obj, "serial", &host.serial);
yyjson_mut_obj_add_strbuf(doc, obj, "uuid", &host.uuid);
yyjson_mut_obj_add_strbuf(doc, obj, "sysVender", &host.vendor);
exit:
ffStrbufDestroy(&host.family);
@ -154,9 +175,9 @@ void ffPrintHostHelpFormat(void)
"product name",
"product version",
"product sku",
"product vendor",
"product serial number",
"product uuid",
"sys vendor"
});
}
@ -174,6 +195,10 @@ void ffInitHostOptions(FFHostOptions* options)
ffGenerateHostJsonConfig
);
ffOptionInitModuleArg(&options->moduleArgs);
#ifdef _WIN32
options->useWmi = false;
#endif
}
void ffDestroyHostOptions(FFHostOptions* options)

4
src/modules/host/option.h
View File

@ -8,4 +8,8 @@ typedef struct FFHostOptions
{
FFModuleBaseInfo moduleInfo;
FFModuleArgs moduleArgs;
#ifdef _WIN32
bool useWmi;
#endif
} FFHostOptions;