fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-08 06:00:08 +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/opengl/opengl.c
+5 -9
View File
@@ -66,18 +66,14 @@ bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, cons
void ffParseOpenGLJsonObject(FFOpenGLOptions* 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, "library"))
if (unsafe_yyjson_equals_str(key, "library"))
{
int value;
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
@@ -87,13 +83,13 @@ void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module)
{},
});
if (error)
ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error);
ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
else
options->library = (FFOpenGLLibrary) value;
continue;
}
ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key);
ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}