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

JsonConfig: refactor JSON key handling to improve safety and consistency

Browse Source 
Also make keys case-sensitive
This commit is contained in:
李通洲
2025-08-02 18:51:03 +08:00
parent 3cef51ec4a
commit 0b02543ef2
79 changed files with 333 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/title/title.c
+5 -9
View File
@@ -104,24 +104,20 @@ bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const
void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module)
{
yyjson_val *key_, *val;
yyjson_val *key, *val;
size_t idx, max;
yyjson_obj_foreach(module, idx, max, key_, val)
yyjson_obj_foreach(module, idx, max, key, val)
{
const char* key = yyjson_get_str(key_);
if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition"))
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
if (ffStrEqualsIgnCase(key, "fqdn"))
if (unsafe_yyjson_equals_str(key, "fqdn"))
{
options->fqdn = yyjson_get_bool(val);
continue;
}
if (ffStrEqualsIgnCase(key, "color"))
if (unsafe_yyjson_equals_str(key, "color"))
{
if (!yyjson_is_obj(val))
continue;
@@ -138,7 +134,7 @@ void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module)
continue;
}
ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}