From c79b67efc1ead2e2a3ff0744daae7ffef41d4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 18 Jul 2025 16:16:38 +0800 Subject: [PATCH] Modules: don't report errors when `condition` key is set --- src/modules/battery/battery.c | 2 +- src/modules/bios/bios.c | 2 +- src/modules/bluetooth/bluetooth.c | 2 +- src/modules/bluetoothradio/bluetoothradio.c | 2 +- src/modules/board/board.c | 2 +- src/modules/bootmgr/bootmgr.c | 2 +- src/modules/brightness/brightness.c | 2 +- src/modules/btrfs/btrfs.c | 2 +- src/modules/camera/camera.c | 2 +- src/modules/chassis/chassis.c | 2 +- src/modules/colors/colors.c | 2 +- src/modules/command/command.c | 2 +- src/modules/cpu/cpu.c | 2 +- src/modules/cpucache/cpucache.c | 2 +- src/modules/cpuusage/cpuusage.c | 2 +- src/modules/cursor/cursor.c | 2 +- src/modules/custom/custom.c | 2 +- src/modules/datetime/datetime.c | 2 +- src/modules/de/de.c | 2 +- src/modules/disk/disk.c | 2 +- src/modules/diskio/diskio.c | 2 +- src/modules/display/display.c | 2 +- src/modules/dns/dns.c | 2 +- src/modules/editor/editor.c | 2 +- src/modules/font/font.c | 2 +- src/modules/gamepad/gamepad.c | 2 +- src/modules/gpu/gpu.c | 2 +- src/modules/host/host.c | 2 +- src/modules/icons/icons.c | 2 +- src/modules/initsystem/initsystem.c | 2 +- src/modules/kernel/kernel.c | 2 +- src/modules/keyboard/keyboard.c | 2 +- src/modules/lm/lm.c | 2 +- src/modules/loadavg/loadavg.c | 2 +- src/modules/locale/locale.c | 2 +- src/modules/localip/localip.c | 2 +- src/modules/media/media.c | 2 +- src/modules/memory/memory.c | 2 +- src/modules/monitor/monitor.c | 2 +- src/modules/mouse/mouse.c | 2 +- src/modules/netio/netio.c | 2 +- src/modules/opencl/opencl.c | 2 +- src/modules/opengl/opengl.c | 2 +- src/modules/os/os.c | 2 +- src/modules/packages/packages.c | 2 +- src/modules/physicaldisk/physicaldisk.c | 2 +- src/modules/physicalmemory/physicalmemory.c | 2 +- src/modules/player/player.c | 2 +- src/modules/poweradapter/poweradapter.c | 2 +- src/modules/processes/processes.c | 2 +- src/modules/publicip/publicip.c | 2 +- src/modules/separator/separator.c | 2 +- src/modules/shell/shell.c | 2 +- src/modules/sound/sound.c | 2 +- src/modules/swap/swap.c | 2 +- src/modules/terminal/terminal.c | 2 +- src/modules/terminalfont/terminalfont.c | 2 +- src/modules/terminalsize/terminalsize.c | 2 +- src/modules/terminaltheme/terminaltheme.c | 2 +- src/modules/theme/theme.c | 2 +- src/modules/title/title.c | 2 +- src/modules/tpm/tpm.c | 2 +- src/modules/uptime/uptime.c | 2 +- src/modules/users/users.c | 2 +- src/modules/version/version.c | 2 +- src/modules/vulkan/vulkan.c | 2 +- src/modules/wallpaper/wallpaper.c | 2 +- src/modules/weather/weather.c | 2 +- src/modules/wifi/wifi.c | 2 +- src/modules/wm/wm.c | 2 +- src/modules/wmtheme/wmtheme.c | 2 +- src/modules/zpool/zpool.c | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 02f5ab36f..ba2327e34 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -186,7 +186,7 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index a5363eebf..b8a3b0cc3 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -92,7 +92,7 @@ void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 7563b1d54..b93178556 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -123,7 +123,7 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index f5bd940c8..771296bde 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -122,7 +122,7 @@ void ffParseBluetoothRadioJsonObject(FFBluetoothRadioOptions* options, yyjson_va yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/board/board.c b/src/modules/board/board.c index f499446c8..a539aa9bf 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -67,7 +67,7 @@ void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index 19162f15a..601420bc5 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -67,7 +67,7 @@ void ffParseBootmgrJsonObject(FFBootmgrOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 78caf587f..bcbd81364 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -144,7 +144,7 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index 6d6f1a7dc..02ebf6032 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -149,7 +149,7 @@ void ffParseBtrfsJsonObject(FFBtrfsOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 26ef4b3ce..48d450f49 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -84,7 +84,7 @@ void ffParseCameraJsonObject(FFCameraOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index 16805a52a..5d7ef9239 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -68,7 +68,7 @@ void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 63c69b999..7d4367b39 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -181,7 +181,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 7f5a28365..a6d38ab15 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -78,7 +78,7 @@ void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index d6f63bc97..178574aa0 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -142,7 +142,7 @@ void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index ee6e2d9f1..2be8f4551 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -154,7 +154,7 @@ void ffParseCPUCacheJsonObject(FFCPUCacheOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 6124311c7..6d15261eb 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -148,7 +148,7 @@ void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 93372cdc8..9652398b5 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -65,7 +65,7 @@ void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index 73f98dce6..b0f317574 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -34,7 +34,7 @@ void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index a5b4b06ce..06bca8d60 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -134,7 +134,7 @@ void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/de/de.c b/src/modules/de/de.c index 36746fa9a..341e03e2c 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -65,7 +65,7 @@ void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index a2fe912f3..b84012443 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -304,7 +304,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index c9bafe68d..08e0ca84e 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -130,7 +130,7 @@ void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/display/display.c b/src/modules/display/display.c index a8fa7a728..a55c15d83 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -261,7 +261,7 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index 29c04af07..fc330a2f3 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -85,7 +85,7 @@ void ffParseDNSJsonObject(FFDNSOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 61ea18d7f..11afc0940 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -71,7 +71,7 @@ void ffParseEditorJsonObject(FFEditorOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 242b685ee..8efd244ca 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -58,7 +58,7 @@ void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 50be37796..3bcc4f6f9 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -97,7 +97,7 @@ void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index f7f4c90bc..7d917c83d 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -255,7 +255,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 170a1b440..609521f77 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -84,7 +84,7 @@ void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index bfc846a99..3c0dd98db 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -60,7 +60,7 @@ void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index 5821c7d54..38b8ece01 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -65,7 +65,7 @@ void ffParseInitSystemJsonObject(FFInitSystemOptions* options, yyjson_val* modul yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 75ca36758..44c85668b 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -48,7 +48,7 @@ void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index bea387a62..e48e533df 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -65,7 +65,7 @@ void ffParseKeyboardJsonObject(FFKeyboardOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index ff5fb5f9c..5dc29dd3b 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -64,7 +64,7 @@ void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index f42d04e12..2a02f935a 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -122,7 +122,7 @@ void ffParseLoadavgJsonObject(FFLoadavgOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 1849343b3..ba82b3235 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -45,7 +45,7 @@ void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index e1a5d1b30..e143fcf3f 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -295,7 +295,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 98e6aef45..08e446e54 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -123,7 +123,7 @@ void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 845a28b18..0af03736d 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -91,7 +91,7 @@ void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 1e0255dbe..afaab6a27 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -103,7 +103,7 @@ void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index f2dbd9def..58a7cfcf0 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -65,7 +65,7 @@ void ffParseMouseJsonObject(FFMouseOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 50281338e..d49ca61f9 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -144,7 +144,7 @@ void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index bcf2deae6..dd32e9c4a 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -47,7 +47,7 @@ void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index f6d539895..4dcebcdba 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -71,7 +71,7 @@ void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/os/os.c b/src/modules/os/os.c index 9edde8749..566af9414 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -132,7 +132,7 @@ void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index b973980b2..190347d3e 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -318,7 +318,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if (ffStrEqualsIgnCase(key, "type")) + if (ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index 80b934f2f..de6751791 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -159,7 +159,7 @@ void ffParsePhysicalDiskJsonObject(FFPhysicalDiskOptions* options, yyjson_val* m yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 2ee653c59..5ea3573a9 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -97,7 +97,7 @@ void ffParsePhysicalMemoryJsonObject(FFPhysicalMemoryOptions* options, yyjson_va yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 56f160149..cf9a1b314 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -98,7 +98,7 @@ void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index f99e15783..ee8a61342 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -81,7 +81,7 @@ void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* m yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index 3f06803e0..6839642ee 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -46,7 +46,7 @@ void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 71163fbd1..d712ba1be 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -74,7 +74,7 @@ void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index 8f9b8f4e5..aa3e3d58a 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -147,7 +147,7 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffStrEqualsIgnCase(key, "string")) diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index c29fa9d72..f68cb399d 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -59,7 +59,7 @@ void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index 4dec032ac..f57ebb091 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -143,7 +143,7 @@ void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 1f864562a..c4a28f67b 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -157,7 +157,7 @@ void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 265cd7dbd..dc01af2db 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -55,7 +55,7 @@ void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index a8376f586..219b8fa72 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -63,7 +63,7 @@ void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* m yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 4639aefc7..389f4d6f0 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -55,7 +55,7 @@ void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* m yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index a81971d11..25834d66e 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -60,7 +60,7 @@ void ffParseTerminalThemeJsonObject(FFTerminalThemeOptions* options, yyjson_val* yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 7c4901753..e99a21779 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -60,7 +60,7 @@ void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/title/title.c b/src/modules/title/title.c index fdd74271e..02afec2ce 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -109,7 +109,7 @@ void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index 8cbbd840d..9d849671a 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -55,7 +55,7 @@ void ffParseTPMJsonObject(FFTPMOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 64873cc19..445de7e1f 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -72,7 +72,7 @@ void ffParseUptimeJsonObject(FFUptimeOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 74a608eb2..abea30aa0 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -136,7 +136,7 @@ void ffParseUsersJsonObject(FFUsersOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if (ffStrEqualsIgnCase(key, "type")) + if (ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/version/version.c b/src/modules/version/version.c index d49a26065..39a851e32 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -61,7 +61,7 @@ void ffParseVersionJsonObject(FFVersionOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index a08f4b9ba..d67ca9e70 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -67,7 +67,7 @@ void ffParseVulkanJsonObject(FFVulkanOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 7e5b46af0..bd95a4d0e 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -57,7 +57,7 @@ void ffParseWallpaperJsonObject(FFWallpaperOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index f63a026e7..78570d0ef 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -64,7 +64,7 @@ void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 7bb5f7994..cae5150dd 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -153,7 +153,7 @@ void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index f0f0f31b4..5dc413563 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -86,7 +86,7 @@ void ffParseWMJsonObject(FFWMOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index bfddcfbba..6659d88e1 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -46,7 +46,7 @@ void ffParseWMThemeJsonObject(FFWMThemeOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index 5ee356e08..a00274e70 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -126,7 +126,7 @@ void ffParseZpoolJsonObject(FFZpoolOptions* options, yyjson_val* module) yyjson_obj_foreach(module, idx, max, key_, val) { const char* key = yyjson_get_str(key_); - if(ffStrEqualsIgnCase(key, "type")) + if(ffStrEqualsIgnCase(key, "type") || ffStrEqualsIgnCase(key, "condition")) continue; if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))