Fixed cli initialization subroutines, maybe this is the right one

Author: cmaglie

cli/cli.go

@@ -83,21 +83,12 @@ func packageManagerInitReq() *rpc.InitReq {
 	return &rpc.InitReq{Configuration: conf}
 }
 
-func InitInstance(libManagerOnly bool) *rpc.InitResp {
-	if libManagerOnly {
-		logrus.Info("Initializing library manager")
-	} else {
-		logrus.Info("Initializing package manager")
-	}
+func InitInstance() *rpc.InitResp {
+	logrus.Info("Initializing package manager")
 	req := packageManagerInitReq()
-	req.LibraryManagerOnly = libManagerOnly
 	resp, err := commands.Init(context.Background(), req)
 	if err != nil {
-		if libManagerOnly {
-			formatter.PrintError(err, "Error initializing library manager")
-		} else {
-			formatter.PrintError(err, "Error initializing package manager")
-		}
+		formatter.PrintError(err, "Error initializing package manager")
 		os.Exit(ErrGeneric)
 	}
 	if resp.GetLibrariesIndexError() != "" {
@@ -120,7 +111,7 @@ func InitInstance(libManagerOnly bool) *rpc.InitResp {
 
 // CreateInstance creates and return an instance of the Arduino Core engine
 func CreateInstance() *rpc.Instance {
-	resp := InitInstance(false)
+	resp := InitInstance()
 	if resp.GetPlatformsIndexErrors() != nil {
 		for _, err := range resp.GetPlatformsIndexErrors() {
 			formatter.PrintError(errors.New(err), "Error loading index")
@@ -131,38 +122,19 @@ func CreateInstance() *rpc.Instance {
 	return resp.GetInstance()
 }
 
-// CreateLibManagerOnlyInstace creates and return an instance of the
-// Arduino Core Engine skipping the platform manager initialization (only
-// libraries management enabled).
-func CreateLibManagerOnlyInstace() *rpc.Instance {
-	return InitInstance(true).GetInstance()
+// CreateInstaceIgnorePlatformIndexErrors creates and return an instance of the
+// Arduino Core Engine, but won't stop on platforms index loading errors.
+func CreateInstaceIgnorePlatformIndexErrors() *rpc.Instance {
+	return InitInstance().GetInstance()
 }
 
 // InitPackageAndLibraryManager initializes the PackageManager and the
 // LibaryManager with the default configuration. (DEPRECATED)
 func InitPackageAndLibraryManager() (*packagemanager.PackageManager, *librariesmanager.LibrariesManager) {
-	resp := InitInstance(false)
+	resp := InitInstance()
 	return commands.GetPackageManager(resp), commands.GetLibraryManager(resp)
 }
 
-// InitPackageAndLibraryManagerWithoutBundles initializes the PackageManager
-// and the LibraryManager but ignores bundles and platforms installed in sketchbook. (DEPRECATED)
-func InitPackageAndLibraryManagerWithoutBundles() (*packagemanager.PackageManager, *librariesmanager.LibrariesManager) {
-	logrus.Info("Package manager will scan only managed hardware folder")
-
-	fakeResult := false
-	Config.IDEBundledCheckResult = &fakeResult
-	Config.SketchbookDir = nil
-	return InitPackageAndLibraryManager()
-}
-
-// InitLibraryManager initializes the LibraryManager only. The library manager
-// will not handle core-libraries. (DEPRECATED)
-func InitLibraryManager(cfg *configs.Configuration) *librariesmanager.LibrariesManager {
-	resp := InitInstance(true)
-	return commands.GetLibraryManager(resp)
-}
-
 // InitSketchPath returns sketchPath if specified or the current working
 // directory if sketchPath is nil.
 func InitSketchPath(sketchPath *paths.Path) *paths.Path {

cli/core/update_index.go

@@ -42,7 +42,7 @@ func initUpdateIndexCommand() *cobra.Command {
 }
 
 func runUpdateIndexCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateInstance()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	logrus.Info("Executing `arduino core update-index`")
 
 	_, err := commands.UpdateIndex(context.Background(), &rpc.UpdateIndexReq{

cli/lib/download.go

@@ -45,7 +45,7 @@ func initDownloadCommand() *cobra.Command {
 }
 
 func runDownloadCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	pairs, err := librariesindex.ParseArgs(args)
 	if err != nil {
 		formatter.PrintError(err, "Arguments error")

cli/lib/install.go

@@ -45,7 +45,7 @@ func initInstallCommand() *cobra.Command {
 }
 
 func runInstallCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	refs, err := librariesindex.ParseArgs(args)
 	if err != nil {
 		formatter.PrintError(err, "Arguments error")

cli/lib/list.go

@@ -51,7 +51,7 @@ var listFlags struct {
 }
 
 func runListCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	logrus.Info("Listing")
 
 	res, err := lib.LibraryList(context.Background(), &rpc.LibraryListReq{

cli/lib/search.go

@@ -52,7 +52,7 @@ var searchFlags struct {
 }
 
 func runSearchCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	logrus.Info("Executing `arduino lib search`")
 	searchResp, err := lib.LibrarySearch(context.Background(), &rpc.LibrarySearchReq{
 		Instance: instance,

cli/lib/uninstall.go

@@ -45,7 +45,7 @@ func initUninstallCommand() *cobra.Command {
 func runUninstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino lib uninstall`")
 
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 	libRefs, err := librariesindex.ParseArgs(args)
 	if err != nil {
 		formatter.PrintError(err, "Arguments error")

cli/lib/update_index.go

@@ -36,7 +36,7 @@ func initUpdateIndexCommand() *cobra.Command {
 		Example: "  " + cli.AppName + " lib update-index",
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			instance := cli.CreateLibManagerOnlyInstace()
+			instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 			err := commands.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexReq{
 				Instance: instance,
 			}, cli.OutputProgressBar())

cli/lib/upgrade.go

@@ -43,7 +43,7 @@ func initUpgradeCommand() *cobra.Command {
 }
 
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
-	instance := cli.CreateLibManagerOnlyInstace()
+	instance := cli.CreateInstaceIgnorePlatformIndexErrors()
 
 	err := lib.LibraryUpgradeAll(context.Background(), &rpc.LibraryUpgradeAllReq{
 		Instance: instance,