JSON Auto correction + hyperion schema split for better readability (#452)

* revoke schema split * add "getAutoCorrectedConfig" function * revoke schema split * revoke schema split * revoke schema split * Prevent compiler error if none grabber is available * revoke schema split * add "getAutoCorrectedConfig" function * revoke schema split * remove "configMigrator" * remove "configMigrator" * Change TestConfigFile to show how the autocorrection works * revoke schema split * revoke schema split * remove "ConfigMigrator" * remove "ConfigMigrator" * remove "ConfigMigratorBase" * remove "ConfigMigratorBase" * Add QJsonUtils.h * added ability "ignore-required" It has been added the ability to correct the configuration without having to pay attention to the keyword "required" in the hyperion schema * Allow Comments in Hyperion Schema * add ability to ignore the "required" keyword in hyperion schema * add ability to ignore the "required" keyword in hyperion schema * add ability to ignore the "required" keyword in hyperion schema * //Allow Comments in Hyperion Schema * Update jsonschema.py to version 0.8.0 to support ... references in json schema * add RefResolver from jsonschema.py to resolve references in hyperion schema * remove dupe code * split the hyperion schema in separatly files For better readability * add function "resolveReferences" to resolve references in hyperion schema. * remove CURRENT_CONFIG_VERSION * remove CURRENT_CONFIG_VERSION * split the hyperion schema in separatly files For better readability * Create schema-backgroundEffect.json * Add the rest of the Hyperion schema via upload * Remove Comments in config file * Add return variable to function writeJson(). fix function resolveReferences(). edit function load() to handle QPair result from schemaChecker. * edit function validate() to return QPair variable * fit function loadEffectDefinition() * fit function checkJson() * Expand error check by dividing "_error" variable in "_error" and "_schemaError". Replace variable "bool" in validate() in QPair * Extend function "cmd_cfg_set" to handle auto correction * Extend function "loadConfig" to handle auto correction * fix function loadConfig()
2025-03-01 10:33:28 +00:00 · 2017-07-30 13:32:10 +02:00
parent 622a171808
commit 5bd020a570
45 changed files with 2356 additions and 2254 deletions
--- a/libsrc/hyperion/schema/schema-grabberV4L2.json
+++ b/libsrc/hyperion/schema/schema-grabberV4L2.json
@@ -0,0 +1,226 @@
+{
+	"type":"array",
+	"title" : "edt_conf_v4l2_heading_title",
+	"minItems": 1,
+	"maxItems": 2,
+	"items":
+	{
+		"type" : "object",
+		"title" : "edt_conf_v4l2_heading_title",
+		"properties" :
+		{
+			"enable" :
+			{
+				"type" : "boolean",
+				"title" : "edt_conf_general_enable_title",
+				"default" : false,
+				"propertyOrder" : 1
+			},
+			"device" :
+			{
+				"type" : "string",
+				"title" : "edt_conf_v4l2_device_title",
+				"default" : "auto",
+				"propertyOrder" : 2
+			},
+			"input" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_input_title",
+				"minimum" : 0,
+				"default" : 0,
+				"propertyOrder" : 3
+			},
+			"standard" :
+			{
+				"type" : "string",
+				"title" : "edt_conf_v4l2_standard_title",
+				"enum" : ["PAL","NTSC"],
+				"default" : "PAL",
+				"options" : {
+					"enum_titles" : ["edt_conf_enum_PAL", "edt_conf_enum_NTSC"]
+				},
+				"propertyOrder" : 4
+			},
+			"width" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_width_title",
+				"minimum" : -1,
+				"default" : -1,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 5
+			},
+			"height" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_height_title",
+				"minimum" : -1,
+				"default" : -1,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 6
+			},
+			"frameDecimation" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_frameDecimation_title",
+				"minimum" : 0,
+				"default" : 2,
+				"propertyOrder" : 7
+			},
+			"sizeDecimation" :
+			{
+				"type" : "integer",
+				"title" : "Size decimation",
+				"minimum" : 0,
+				"default" : 6,
+				"propertyOrder" : 8
+			},
+			"priority" :
+			{
+				"type" : "integer",
+				"minimum" : 100,
+				"maximum" : 253,
+				"title" : "edt_conf_general_priority_title",
+				"default" : 240,
+				"propertyOrder" : 9
+			},
+			"mode" :
+			{
+				"type" : "string",
+				"title" : "edt_conf_v4l2_mode_title",
+				"enum" : ["2D","3DSBS","3DTAB"],
+				"default" : "2D",
+				"propertyOrder" : 10
+			},
+			"useKodiChecker" :
+			{
+				"type" : "boolean",
+				"title" : "edt_conf_v4l2_useKodiChecker_title",
+				"default" : false,
+				"propertyOrder" : 11
+			},
+			"cropLeft" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_cropLeft_title",
+				"minimum" : 0,
+				"default" : 0,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 12
+			},
+			"cropRight" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_cropRight_title",
+				"minimum" : 0,
+				"default" : 0,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 13
+			},
+			"cropTop" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_cropTop_title",
+				"minimum" : 0,
+				"default" : 0,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 14
+			},
+			"cropBottom" :
+			{
+				"type" : "integer",
+				"title" : "edt_conf_v4l2_cropBottom_title",
+				"minimum" : 0,
+				"default" : 0,
+				"append" : "edt_append_pixel",
+				"propertyOrder" : 15
+			},
+			"signalDetection" :
+			{
+				"type" : "boolean",
+				"title" : "edt_conf_v4l2_signalDetection_title",
+				"default" : true,
+				"propertyOrder" : 16
+			},
+			"redSignalThreshold" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_redSignalThreshold_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 17
+			},
+			"greenSignalThreshold" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_greenSignalThreshold_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.025,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 18
+			},
+			"blueSignalThreshold" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_blueSignalThreshold_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 19
+			},
+			"signalDetectionVerticalOffsetMin" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMin_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 20
+			},
+			"signalDetectionVerticalOffsetMax" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMax_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 21
+			},
+			"signalDetectionHorizontalOffsetMin" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMin_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 22
+			},
+			"signalDetectionHorizontalOffsetMax" :
+			{
+				"type" : "number",
+				"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMax_title",
+				"minimum" : 0.0,
+				"maximum" : 1.0,
+				"default" : 0.1,
+				"step" : 0.005,
+				"append" : "edt_append_percent",
+				"propertyOrder" : 23
+			}
+		},
+	"additionalProperties" : false
+	}
+}