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

better Host output

Browse Source
This commit is contained in:
Linus Dierheimer
2021-05-14 16:03:19 +02:00
parent 8128db974b
commit 635f31eae1
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fastfetch.c
+1 -1
View File
@@ -253,7 +253,7 @@ static inline void printCommandHelp(const char* command)
}
else if(strcasecmp(command, "host-format") == 0)
{
constructAndPrintCommandHelpFormat("host", "{} {} {}", 3,
constructAndPrintCommandHelpFormat("host", "{2} {3}", 3,
"Host family",
"Host name",
"Host version"
src/modules/host.c
+12 -12
View File
@@ -3,13 +3,16 @@
#define FF_HOST_MODULE_NAME "Host"
#define FF_HOST_NUM_FORMAT_ARGS 3
static inline bool hostValueSet(FFstrbuf* value)
static bool hostValueSet(FFstrbuf* value)
{
ffStrbufTrim(value, ' ');
return
value != NULL &&
value->length > 0 &&
ffStrbufIgnCaseCompS(value, "None") != 0 &&
ffStrbufIgnCaseCompS(value, "To be filled by O.E.M.") != 0
ffStrbufIgnCaseCompS(value, "To be filled by O.E.M.") != 0 &&
ffStrbufIgnCaseCompS(value, "System Product Name") != 0 &&
ffStrbufIgnCaseCompS(value, "System Version") != 0
;
}
@@ -20,14 +23,17 @@ void ffPrintHost(FFinstance* instance)
FF_STRBUF_CREATE(family);
ffGetFileContent("/sys/devices/virtual/dmi/id/product_family", &family);
bool familySet = hostValueSet(&family);
FF_STRBUF_CREATE(name);
ffGetFileContent("/sys/devices/virtual/dmi/id/product_name", &name);
bool nameSet = hostValueSet(&name);
FF_STRBUF_CREATE(version);
ffGetFileContent("/sys/devices/virtual/dmi/id/product_version", &version);
bool versionSet = hostValueSet(&version);
if(!hostValueSet(&family) && !hostValueSet(&name))
if(!familySet && !nameSet)
{
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;
@@ -35,18 +41,12 @@ void ffPrintHost(FFinstance* instance)
FF_STRBUF_CREATE(host);
if(!hostValueSet(&family))
if(nameSet)
ffStrbufAppend(&host, &name);
else if(!hostValueSet(&name))
ffStrbufAppend(&host, &family);
else
{
ffStrbufAppend(&host, &family);
ffStrbufAppendC(&host, ' ');
ffStrbufAppend(&host, &name);
}
if(hostValueSet(&version)) {
if(versionSet) {
ffStrbufAppendC(&host, ' ');
ffStrbufAppend(&host, &version);
}