mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-06-04 01:28:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker): use UnmarshalStrict when decoding embedded yamls

Browse Source 
Since we have 100% control over what data gets embedded, there is no
reason to embed anything that doesn't pass the strict yaml parsing
and it's better we throw a panic right away so it's easy to catch
this during development.
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2025-05-23 21:44:23 +03:00
parent 27bf8220c0
commit ddbaf6a4bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tracker/gioui/keyevent.go
View File

@ -41,7 +41,7 @@ var defaultKeyBindingsYaml []byte
func loadDefaultKeyBindings() []KeyBinding { func loadDefaultKeyBindings() []KeyBinding {
var keyBindings []KeyBinding var keyBindings []KeyBinding
err := yaml.Unmarshal(defaultKeyBindingsYaml, &keyBindings) err := yaml.UnmarshalStrict(defaultKeyBindingsYaml, &keyBindings)
if err != nil { if err != nil {
panic(fmt.Errorf("failed to unmarshal keybindings: %w", err)) panic(fmt.Errorf("failed to unmarshal keybindings: %w", err))
} }

2
tracker/gioui/preferences.go
View File

@ -29,7 +29,7 @@ var defaultPreferencesYaml []byte
func loadDefaultPreferences() Preferences { func loadDefaultPreferences() Preferences {
var preferences Preferences var preferences Preferences
err := yaml.Unmarshal(defaultPreferencesYaml, &preferences) err := yaml.UnmarshalStrict(defaultPreferencesYaml, &preferences)
if err != nil { if err != nil {
panic(fmt.Errorf("failed to unmarshal preferences: %w", err)) panic(fmt.Errorf("failed to unmarshal preferences: %w", err))
} }

4
tracker/presets.go
View File

@ -11,7 +11,7 @@ import (
"github.com/vsariola/sointu" "github.com/vsariola/sointu"
"github.com/vsariola/sointu/vm" "github.com/vsariola/sointu/vm"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v2"
) )
//go:generate go run generate/main.go //go:generate go run generate/main.go
@ -180,7 +180,7 @@ func init() {
return nil return nil
} }
var instr sointu.Instrument var instr sointu.Instrument
if yaml.Unmarshal(data, &instr) == nil { if yaml.UnmarshalStrict(data, &instr) == nil {
noExt := path[:len(path)-len(filepath.Ext(path))] noExt := path[:len(path)-len(filepath.Ext(path))]
splitted := splitPath(noExt) splitted := splitPath(noExt)
splitted = splitted[1:] // remove "presets" from the path splitted = splitted[1:] // remove "presets" from the path