Skip to content

Commit

Permalink
add support struct to unmarshal profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
alessio-perugini committed Oct 13, 2023
1 parent 83b9985 commit 7aebdae
Showing 1 changed file with 20 additions and 25 deletions.
45 changes: 20 additions & 25 deletions arduino/sketch/profiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,18 @@ import (
"gopkg.in/yaml.v3"
)

// projectRaw is a support struct used only to unmarshal the yaml
type projectRaw struct {
ProfilesRaw yaml.Node `yaml:"profiles"`
DefaultProfile string `yaml:"default_profile"`
DefaultFqbn string `yaml:"default_fqbn"`
DefaultPort string `yaml:"default_port,omitempty"`
DefaultProtocol string `yaml:"default_protocol,omitempty"`
}

// Project represents the sketch project file
type Project struct {
ProfilesRaw yaml.Node `yaml:"profiles"`
Profiles []*Profile `yaml:"-"`
Profiles []*Profile `yaml:"profiles"`
DefaultProfile string `yaml:"default_profile"`
DefaultFqbn string `yaml:"default_fqbn"`
DefaultPort string `yaml:"default_port,omitempty"`
Expand Down Expand Up @@ -63,7 +71,7 @@ func (p *Project) AsYaml() string {
return res
}

func (p *Project) getProfiles() []*Profile {
func (p *projectRaw) getProfiles() []*Profile {
profiles := []*Profile{}
for i, node := range p.ProfilesRaw.Content {
if node.Tag != "!!str" {
Expand All @@ -80,25 +88,7 @@ func (p *Project) getProfiles() []*Profile {
return profiles
}

// Profiles are a list of Profile
type Profiles []*Profile

// UnmarshalYAML decodes a Profiles section from YAML source.
func (p *Profiles) UnmarshalYAML(unmarshal func(interface{}) error) error {
unmarshaledProfiles := map[string]*Profile{}
if err := unmarshal(&unmarshaledProfiles); err != nil {
return err
}

for k, v := range unmarshaledProfiles {
profile := v
profile.Name = k
*p = append(*p, profile)
}

return nil
}

// Profile is a sketch profile, it contains a reference to all the resources
// needed to build and upload a sketch
type Profile struct {
Expand Down Expand Up @@ -266,11 +256,16 @@ func LoadProjectFile(file *paths.Path) (*Project, error) {
if err != nil {
return nil, err
}
res := &Project{}
if err := yaml.Unmarshal(data, &res); err != nil {
raw := &projectRaw{}
if err := yaml.Unmarshal(data, &raw); err != nil {
return nil, err
}
res.Profiles = res.getProfiles()

return res, nil
return &Project{
Profiles: raw.getProfiles(),
DefaultProfile: raw.DefaultProfile,
DefaultFqbn: raw.DefaultFqbn,
DefaultPort: raw.DefaultPort,
DefaultProtocol: raw.DefaultProtocol,
}, nil
}

0 comments on commit 7aebdae

Please sign in to comment.