fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

better os output

Browse Source
This commit is contained in:
Linus Dierheimer
2021-05-05 21:12:42 +02:00
parent 89aa4470aa
commit a7784f5a88
3 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/os.c
+41 -40
View File
@@ -115,51 +115,52 @@ void ffPrintOS(FFinstance* instance)
FF_STRBUF_CREATE(os);
if(result->prettyName.length > 0)
{
//Name
if(result->name.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 if(result->name.length == 0 && result->id.length == 0)
{
ffStrbufAppend(&os, &result->systemName);
}
else
ffStrbufAppend(&os, &result->systemName);
//Version
if(result->versionID.length > 0)
{
if(result->name.length > 0)
ffStrbufAppend(&os, &result->name);
else
ffStrbufAppend(&os, &result->id);
if(result->version.length > 0)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->version);
}
else
{
if(result->versionID.length > 0)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->versionID);
}
if(result->variant.length > 0)
{
ffStrbufAppendS(&os, " (");
ffStrbufAppend(&os, &result->variant);
ffStrbufAppendC(&os, ')');
}
else if(result->variantID.length > 0)
{
ffStrbufAppendS(&os, " (");
ffStrbufAppend(&os, &result->variantID);
ffStrbufAppendC(&os, ')');
}
}
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->versionID);
}
else if(result->version.length > 0)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->version);
}
ffStrbufAppendC(&os, ' ');
ffStrbufAppendS(&os, instance->state.utsname.machine);
//Codename
if(result->codename.length > 0)
{
ffStrbufAppendC(&os, ' ');
ffStrbufAppend(&os, &result->codename);
}
//Variant
if(result->variant.length > 0)
{
ffStrbufAppendS(&os, " [");
ffStrbufAppend(&os, &result->variant);
ffStrbufAppendC(&os, ']');
}
else if(result->variantID.length > 0)
{
ffStrbufAppendS(&os, " [");
ffStrbufAppend(&os, &result->variantID);
ffStrbufAppendC(&os, ']');
}
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},
src/util/FFstrbuf.c
+5
View File
@@ -397,6 +397,11 @@ uint32_t ffStrbufFirstIndexAfterS(const FFstrbuf* strbuf, uint32_t start, const
return strbuf->length;
}
uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str)
{
return ffStrbufFirstIndexAfterS(strbuf, 0, str);
}
uint32_t ffStrbufLastIndexC(const FFstrbuf* strbuf, const char c)
{
//We need to loop one higher than the actual index, because uint32_t is guranteed to be >= 0, so this statement would always be true
src/util/FFstrbuf.h
+1
View File
@@ -75,6 +75,7 @@ void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, ...);
uint32_t ffStrbufFirstIndexAfterC(const FFstrbuf* strbuf, uint32_t start, const char c);
uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, const char c);
uint32_t ffStrbufFirstIndexAfterS(const FFstrbuf* strbuf, uint32_t start, const char* str);
uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str);
uint32_t ffStrbufLastIndexC(const FFstrbuf* strbuf, const char c);
void ffStrbufSubstrBefore(FFstrbuf* strbuf, uint32_t index);