Skip to content

Commit 609ee20

Browse files
committed
Moved 'lib list' flags into command creation
1 parent 7b4b493 commit 609ee20

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

cli/lib/list.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ import (
3232
"github.com/spf13/cobra"
3333
)
3434

35-
var (
36-
all bool
37-
updatable bool
38-
)
39-
4035
func initListCommand() *cobra.Command {
36+
var all bool
37+
var updatable bool
4138
listCommand := &cobra.Command{
4239
Use: fmt.Sprintf("list [%s]", tr("LIBNAME")),
4340
Short: tr("Shows a list of installed libraries."),
@@ -48,15 +45,17 @@ library. By default the libraries provided as built-in by platforms/core are
4845
not listed, they can be listed by adding the --all flag.`),
4946
Example: " " + os.Args[0] + " lib list",
5047
Args: cobra.MaximumNArgs(1),
51-
Run: runListCommand,
48+
Run: func(cmd *cobra.Command, args []string) {
49+
runListCommand(args, all, updatable)
50+
},
5251
}
5352
listCommand.Flags().BoolVar(&all, "all", false, tr("Include built-in libraries (from platforms and IDE) in listing."))
5453
fqbn.AddToCommand(listCommand)
5554
listCommand.Flags().BoolVar(&updatable, "updatable", false, tr("List updatable libraries."))
5655
return listCommand
5756
}
5857

59-
func runListCommand(cmd *cobra.Command, args []string) {
58+
func runListCommand(args []string, all bool, updatable bool) {
6059
instance := instance.CreateAndInit()
6160
logrus.Info("Executing `arduino-cli lib list`")
6261

@@ -94,13 +93,17 @@ func runListCommand(cmd *cobra.Command, args []string) {
9493
libs = []*rpc.InstalledLibrary{}
9594
}
9695

97-
feedback.PrintResult(installedResult{libs})
96+
feedback.PrintResult(installedResult{
97+
onlyUpdates: updatable,
98+
installedLibs: libs,
99+
})
98100
logrus.Info("Done")
99101
}
100102

101103
// output from this command requires special formatting, let's create a dedicated
102104
// feedback.Result implementation
103105
type installedResult struct {
106+
onlyUpdates bool
104107
installedLibs []*rpc.InstalledLibrary
105108
}
106109

@@ -109,9 +112,9 @@ func (ir installedResult) Data() interface{} {
109112
}
110113

111114
func (ir installedResult) String() string {
112-
if ir.installedLibs == nil || len(ir.installedLibs) == 0 {
113-
if updatable {
114-
return tr("No updates available.")
115+
if len(ir.installedLibs) == 0 {
116+
if ir.onlyUpdates {
117+
return tr("No libraries update is available.")
115118
}
116119
return tr("No libraries installed.")
117120
}

cli/outdated/outdated.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ import (
1919
"context"
2020
"os"
2121

22+
"github.com/arduino/arduino-cli/cli/errorcodes"
2223
"github.com/arduino/arduino-cli/cli/feedback"
2324
"github.com/arduino/arduino-cli/cli/instance"
24-
"github.com/arduino/arduino-cli/commands/outdated"
25+
"github.com/arduino/arduino-cli/commands/core"
26+
"github.com/arduino/arduino-cli/commands/lib"
2527
"github.com/arduino/arduino-cli/i18n"
2628
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2729
"github.com/arduino/arduino-cli/table"

0 commit comments

Comments
 (0)