convert ENVs to the correct type

Author: damongolding

config.schema.json

@@ -17,7 +17,7 @@
       "type": "boolean"
     },
     "time_format": {
-      "type": "integer"
+      "type": ["integer", "string"]
     },
     "show_date": {
       "type": "boolean"
@@ -103,6 +103,9 @@
     "menu_position": {
       "type": "string"
     },
+    "disable_navigation": {
+      "type": "boolean"
+    },
     "disable_ui": {
       "type": "boolean"
     },
@@ -139,6 +142,9 @@
     "sleep_icon": {
       "type": "boolean"
     },
+    "disable_sleep": {
+      "type": "boolean"
+    },
     "transition": {
       "type": "string"
     },
@@ -154,6 +160,12 @@
     "progress_bar_position": {
       "type": "string"
     },
+    "custom_css": {
+      "type": "boolean"
+    },
+    "custom_css_class": {
+      "type": "string"
+    },
     "image_fit": {
       "type": "string"
     },
@@ -188,7 +200,7 @@
       "type": "boolean"
     },
     "image_time_format": {
-      "type": "integer"
+      "type": ["integer", "string"]
     },
     "show_image_date": {
       "type": "boolean"
@@ -248,10 +260,10 @@
             "type": "string"
           },
           "lat": {
-            "type": "number"
+            "type": ["number", "string"]
           },
           "lon": {
-            "type": "number"
+            "type": ["number", "string"]
           },
           "api": {
             "type": "string"
@@ -291,6 +303,12 @@
         "required": ["url", "event"]
       }
     },
+    "blacklist": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "iframe": {
       "type": ["string", "array"],
       "items": {
@@ -307,6 +325,12 @@
       },
       "required": []
     },
+    "user": {
+      "type": ["string", "array"],
+      "items": {
+        "type": "string"
+      }
+    },
     "show_user": {
       "type": "boolean"
     },
@@ -338,6 +362,9 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
+        "version": {
+          "type": "string"
+        },
         "debug": {
           "type": "boolean"
         },

internal/config/config.go

@@ -508,14 +508,14 @@ func (c *Config) Load() error {
 
 	c.V.AutomaticEnv()
 
-	err := c.V.ReadInConfig()
-	if err != nil {
+	readInConfigErr := c.V.ReadInConfig()
+	if readInConfigErr != nil {
 		var configFileNotFoundErr viper.ConfigFileNotFoundError
 		switch {
-		case errors.As(err, &configFileNotFoundErr):
+		case errors.As(readInConfigErr, &configFileNotFoundErr):
 			log.Info("Not using config.yaml")
 		case !isValidYAML(c.V.ConfigFileUsed()):
-			log.Fatal(err)
+			log.Fatal(readInConfigErr)
 		}
 	} else {
 		level := strings.ToLower(strings.TrimSpace(c.V.GetString("kiosk.config_validation_level")))
@@ -529,7 +529,7 @@ func (c *Config) Load() error {
 		}
 	}
 
-	err = c.V.Unmarshal(&c)
+	err := c.V.Unmarshal(&c)
 	if err != nil {
 		log.Error("Environment can't be loaded", "err", err)
 		return err

internal/config/config_validation.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"reflect"
 	"slices"
+	"strconv"
 	"strings"
 
 	"github.com/charmbracelet/log"
@@ -368,18 +369,16 @@ func checkSchema(config map[string]any, level string) bool {
 		return true
 	}
 
-	// if we are using a config.yaml file but supplying immich_api_key || immich_url via ENVs get them
-	if v, ok := config["immich_api_key"]; !ok || v == "" {
-		config["immich_api_key"] = os.Getenv("KIOSK_IMMICH_API_KEY")
-	}
-
-	if v, ok := config["immich_url"]; !ok || v == "" {
-		config["immich_url"] = os.Getenv("KIOSK_IMMICH_URL")
+	typed := ConfigTypes(config, Config{})
+	for k, v := range config {
+		if _, ok := typed[k]; !ok {
+			typed[k] = v
+		}
 	}
 
-	jsonData, err := json.Marshal(config)
+	jsonData, err := json.Marshal(typed)
 	if err != nil {
-		log.Error("Failed to marshal config to JSON", "err", err)
+		log.Error("Schema validation setup failed: marshal", "err", err)
 		return false
 	}
 
@@ -390,7 +389,7 @@ func checkSchema(config map[string]any, level string) bool {
 	// Validate
 	result, err := gojsonschema.Validate(schemaLoader, docLoader)
 	if err != nil {
-		log.Error("Schema validation setup failed", "err", err)
+		log.Error("Schema validation setup failed: validate", "err", err)
 		return false
 	}
 
@@ -412,3 +411,62 @@ func checkSchema(config map[string]any, level string) bool {
 
 	return true
 }
+
+func ConfigTypes(settings map[string]any, cfgStruct any) map[string]any {
+	return convertConfigTypes(reflect.TypeOf(cfgStruct), settings)
+}
+
+func convertConfigTypes(typ reflect.Type, settings map[string]any) map[string]any {
+	result := make(map[string]any)
+
+	// If pointer, get the element
+	if typ.Kind() == reflect.Pointer {
+		typ = typ.Elem()
+	}
+
+	for i := range typ.NumField() {
+		field := typ.Field(i)
+		tag := field.Tag.Get("mapstructure")
+		if tag == "" {
+			tag = field.Name
+		}
+
+		raw, rawFound := settings[tag]
+		if !rawFound {
+			continue
+		}
+
+		switch field.Type.Kind() {
+		case reflect.Struct:
+			if nestedMap, ok := raw.(map[string]any); ok {
+				result[tag] = convertConfigTypes(field.Type, nestedMap)
+			}
+		case reflect.Int:
+			switch v := raw.(type) {
+			case string:
+				if n, err := strconv.Atoi(v); err == nil {
+					result[tag] = n
+				}
+			default:
+				result[tag] = v
+			}
+		case reflect.Bool:
+			switch v := raw.(type) {
+			case string:
+				if b, err := strconv.ParseBool(v); err == nil {
+					result[tag] = b
+				}
+			default:
+				result[tag] = v
+			}
+		case reflect.String:
+			if s, ok := raw.(string); ok {
+				result[tag] = s
+			}
+		default:
+			result[tag] = raw
+		}
+	}
+
+	return result
+}