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

Better OS output

Browse Source
This commit is contained in:
Linus Dierheimer
2021-07-12 19:01:31 +02:00
parent 0f916bb492
commit 588a68ac4c
3 changed files with 66 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/os.c
+28 -24
View File
@@ -89,54 +89,58 @@ void ffPrintOS(FFinstance* instance)
return;
}
FF_STRBUF_CREATE(os);
FFstrbuf os;
ffStrbufInit(&os);
//Create the basic output
//Name
if(result->name.length > 0)
ffStrbufAppend(&os, &result->name);
else if(result->prettyName.length > 0)
ffStrbufAppend(&os, &result->name);
else if(result->id.length > 0)
ffStrbufAppend(&os, &result->id);
else if(result->prettyName.length > 0)
ffStrbufAppend(&os, &result->prettyName);
else
else if(result->systemName.length > 0)
ffStrbufAppend(&os, &result->systemName);
else
ffStrbufAppendS(&os, "Linux");
//Version
if(result->versionID.length > 0)
//Append version if it is missing
if(result->versionID.length > 0 && ffStrbufFirstIndex(&os, &result->versionID) == os.length)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->versionID);
}
else if(result->version.length > 0)
else if(result->versionID.length == 0 && result->version.length > 0 && ffStrbufFirstIndex(&os, &result->version) == os.length)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->version);
}
//Codename
if(result->codename.length > 0)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->codename);
}
//Append variant if it is missing
//Variant
if(result->variant.length > 0)
if(result->variant.length > 0 && ffStrbufFirstIndex(&os, &result->variant) == os.length)
{
ffStrbufAppendS(&os, " [");
ffStrbufAppendS(&os, " (");
ffStrbufAppend(&os, &result->variant);
ffStrbufAppendC(&os, ']');
ffStrbufAppendC(&os, ')');
}
else if(result->variantID.length > 0)
else if(result->variant.length == 0 && result->variantID.length > 0 && ffStrbufFirstIndex(&os, &result->variantID) == os.length)
{
ffStrbufAppendS(&os, " [");
ffStrbufAppendS(&os, " (");
ffStrbufAppend(&os, &result->variantID);
ffStrbufAppendC(&os, ']');
ffStrbufAppendC(&os, ')');
}
ffStrbufAppendS(&os, " (");
ffStrbufAppend(&os, &result->architecture);
ffStrbufAppendC(&os, ')');
//Append architecture if it is missing
if(ffStrbufFirstIndex(&os, &result->architecture) == os.length)
{
ffStrbufAppendS(&os, " [");
ffStrbufAppend(&os, &result->architecture);
ffStrbufAppendC(&os, ']');
}
ffPrintAndSaveToCache(instance, FF_OS_MODULE_NAME, &instance->config.osKey, &os, &instance->config.osFormat, FF_OS_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result->systemName},