Removed duplicates leftovers

Author: cmaglie

cli/lib/list.go

@@ -18,11 +18,10 @@
 package lib
 
 import (
-	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/common/formatter/output"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -56,31 +55,9 @@ func runListCommand(cmd *cobra.Command, args []string) {
 		lm = cli.InitLibraryManager(cli.Config)
 	}
 
-	res := ListLibraries(lm, listFlags.updatable)
+	res := lib.ListLibraries(lm, listFlags.updatable)
 	if len(res.Libraries) > 0 {
 		formatter.Print(res)
 	}
 	logrus.Info("Done")
 }
-
-// ListLibraries returns the list of installed libraries. If updatable is true it
-// returns only the libraries that may be updated.
-func ListLibraries(lm *librariesmanager.LibrariesManager, updatable bool) *output.InstalledLibraries {
-	res := &output.InstalledLibraries{}
-	for _, libAlternatives := range lm.Libraries {
-		for _, lib := range libAlternatives.Alternatives {
-			var available *librariesindex.Release
-			if updatable {
-				available = lm.Index.FindLibraryUpdate(lib)
-				if available == nil {
-					continue
-				}
-			}
-			res.Libraries = append(res.Libraries, &output.InstalledLibary{
-				Library:   lib,
-				Available: available,
-			})
-		}
-	}
-	return res
-}

cli/lib/upgrade.go

@@ -20,6 +20,7 @@ package lib
 import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -39,7 +40,7 @@ func initUpgradeCommand() *cobra.Command {
 
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
 	lm := cli.InitLibraryManager(cli.Config)
-	list := ListLibraries(lm, true)
+	list := lib.ListLibraries(lm, true)
 	libReleases := []*librariesindex.Release{}
 	for _, upgradeDesc := range list.Libraries {
 		libReleases = append(libReleases, upgradeDesc.Available)

commands/lib/list.go

@@ -20,49 +20,9 @@ package lib
 import (
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
-	"github.com/arduino/arduino-cli/cli"
-	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/common/formatter/output"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 )
 
-func initListCommand() *cobra.Command {
-	listCommand := &cobra.Command{
-		Use:     "list",
-		Short:   "Shows a list of all installed libraries.",
-		Long:    "Shows a list of all installed libraries.",
-		Example: "  " + cli.AppName + " lib list",
-		Args:    cobra.NoArgs,
-		Run:     runListCommand,
-	}
-	listCommand.Flags().BoolVar(&listFlags.all, "all", false, "Include built-in libraries (from platforms and IDE) in listing.")
-	listCommand.Flags().BoolVar(&listFlags.updatable, "updatable", false, "List updatable libraries.")
-	return listCommand
-}
-
-var listFlags struct {
-	all       bool
-	updatable bool
-}
-
-func runListCommand(cmd *cobra.Command, args []string) {
-	logrus.Info("Listing")
-
-	var lm *librariesmanager.LibrariesManager
-	if listFlags.all {
-		_, lm = cli.InitPackageAndLibraryManager()
-	} else {
-		lm = cli.InitLibraryManager(cli.Config)
-	}
-
-	res := ListLibraries(lm, listFlags.updatable)
-	if len(res.Libraries) > 0 {
-		formatter.Print(res)
-	}
-	logrus.Info("Done")
-}
-
 // ListLibraries returns the list of installed libraries. If updatable is true it
 // returns only the libraries that may be updated.
 func ListLibraries(lm *librariesmanager.LibrariesManager, updatable bool) *output.InstalledLibraries {