Moved serial number from board details to board list

Author: silvanocerza

cli/board/list.go

@@ -109,6 +109,7 @@ func watchList(cmd *cobra.Command, inst *rpc.Instance) {
 			Protocol:      event.Port.Protocol,
 			ProtocolLabel: event.Port.ProtocolLabel,
 			Boards:        event.Port.Boards,
+			SerialNumber:  event.Port.SerialNumber,
 			Error:         event.Error,
 		})
 	}
@@ -181,6 +182,7 @@ type watchEvent struct {
 	Protocol      string               `json:"protocol,omitempty"`
 	ProtocolLabel string               `json:"protocol_label,omitempty"`
 	Boards        []*rpc.BoardListItem `json:"boards,omitempty"`
+	SerialNumber  string               `json:"serial_number,omitempty"`
 	Error         string               `json:"error,omitempty"`
 }
 

commands/board/details.go

@@ -146,25 +146,5 @@ func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsRe
 		})
 	}
 
-	// Get connected boards
-	ports, err := commands.ListBoards(pm)
-	if err != nil {
-		return nil, err
-	}
-	for _, port := range ports {
-		// Skip the port if serial number is not found
-		if !port.Prefs.ContainsKey("serialNumber") {
-			continue
-		}
-
-		// Search for a board with the same FQBN set in request
-		for _, board := range pm.IdentifyBoard(port.IdentificationPrefs) {
-			if board.FQBN() == req.Fqbn {
-				details.SerialNumber = port.Prefs.Get("serialNumber")
-				break
-			}
-		}
-	}
-
 	return details, nil
 }

commands/board/list.go

@@ -185,6 +185,7 @@ func List(instanceID int32) (r []*rpc.DetectedPort, e error) {
 			Protocol:      port.Protocol,
 			ProtocolLabel: port.ProtocolLabel,
 			Boards:        boards,
+			SerialNumber:  port.Prefs.Get("serialNumber"),
 		}
 		retVal = append(retVal, p)
 	}
@@ -222,13 +223,19 @@ func Watch(instanceID int32, interrupt <-chan bool) (<-chan *rpc.BoardListWatchR
 					}
 				}
 
+				serialNumber := ""
+				if props := event.Port.Properties; props != nil {
+					serialNumber = props.Get("serialNumber")
+				}
+
 				outChan <- &rpc.BoardListWatchResp{
 					EventType: event.Type,
 					Port: &rpc.DetectedPort{
 						Address:       event.Port.Address,
 						Protocol:      event.Port.Protocol,
 						ProtocolLabel: event.Port.ProtocolLabel,
 						Boards:        boards,
+						SerialNumber:  serialNumber,
 					},
 					Error: boardsError,
 				}

rpc/commands/board.pb.go

@@ -194,6 +194,8 @@ message DetectedPort {
     string protocol_label = 3;
     // The boards attached to the port.
     repeated BoardListItem boards = 4;
+    // Serial number of connected board
+    string serial_number = 5;
 }
 
 message BoardListAllReq {