move GetDiscoveryPort to port.go

Author: umbynos

cli/arguments/port.go

@@ -18,10 +18,12 @@ package arguments
 import (
 	"fmt"
 	"net/url"
+	"os"
 	"time"
 
 	"github.com/arduino/arduino-cli/arduino/discovery"
 	"github.com/arduino/arduino-cli/arduino/sketch"
+	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -149,3 +151,13 @@ func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Po
 func (p *Port) GetSearchTimeout() time.Duration {
 	return p.timeout
 }
+
+// GetDiscoveryPort is a helper function useful to get the port and handle possible errors
+func (p *Port) GetDiscoveryPort(instance *rpc.Instance, sk *sketch.Sketch) *discovery.Port {
+	discoveryPort, err := p.GetPort(instance, sk)
+	if err != nil {
+		feedback.Errorf(tr("Error discovering port: %v"), err)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+	return discoveryPort
+}

cli/arguments/sketch.go

@@ -18,11 +18,9 @@ package arguments
 import (
 	"os"
 
-	"github.com/arduino/arduino-cli/arduino/discovery"
 	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
-	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 )
@@ -70,13 +68,3 @@ func WarnDeprecatedFiles(sketchPath *paths.Path) {
 		}
 	}
 }
-
-// GetDiscoveryPort is a helper function useful to get the port and handle possible errors
-func GetDiscoveryPort(instance *rpc.Instance, port Port, sk *sketch.Sketch) *discovery.Port {
-	discoveryPort, err := port.GetPort(instance, sk)
-	if err != nil {
-		feedback.Errorf(tr("Error discovering port: %v"), err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
-	return discoveryPort
-}

cli/compile/compile.go

@@ -184,7 +184,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 
 	if compileError == nil && uploadAfterCompile {
 		sk := arguments.CreateSketch(sketchPath)
-		discoveryPort := arguments.GetDiscoveryPort(inst, port, sk)
+		discoveryPort := port.GetDiscoveryPort(inst, sk)
 
 		userFieldRes, err := upload.SupportedUserFields(context.Background(), &rpc.SupportedUserFieldsRequest{
 			Instance: inst,

cli/debug/debug.go

@@ -77,7 +77,7 @@ func runDebugCommand(command *cobra.Command, args []string) {
 
 	sketchPath := arguments.InitSketch(path)
 	sk := arguments.CreateSketch(sketchPath)
-	discoveryPort := arguments.GetDiscoveryPort(instance, port, sk)
+	discoveryPort := port.GetDiscoveryPort(instance, sk)
 
 	debugConfigRequested := &dbg.DebugConfigRequest{
 		Instance:    instance,

cli/upload/upload.go

@@ -79,7 +79,7 @@ func runUploadCommand(command *cobra.Command, args []string) {
 
 	sketchPath := arguments.InitSketch(path)
 	sk := arguments.CreateSketch(sketchPath)
-	discoveryPort := arguments.GetDiscoveryPort(instance, port, sk)
+	discoveryPort := port.GetDiscoveryPort(instance, sk)
 
 	if fqbn.String() == "" && sk != nil && sk.Metadata != nil {
 		// If the user didn't specify an FQBN and a sketch.json file is present