Fix camera module override

cmd/thermal-recorder/config.go

@@ -17,10 +17,6 @@
 package main
 
 import (
-	"log"
-	"os"
-	"strings"
-
 	goconfig "github.com/TheCacophonyProject/go-config"
 	"github.com/TheCacophonyProject/thermal-recorder/motion"
 	"github.com/TheCacophonyProject/thermal-recorder/recorder"
@@ -47,16 +43,6 @@ func (c *Config) LoadMotionConfig(cameraModel string) error {
 		return err
 	}
 
-	// Module override, just a temp fix for now.
-	overrideFile := "/etc/cacophony/lepton-module"
-	content, err := os.ReadFile(overrideFile)
-	if err == nil {
-		cameraModel = strings.TrimSpace(string(content))
-		log.Println("Camera model override: " + cameraModel)
-	} else if !os.IsNotExist(err) {
-		return err
-	}
-
 	motionConfig, err := motion.NewConfig(configRW, cameraModel)
 	if err != nil {
 		return err

headers/headerinfo.go

@@ -19,6 +19,8 @@ package headers
 import (
 	"bufio"
 	"bytes"
+	"log"
+	"os"
 	"strings"
 
 	"gopkg.in/yaml.v1"
@@ -105,6 +107,17 @@ func ReadHeaderInfo(reader *bufio.Reader) (*HeaderInfo, error) {
 		serial:    toInt(h[Serial]),
 		firmware:  toStr(h[Firmware]),
 	}
+
+	// Module override, just a temp fix for now.
+	overrideFile := "/etc/cacophony/lepton-module"
+	content, err := os.ReadFile(overrideFile)
+	if err == nil {
+		cameraModel := strings.TrimSpace(string(content))
+		header.model = cameraModel
+		log.Println("Camera model override: " + cameraModel)
+	} else if !os.IsNotExist(err) {
+		return nil, err
+	}
 	return header, nil
 }