Skip to content

Enhance "board details" command #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 24, 2020
Merged

Enhance "board details" command #674

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7ccbb12
Add properties to board details printing
Apr 22, 2020
b363831
Add usb IdentificationPrefs
Apr 22, 2020
5442f8b
Add more details
Apr 22, 2020
d7f94c5
refactor board id
Apr 23, 2020
fe44a29
Add help and Package name
Apr 23, 2020
cc494f6
Inject package URL in package structs
Apr 23, 2020
4742a79
Add tool release unroll
Apr 23, 2020
49320f3
Prettify commands code
Apr 24, 2020
994ae32
Polish struct usage
Apr 24, 2020
b8dac56
Add board details test
Apr 24, 2020
4bd3625
Reformat proto
Apr 24, 2020
532a910
Make linter happy
Apr 24, 2020
f79432a
Add table printing
Apr 24, 2020
250696c
Make linter happy again
Apr 24, 2020
17c7f44
Add missing sizes to gold details json test
Apr 24, 2020
18b21c6
Add search for external package tool dependencies
Apr 24, 2020
c766720
Add --full flag and test table print comestics
Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prettify commands code
  • Loading branch information
rsora committed Apr 24, 2020
commit 49320f30d8cd6b43f906fc3b85037567a9603a60
16 changes: 6 additions & 10 deletions commands/board/details.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
rpc "github.com/arduino/arduino-cli/rpc/commands"
)

// Details FIXMEDOC
// Details returns all details for a board including tools and HW identifiers
func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
pm := commands.GetPackageManager(req.GetInstance().GetId())
if pm == nil {
Expand All @@ -37,7 +37,6 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
return nil, fmt.Errorf("parsing fqbn: %s", err)
}

//boardPackage, platformRelease, board, buildProperties, buildPlatformRelease, err := pm.ResolveFQBN(fqbn)
boardPackage, _, board, _, _, err := pm.ResolveFQBN(fqbn)
if err != nil {
return nil, fmt.Errorf("loading board data: %s", err)
Expand Down Expand Up @@ -95,7 +94,6 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
} else if !hasSelected && i == 0 {
configValue.Selected = true
}

configValue.Value = value
configValue.ValueLabel = values.Get(value)
configOption.Values = append(configOption.Values, configValue)
Expand All @@ -105,9 +103,8 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
}

details.ToolsDependencies = []*rpc.ToolsDependencies{}
for _, reqTool := range board.PlatformRelease.Dependencies {

toolRelease := board.PlatformRelease.Platform.Package.Tools[reqTool.ToolName].Releases[reqTool.ToolVersion.String()]
for _, tool := range board.PlatformRelease.Dependencies {
toolRelease := board.PlatformRelease.Platform.Package.Tools[tool.ToolName].Releases[tool.ToolVersion.String()]
var systems []*rpc.Systems
for _, f := range toolRelease.Flavors {
systems = append(systems, &rpc.Systems{
Expand All @@ -117,11 +114,10 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
Url: f.Resource.URL,
})
}

details.ToolsDependencies = append(details.ToolsDependencies, &rpc.ToolsDependencies{
Name: reqTool.ToolName,
Packager: reqTool.ToolPackager,
Version: reqTool.ToolVersion.String(),
Name: tool.ToolName,
Packager: tool.ToolPackager,
Version: tool.ToolVersion.String(),
Systems: systems,
})
}
Expand Down