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

JsonConfig: remove useless checks

Browse Source
This commit is contained in:
李通洲
2023-08-17 16:09:41 +08:00
parent e5e4c8bf88
commit 55b279ab09
53 changed files with 777 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/title/title.c
+32 -35
View File
@@ -103,43 +103,40 @@ void ffDestroyTitleOptions(FFTitleOptions* options)
void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module)
{
if (module)
yyjson_val *key_, *val;
size_t idx, max;
yyjson_obj_foreach(module, idx, max, key_, val)
{
yyjson_val *key_, *val;
size_t idx, max;
yyjson_obj_foreach(module, idx, max, key_, val)
const char* key = yyjson_get_str(key_);
if(ffStrEqualsIgnCase(key, "type"))
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
if (ffStrEqualsIgnCase(key, "fqdn"))
{
const char* key = yyjson_get_str(key_);
if(ffStrEqualsIgnCase(key, "type"))
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
if (ffStrEqualsIgnCase(key, "fqdn"))
{
options->fqdn = yyjson_get_bool(val);
continue;
}
if (ffStrEqualsIgnCase(key, "color"))
{
if (!yyjson_is_obj(val))
continue;
yyjson_val* color = yyjson_obj_get(val, "user");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorUser);
color = yyjson_obj_get(val, "at");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorAt);
color = yyjson_obj_get(val, "host");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorHost);
continue;
}
ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
options->fqdn = yyjson_get_bool(val);
continue;
}
if (ffStrEqualsIgnCase(key, "color"))
{
if (!yyjson_is_obj(val))
continue;
yyjson_val* color = yyjson_obj_get(val, "user");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorUser);
color = yyjson_obj_get(val, "at");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorAt);
color = yyjson_obj_get(val, "host");
if (color)
ffOptionParseColor(yyjson_get_str(color), &options->colorHost);
continue;
}
ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
}
}