Commit 3cd499a

committed

Refactor preconditions checks

1 parent 50a7c88 commit 3cd499aCopy full SHA for 3cd499a

File tree

-28

lines changed

-28

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,12 @@ import (`
`33`	`33`	`// InitProfile creates a new project file if it does not exist. If a profile name with the associated FQBN is specified,`
`34`	`34`	`// it is added to the project.`
`35`	`35`	`func (s arduinoCoreServerImpl) InitProfile(ctx context.Context, req rpc.InitProfileRequest) (*rpc.InitProfileResponse, error) {`
`36`		`- sketchPath := paths.New(req.GetSketchPath())`
`37`		`- projectFilePath, err := sketchPath.Join("sketch.yaml").Abs()`
`38`		`- if err != nil {`
`39`		`- return nil, err`
`40`		`- }`
`41`		`-`
`42`	`36`	`// Returns an error if the main file is missing from the sketch so there is no need to check if the path exists`
`43`		`- sk, err := sketch.New(sketchPath)`
	`37`	`+ sk, err := sketch.New(paths.New(req.GetSketchPath()))`
`44`	`38`	`if err != nil {`
`45`	`39`	`return nil, err`
`46`	`40`	`}`
	`41`	`+ projectFilePath := sk.GetProjectPath()`
`47`	`42`
`48`	`43`	`if !projectFilePath.Exist() {`
`49`	`44`	`err := projectFilePath.WriteFile([]byte("profiles: {}\n"))`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,12 @@ import (`
`27`	`27`
`28`	`28`	`// ProfileLibAdd adds a library to the specified profile or to the default profile.`
`29`	`29`	`func (s arduinoCoreServerImpl) ProfileLibAdd(ctx context.Context, req rpc.ProfileLibAddRequest) (*rpc.ProfileLibAddResponse, error) {`
`30`		`- sketchPath := paths.New(req.GetSketchPath())`
`31`		`- projectFilePath, err := sketchPath.Join("sketch.yaml").Abs()`
`32`		`- if err != nil {`
`33`		`- return nil, err`
`34`		`- }`
`35`		`-`
`36`	`30`	`// Returns an error if the main file is missing from the sketch so there is no need to check if the path exists`
`37`		`- sk, err := sketch.New(sketchPath)`
	`31`	`+ sk, err := sketch.New(paths.New(req.GetSketchPath()))`
`38`	`32`	`if err != nil {`
`39`	`33`	`return nil, err`
`40`	`34`	`}`
	`35`	`+ projectFilePath := sk.GetProjectPath()`
`41`	`36`
`42`	`37`	`// If no profile is specified, try to use the default one`
`43`	`38`	`profileName := sk.Project.DefaultProfile`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,12 @@ import (`
`26`	`26`
`27`	`27`	`// ProfileLibRemove removes a library from the specified profile or from the default profile.`
`28`	`28`	`func (s arduinoCoreServerImpl) ProfileLibRemove(ctx context.Context, req rpc.ProfileLibRemoveRequest) (*rpc.ProfileLibRemoveResponse, error) {`
`29`		`- sketchPath := paths.New(req.GetSketchPath())`
`30`		`- projectFilePath, err := sketchPath.Join("sketch.yaml").Abs()`
`31`		`- if err != nil {`
`32`		`- return nil, err`
`33`		`- }`
`34`		`-`
`35`	`29`	`// Returns an error if the main file is missing from the sketch so there is no need to check if the path exists`
`36`		`- sk, err := sketch.New(sketchPath)`
	`30`	`+ sk, err := sketch.New(paths.New(req.GetSketchPath()))`
`37`	`31`	`if err != nil {`
`38`	`32`	`return nil, err`
`39`	`33`	`}`
	`34`	`+ projectFilePath := sk.GetProjectPath()`
`40`	`35`
`41`	`36`	`// If no profile is specified, try to use the default one`
`42`	`37`	`profileName := sk.Project.DefaultProfile`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,17 +30,12 @@ func (s arduinoCoreServerImpl) ProfileSetDefault(ctx context.Context, req rpc.`
`30`	`30`	`return nil, &cmderrors.MissingProfileError{}`
`31`	`31`	`}`
`32`	`32`
`33`		`- sketchPath := paths.New(req.GetSketchPath())`
`34`		`- projectFilePath, err := sketchPath.Join("sketch.yaml").Abs()`
`35`		`- if err != nil {`
`36`		`- return nil, err`
`37`		`- }`
`38`		`-`
`39`	`33`	`// Returns an error if the main file is missing from the sketch so there is no need to check if the path exists`
`40`		`- sk, err := sketch.New(sketchPath)`
	`34`	`+ sk, err := sketch.New(paths.New(req.GetSketchPath()))`
`41`	`35`	`if err != nil {`
`42`	`36`	`return nil, err`
`43`	`37`	`}`
	`38`	`+ projectFilePath := sk.GetProjectPath()`
`44`	`39`
`45`	`40`	`if _, err := sk.GetProfile(req.GetProfileName()); err != nil {`
`46`	`41`	`return nil, err`

Comments

(0)