Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a33072e
added more mapper in feedback result pkg
alessio-perugini Oct 25, 2023
e639e5b
cli: outdated command use feedback result structs
alessio-perugini Oct 25, 2023
cbe3b0d
cli: upload use feedback result structs
alessio-perugini Oct 25, 2023
3ae9dee
cli: board details use feedback result structs
alessio-perugini Oct 25, 2023
da7541a
rename result Platform in PlatformSummary
alessio-perugini Oct 25, 2023
3aee471
fixup mapper BoardListAllRespnse
alessio-perugini Oct 25, 2023
dcf7f86
cli: board listall use feedback result structs
alessio-perugini Oct 25, 2023
cdc80bf
cli: board search use feedback result structs
alessio-perugini Oct 25, 2023
60abc6a
cli: board list use feedback result structs
alessio-perugini Oct 25, 2023
1534ab9
cli: lib deps use feedback result structs
alessio-perugini Oct 25, 2023
5fd4539
cli: lib search use feedback result structs
alessio-perugini Oct 25, 2023
c93f4bc
cli: lib examples use feedback result structs
alessio-perugini Oct 25, 2023
e18ec5f
cli: lib list use feedback result structs
alessio-perugini Oct 25, 2023
ce31a9b
cli: monitor use feedback result structs
alessio-perugini Oct 25, 2023
429f525
cli: compile use feedback result structs
alessio-perugini Oct 25, 2023
a16ba4d
add tests
alessio-perugini Oct 26, 2023
e619093
fix typo and import name
alessio-perugini Nov 6, 2023
2e16184
remove redundant nil checks
alessio-perugini Nov 6, 2023
0702b77
fix printing empty string instead of empty table
alessio-perugini Nov 6, 2023
90cb43a
fix: make anonymous struct explicit
alessio-perugini Nov 6, 2023
2d77b39
fix: use rpc enum String method
alessio-perugini Nov 6, 2023
a126e93
add BoardListWatchResponse mapper
alessio-perugini Nov 6, 2023
0aabc1b
fix: remap rpc enums
alessio-perugini Nov 6, 2023
1d855a0
fix: cli sketch new - not showing any json output
alessio-perugini Nov 6, 2023
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
cli: lib list use feedback result structs
  • Loading branch information
alessio-perugini committed Oct 26, 2023
commit e18ec5fec5c75cc258c7d652529b4a447dc6e095
23 changes: 16 additions & 7 deletions internal/cli/lib/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/arduino/arduino-cli/commands/lib"
"github.com/arduino/arduino-cli/internal/cli/feedback"
"github.com/arduino/arduino-cli/internal/cli/feedback/result"
"github.com/arduino/arduino-cli/internal/cli/instance"
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
"github.com/arduino/arduino-cli/table"
Expand Down Expand Up @@ -59,9 +60,14 @@ not listed, they can be listed by adding the --all flag.`),
// List gets and prints a list of installed libraries.
func List(instance *rpc.Instance, args []string, all bool, updatable bool) {
installedLibs := GetList(instance, args, all, updatable)

installedLibsResult := make([]*result.InstalledLibrary, len(installedLibs))
for i, v := range installedLibs {
installedLibsResult[i] = result.NewInstalledLibrary(v)
}
feedback.PrintResult(installedResult{
onlyUpdates: updatable,
installedLibs: installedLibs,
installedLibs: installedLibsResult,
})
logrus.Info("Done")
}
Expand Down Expand Up @@ -113,7 +119,7 @@ func GetList(
// feedback.Result implementation
type installedResult struct {
onlyUpdates bool
installedLibs []*rpc.InstalledLibrary
installedLibs []*result.InstalledLibrary
}

func (ir installedResult) Data() interface{} {
Expand All @@ -140,23 +146,26 @@ func (ir installedResult) String() string {

lastName := ""
for _, libMeta := range ir.installedLibs {
lib := libMeta.GetLibrary()
if libMeta == nil {
continue
}
lib := libMeta.Library
name := lib.Name
if name == lastName {
name = ` "`
} else {
lastName = name
}

location := lib.GetLocation().String()
location := string(lib.Location)
if lib.ContainerPlatform != "" {
location = lib.GetContainerPlatform()
location = lib.ContainerPlatform
}

available := ""
sentence := ""
if libMeta.GetRelease() != nil {
available = libMeta.GetRelease().GetVersion()
if libMeta.Release != nil {
available = libMeta.Release.Version
sentence = lib.Sentence
}

Expand Down
2 changes: 1 addition & 1 deletion internal/cli/outdated/outdated.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func newOutdatedResult(inPlatforms []*rpc.PlatformSummary, inLibraries []*rpc.In
res.Platforms[i] = result.NewPlatformSummary(v)
}
for i, v := range inLibraries {
res.InstalledLibs[i] = result.NewInstalledLibraryResult(v)
res.InstalledLibs[i] = result.NewInstalledLibrary(v)
}
return res
}
Expand Down