Skip to content
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

Jump to bottom

Fix NPE for 'board details' command #924

Merged
merged 2 commits into from
Aug 27, 2020
Merged

Fix NPE for 'board details' command #924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c43a42b
Fix NPE for 'board install' command
cmaglie Aug 26, 2020
4d6af9c
Update translations
cmaglie Aug 26, 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
34 changes: 21 additions & 13 deletions cli/board/details.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,16 @@ func (dr detailsResult) String() string {
// ATmega328P (Old Bootloader) cpu=atmega328old
// ATmega168 cpu=atmega168
t := table.New()
addIfNotEmpty := func(label, content string) {
if content != "" {
t.AddRow(label, content)
}
}

t.SetColumnWidthMode(1, table.Average)
t.AddRow(tr("Board name:"), details.Name)
t.AddRow("FQBN:", details.Fqbn)
t.AddRow(tr("Board version:"), details.Version)
addIfNotEmpty(tr("Board version:"), details.Version)

if details.Official {
t.AddRow() // get some space from above
Expand All @@ -123,20 +129,22 @@ func (dr detailsResult) String() string {
}

t.AddRow() // get some space from above
t.AddRow(tr("Package name:"), details.Package.Name)
t.AddRow(tr("Package maintainer:"), details.Package.Maintainer)
t.AddRow(tr("Package URL:"), details.Package.Url)
t.AddRow(tr("Package website:"), details.Package.WebsiteURL)
t.AddRow(tr("Package online help:"), details.Package.Help.Online)
addIfNotEmpty(tr("Package name:"), details.Package.Name)
addIfNotEmpty(tr("Package maintainer:"), details.Package.Maintainer)
addIfNotEmpty(tr("Package URL:"), details.Package.Url)
addIfNotEmpty(tr("Package website:"), details.Package.WebsiteURL)
addIfNotEmpty(tr("Package online help:"), details.Package.Help.Online)

t.AddRow() // get some space from above
t.AddRow(tr("Platform name:"), details.Platform.Name)
t.AddRow(tr("Platform category:"), details.Platform.Category)
t.AddRow(tr("Platform architecture:"), details.Platform.Architecture)
t.AddRow(tr("Platform URL:"), details.Platform.Url)
t.AddRow(tr("Platform file name:"), details.Platform.ArchiveFileName)
t.AddRow(tr("Platform size (bytes):"), fmt.Sprint(details.Platform.Size))
t.AddRow(tr("Platform checksum:"), details.Platform.Checksum)
addIfNotEmpty(tr("Platform name:"), details.Platform.Name)
addIfNotEmpty(tr("Platform category:"), details.Platform.Category)
addIfNotEmpty(tr("Platform architecture:"), details.Platform.Architecture)
addIfNotEmpty(tr("Platform URL:"), details.Platform.Url)
addIfNotEmpty(tr("Platform file name:"), details.Platform.ArchiveFileName)
if details.Platform.Size != 0 {
addIfNotEmpty(tr("Platform size (bytes):"), fmt.Sprint(details.Platform.Size))
}
addIfNotEmpty(tr("Platform checksum:"), details.Platform.Checksum)

t.AddRow() // get some space from above
for _, tool := range details.ToolsDependencies {
Expand Down
17 changes: 10 additions & 7 deletions commands/board/details.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
}

details.Platform = &rpc.BoardPlatform{
Architecture: boardPlatform.Platform.Architecture,
Category: boardPlatform.Platform.Category,
Url: boardPlatform.Resource.URL,
ArchiveFileName: boardPlatform.Resource.ArchiveFileName,
Checksum: boardPlatform.Resource.Checksum,
Size: boardPlatform.Resource.Size,
Name: boardPlatform.Platform.Name,
Architecture: boardPlatform.Platform.Architecture,
Category: boardPlatform.Platform.Category,
Name: boardPlatform.Platform.Name,
}

if boardPlatform.Resource != nil {
details.Platform.Url = boardPlatform.Resource.URL
details.Platform.ArchiveFileName = boardPlatform.Resource.ArchiveFileName
details.Platform.Checksum = boardPlatform.Resource.Checksum
details.Platform.Size = boardPlatform.Resource.Size
}

details.IdentificationPref = []*rpc.IdentificationPref{}
Expand Down