Skip to content

[skip-changelog] Eliminate empty lines produced by board details -b #1997

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 3 commits into from
Dec 1, 2022
Merged

[skip-changelog] Eliminate empty lines produced by board details -b #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff35655
Eliminate blank line between required tools row entries
MatteoPologruto Nov 30, 2022
2d2028d
Fix Programmers ID typo and modify tests accordingly
MatteoPologruto Nov 30, 2022
ce18f6e
Reduce spacing between "Required tool" columns
MatteoPologruto Dec 1, 2022
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
31 changes: 17 additions & 14 deletions cli/board/details.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func (dr detailsResult) String() string {
// ATmega328P (Old Bootloader) cpu=atmega328old
// ATmega168 cpu=atmega168
t := table.New()
tab := table.New()
addIfNotEmpty := func(label, content string) {
if content != "" {
t.AddRow(label, content)
Expand Down Expand Up @@ -157,43 +158,45 @@ func (dr detailsResult) String() string {
addIfNotEmpty(tr("Platform checksum:"), details.Platform.Checksum)

t.AddRow() // get some space from above

tab.SetColumnWidthMode(1, table.Average)
for _, tool := range details.ToolsDependencies {
t.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version)
tab.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version)
if showFullDetails {
for _, sys := range tool.Systems {
t.AddRow("", tr("OS:"), sys.Host)
t.AddRow("", tr("File:"), sys.ArchiveFilename)
t.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size))
t.AddRow("", tr("Checksum:"), sys.Checksum)
t.AddRow("", tr("URL:"), sys.Url)
t.AddRow() // get some space from above
tab.AddRow("", tr("OS:"), sys.Host)
tab.AddRow("", tr("File:"), sys.ArchiveFilename)
tab.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size))
tab.AddRow("", tr("Checksum:"), sys.Checksum)
tab.AddRow("", tr("URL:"), sys.Url)
tab.AddRow() // get some space from above
}
}
t.AddRow() // get some space from above
}

tab.AddRow() // get some space from above
for _, option := range details.ConfigOptions {
t.AddRow(tr("Option:"), option.OptionLabel, "", option.Option)
tab.AddRow(tr("Option:"), option.OptionLabel, "", option.Option)
for _, value := range option.Values {
green := color.New(color.FgGreen)
if value.Selected {
t.AddRow("",
tab.AddRow("",
table.NewCell(value.ValueLabel, green),
table.NewCell("✔", green),
table.NewCell(option.Option+"="+value.Value, green))
} else {
t.AddRow("",
tab.AddRow("",
value.ValueLabel,
"",
option.Option+"="+value.Value)
}
}
}

t.AddRow(tr("Programmers:"), tr("Id"), tr("Name"))
tab.AddRow(tr("Programmers:"), tr("ID"), tr("Name"))
for _, programmer := range details.Programmers {
t.AddRow("", programmer.GetId(), programmer.GetName())
tab.AddRow("", programmer.GetId(), programmer.GetName())
}

return t.Render()
return t.Render() + tab.Render()
}
2 changes: 1 addition & 1 deletion internal/integrationtest/board/board_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func TestBoardDetailsListProgrammersWithoutFlag(t *testing.T) {
for i, l := range split {
lines[i] = strings.Fields(l)
}
require.Contains(t, lines, []string{"Programmers:", "Id", "Name"})
require.Contains(t, lines, []string{"Programmers:", "ID", "Name"})
require.Contains(t, lines, []string{"edbg", "Atmel", "EDBG"})
require.Contains(t, lines, []string{"atmel_ice", "Atmel-ICE"})
require.Contains(t, lines, []string{"sam_ice", "Atmel", "SAM-ICE"})
Expand Down