remove SketchPathCalculation because it does too much unrelated things

Author: umbynos

cli/arguments/sketch.go

@@ -43,15 +43,6 @@ func InitSketchPath(sketchPath string) *paths.Path {
 	return wd
 }
 
-// SketchPathCalculation returns the path and instance of the sketch and the discovery port.
-// Optionally, it warns the user when the sketch contains .pde files.
-func SketchPathCalculation(path string, port Port, instance *rpc.Instance) (*paths.Path, *sketch.Sketch, *discovery.Port) {
-	sketchPath := InitSketch(path)
-	sketch := CreateSketch(sketchPath)
-	discoveryPort := GetDiscoveryPort(instance, port, sketch)
-	return sketchPath, sketch, discoveryPort
-}
-
 // InitSketch is a helper function that determines the sketch path. Optionally, it warns the user when the sketch contains .pde files.
 func InitSketch(path string) *paths.Path {
 	sketchPath := InitSketchPath(path)

cli/debug/debug.go

@@ -74,7 +74,11 @@ func runDebugCommand(command *cobra.Command, args []string) {
 	if len(args) > 0 {
 		path = args[0]
 	}
-	sketchPath, _, discoveryPort := arguments.SketchPathCalculation(path, port, instance)
+
+	sketchPath := arguments.InitSketch(path)
+	sk := arguments.CreateSketch(sketchPath)
+	discoveryPort := arguments.GetDiscoveryPort(instance, port, sk)
+
 	debugConfigRequested := &dbg.DebugConfigRequest{
 		Instance:    instance,
 		Fqbn:        fqbn.String(),

cli/upload/upload.go

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