fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-07 05:34:20 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

JsonConfig: support more non-module options

Browse Source
This commit is contained in:
李通洲
2023-06-11 21:31:09 +08:00
parent ac32de7bf1
commit e68efb184b
3 changed files with 194 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fastfetch.c
+11 -10
View File
@@ -527,9 +527,15 @@ static bool parseJsoncFile(FFinstance* instance, const char* path)
if (doc)
{
instance->state.configDoc = doc;
const char* error = ffParseLogoJsonConfig(instance);
if (error)
{
const char* error = NULL;
if (
(error = ffParseLogoJsonConfig(instance)) ||
(error = ffParseGeneralJsonConfig(instance)) ||
(error = ffParseDisplayJsonConfig(instance)) ||
(error = ffParseLibraryJsonConfig(instance)) ||
false
) {
fputs(error, stderr);
exit(477);
}
@@ -935,6 +941,8 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
NULL
);
}
else if(strcasecmp(key, "--percent-type") == 0)
instance->config.percentType = optionParseUInt32(key, value);
///////////////////////
//Module args options//
@@ -1049,13 +1057,6 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
goto error;
}
//////////////////
//Module options//
//////////////////
else if(strcasecmp(key, "--percent-type") == 0)
instance->config.percentType = optionParseUInt32(key, value);
//////////////////
//Unknown option//
//////////////////