Simplified callbacks in commands.Init

Author: cmaglie

commands/instances.go

@@ -173,14 +173,41 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
 // Failures don't stop the loading process, in case of loading failure the Platform or library
 // is simply skipped and an error gRPC status is sent to responseCallback.
 func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) error {
-	if responseCallback == nil {
-		responseCallback = func(r *rpc.InitResponse) {}
-	}
 	instance := instances[req.Instance.Id]
 	if instance == nil {
 		return &arduino.InvalidInstanceError{}
 	}
 
+	// Setup callback functions
+	if responseCallback == nil {
+		responseCallback = func(r *rpc.InitResponse) {}
+	}
+	responseError := func(st *status.Status) {
+		responseCallback(&rpc.InitResponse{
+			Message: &rpc.InitResponse_Error{
+				Error: st.Proto(),
+			},
+		})
+	}
+	taskCallback := func(msg *rpc.TaskProgress) {
+		responseCallback(&rpc.InitResponse{
+			Message: &rpc.InitResponse_InitProgress{
+				InitProgress: &rpc.InitResponse_Progress{
+					TaskProgress: msg,
+				},
+			},
+		})
+	}
+	downloadCallback := func(msg *rpc.DownloadProgress) {
+		responseCallback(&rpc.InitResponse{
+			Message: &rpc.InitResponse_InitProgress{
+				InitProgress: &rpc.InitResponse_Progress{
+					DownloadProgress: msg,
+				},
+			},
+		})
+	}
+
 	// We need to clear the PackageManager currently in use by this instance
 	// in case this is not the first Init on this instances, that might happen
 	// after reinitializing an instance after installing or uninstalling a core.
@@ -195,11 +222,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		URL, err := utils.URLParse(u)
 		if err != nil {
 			s := status.Newf(codes.InvalidArgument, tr("Invalid additional URL: %v"), err)
-			responseCallback(&rpc.InitResponse{
-				Message: &rpc.InitResponse_Error{
-					Error: s.Proto(),
-				},
-			})
+			responseError(s)
 			continue
 		}
 
@@ -209,22 +232,14 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 			_, err := instance.PackageManager.LoadPackageIndexFromFile(indexFile)
 			if err != nil {
 				s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
-				responseCallback(&rpc.InitResponse{
-					Message: &rpc.InitResponse_Error{
-						Error: s.Proto(),
-					},
-				})
+				responseError(s)
 			}
 			continue
 		}
 
 		if err := instance.PackageManager.LoadPackageIndex(URL); err != nil {
 			s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
-			responseCallback(&rpc.InitResponse{
-				Message: &rpc.InitResponse_Error{
-					Error: s.Proto(),
-				},
-			})
+			responseError(s)
 		}
 	}
 
@@ -233,31 +248,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 	// and they would never get reloaded.
 	for _, err := range instance.PackageManager.LoadHardware() {
 		s := &arduino.PlatformLoadingError{Cause: err}
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_Error{
-				Error: s.ToRPCStatus().Proto(),
-			},
-		})
-	}
-
-	taskCallback := func(msg *rpc.TaskProgress) {
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_InitProgress{
-				InitProgress: &rpc.InitResponse_Progress{
-					TaskProgress: msg,
-				},
-			},
-		})
-	}
-
-	downloadCallback := func(msg *rpc.DownloadProgress) {
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_InitProgress{
-				InitProgress: &rpc.InitResponse_Progress{
-					DownloadProgress: msg,
-				},
-			},
-		})
+		responseError(s.ToRPCStatus())
 	}
 
 	// Get builtin tools
@@ -266,11 +257,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		latestRelease := tool.LatestRelease()
 		if latestRelease == nil {
 			s := status.Newf(codes.Internal, tr("can't find latest release of tool %s", name))
-			responseCallback(&rpc.InitResponse{
-				Message: &rpc.InitResponse_Error{
-					Error: s.Proto(),
-				},
-			})
+			responseError(s)
 			continue
 		}
 		builtinToolReleases = append(builtinToolReleases, latestRelease)
@@ -282,11 +269,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		installed, err := instance.installToolIfMissing(toolRelease, downloadCallback, taskCallback)
 		if err != nil {
 			s := status.Newf(codes.Internal, err.Error())
-			responseCallback(&rpc.InitResponse{
-				Message: &rpc.InitResponse_Error{
-					Error: s.Proto(),
-				},
-			})
+			responseError(s)
 			continue
 		}
 		toolsHaveBeenInstalled = toolsHaveBeenInstalled || installed
@@ -297,21 +280,13 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		// so we must reload again otherwise we would never found them.
 		for _, err := range instance.PackageManager.LoadHardware() {
 			s := &arduino.PlatformLoadingError{Cause: err}
-			responseCallback(&rpc.InitResponse{
-				Message: &rpc.InitResponse_Error{
-					Error: s.ToRPCStatus().Proto(),
-				},
-			})
+			responseError(s.ToRPCStatus())
 		}
 	}
 
 	for _, err := range instance.PackageManager.LoadDiscoveries() {
 		s := &arduino.PlatformLoadingError{Cause: err}
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_Error{
-				Error: s.ToRPCStatus().Proto(),
-			},
-		})
+		responseError(s.ToRPCStatus())
 	}
 
 	// Load libraries
@@ -325,20 +300,12 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 
 	if err := instance.lm.LoadIndex(); err != nil {
 		s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_Error{
-				Error: s.Proto(),
-			},
-		})
+		responseError(s)
 	}
 
 	for _, err := range instance.lm.RescanLibraries() {
 		s := status.Newf(codes.FailedPrecondition, tr("Loading libraries: %v"), err)
-		responseCallback(&rpc.InitResponse{
-			Message: &rpc.InitResponse_Error{
-				Error: s.Proto(),
-			},
-		})
+		responseError(s)
 	}
 
 	// Refreshes the locale used, this will change the