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

Small improvements to host output

Browse Source
This commit is contained in:
Linus Dierheimer
2021-04-23 20:59:13 +02:00
parent 283e4f56e9
commit eddc01290a
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/host.c
+16 -14
View File
@@ -3,6 +3,16 @@
#define FF_HOST_MODULE_NAME "Host"
#define FF_HOST_NUM_FORMAT_ARGS 3
static inline bool hostValueSet(FFstrbuf* value)
{
return
value != NULL &&
value->length > 0 &&
ffStrbufIgnCaseCompS(value, "None") != 0 &&
ffStrbufIgnCaseCompS(value, "To be filled by O.E.M.") != 0
;
}
void ffPrintHost(FFinstance* instance)
{
if(ffPrintFromCache(instance, FF_HOST_MODULE_NAME, &instance->config.hostKey, &instance->config.hostFormat, FF_HOST_NUM_FORMAT_ARGS))
@@ -17,22 +27,18 @@ void ffPrintHost(FFinstance* instance)
FF_STRBUF_CREATE(version);
ffGetFileContent("/sys/devices/virtual/dmi/id/product_version", &version);
if(family.length == 0 && name.length == 0)
if(!hostValueSet(&family) && !hostValueSet(&name))
{
ffPrintError(instance, FF_HOST_MODULE_NAME, 0, &instance->config.hostKey, &instance->config.hostFormat, FF_HOST_NUM_FORMAT_ARGS, "neither family nor name could be determined");
ffPrintError(instance, FF_HOST_MODULE_NAME, 0, &instance->config.hostKey, &instance->config.hostFormat, FF_HOST_NUM_FORMAT_ARGS, "neither family nor name is set by O.E.M.");
return;
}
FF_STRBUF_CREATE(host);
if(name.length == 0)
{
ffStrbufAppend(&host, &family);
}
else if(family.length == 0)
{
if(!hostValueSet(&family))
ffStrbufAppend(&host, &name);
}
else if(!hostValueSet(&name))
ffStrbufAppend(&host, &family);
else
{
ffStrbufAppend(&host, &family);
@@ -40,11 +46,7 @@ void ffPrintHost(FFinstance* instance)
ffStrbufAppend(&host, &name);
}
if(
version.length > 0 &&
ffStrbufIgnCaseCompS(&version, "None") != 0 &&
ffStrbufIgnCaseCompS(&version, "To be filled by O.E.M.") != 0
) {
if(hostValueSet(&version)) {
ffStrbufAppendC(&host, ' ');
ffStrbufAppend(&host, &version);
}