Unmarshal just does the right thing

grahamgilbert · grahamgilbert · commit 6e3947c7902f · 2025-02-19T22:35:33.000-08:00
diff --git a/pkg/launchservices/plist.go b/pkg/launchservices/plist.go
@@ -56,13 +56,12 @@ func ReadPlist(path string) (Plist, error) {
 	if err != nil {
 		return p, err
 	}
-	plistFile, err := os.Open(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return p, err
 	}
-	defer plistFile.Close()
 
-	err = plist.NewBinaryDecoder(plistFile).Decode(&p)
+	err = plist.Unmarshal(data, &p)
 	if err != nil {
 		return p, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,12 @@ func ReadPlist(path string) (Plist, error) {`
`56`	`56`	`if err != nil {`
`57`	`57`	`return p, err`
`58`	`58`	`}`
`59`		`- plistFile, err := os.Open(path)`
	`59`	`+ data, err := os.ReadFile(path)`
`60`	`60`	`if err != nil {`
`61`	`61`	`return p, err`
`62`	`62`	`}`
`63`		`- defer plistFile.Close()`
`64`	`63`
`65`		`- err = plist.NewBinaryDecoder(plistFile).Decode(&p)`
	`64`	`+ err = plist.Unmarshal(data, &p)`
`66`	`65`	`if err != nil {`
`67`	`66`	`return p, err`
`68`	`67`	`}`