WIP: agent reports vid/pid instead of name lookup

Author: facchinm

Diff for: serial.go

@@ -101,6 +101,8 @@ type SpPortItem struct {
 	BufferAlgorithm string
 	Ver             string
 	NetworkPort     bool
+	VendorID        string
+	ProductID       string
 }
 
 // SerialPorts contains the ports attached to the machine
@@ -526,6 +528,8 @@ func spListDual(network bool) {
 			BufferAlgorithm: "",
 			Ver:             version,
 			NetworkPort:     item.NetworkPort,
+			VendorID:        item.IdVendor,
+			ProductID:       item.IdProduct,
 		}
 
 		// figure out if port is open

Diff for: seriallist.go

@@ -59,7 +59,7 @@ func GetList(network bool) ([]OsSerialPort, error) {
 			arrPorts = newarrPorts
 		}
 
-		arrPorts = removeNonArduinoBoards(arrPorts)
+		arrPorts = associateVidPidWithPort(arrPorts)
 		return arrPorts, err
 		//log.Printf("Done doing GetList(). arrPorts:%v\n", arrPorts)
 	}

Diff for: seriallist_darwin.go

@@ -11,6 +11,7 @@ import (
 	//"syscall"
 	//"fmt"
 	//"bufio"
+	"fmt"
 	"io/ioutil"
 	"os/exec"
 )
@@ -23,52 +24,50 @@ import (
 // search all board.txt files for map[Product ID]
 // assign it to name
 
-func removeNonArduinoBoards(ports []OsSerialPort) []OsSerialPort {
-	usbcmd := exec.Command("system_profiler", "SPUSBDataType")
-	grepcmd := exec.Command("grep", "0x2341", "-A5", "-B1")
+func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 
-	cmdOutput, _ := pipe_commands(usbcmd, grepcmd)
+	// prefilter ports
+	ports = Filter(ports, func(port OsSerialPort) bool {
+		return !strings.Contains(port.Name, "Blue") && !strings.Contains(port.Name, "/cu")
+	})
 
-	//log.Println(string(cmdOutput))
-	cmdOutSlice := strings.Split(string(cmdOutput), "\n")
+	for index, _ := range ports {
+		port_hash := strings.Trim(ports[index].Name, "/dev/tty.usbmodem")
 
-	// how many lines is the output? boards attached = lines/8
-	for i := 0; i < len(cmdOutSlice)/8; i++ {
+		usbcmd := exec.Command("system_profiler", "SPUSBDataType")
+		grepcmd := exec.Command("grep", "Location ID: 0x"+port_hash[:len(port_hash)-1], "-B6")
+		cmdOutput, _ := pipe_commands(usbcmd, grepcmd)
 
-		cmdOutSliceN := cmdOutSlice[i*8 : (i+1)*8]
+		if len(cmdOutput) == 0 {
+			usbcmd = exec.Command("system_profiler", "SPUSBDataType")
+			grepcmd = exec.Command("grep" /*"Serial Number: "+*/, strings.Trim(port_hash, "0"), "-B3", "-A3")
+			cmdOutput, _ = pipe_commands(usbcmd, grepcmd)
 
-		cmdOutMap := make(map[string]string)
+			fmt.Println(string(cmdOutput))
+		}
 
-		for _, element := range cmdOutSliceN {
-			if strings.Contains(element, "ID") {
-				element = strings.TrimSpace(element)
-				arr := strings.Split(element, ": ")
-				cmdOutMap[arr[0]] = arr[1]
-			}
+		if len(cmdOutput) == 0 {
+			//give up
+			continue
 		}
 
-		archBoardName, boardName, _ := getBoardName(cmdOutMap["Product ID"])
+		cmdOutSlice := strings.Split(string(cmdOutput), "\n")
 
-		// remove initial 0x and final zeros
-		ttyHeader := strings.Trim((cmdOutMap["Location ID"]), "0x")
-		ttyHeader = strings.Split(ttyHeader, " ")[0]
-		ttyHeader = strings.Trim(ttyHeader, "0")
+		fmt.Println(cmdOutSlice)
 
-		for _, port := range ports {
-			if strings.Contains(port.Name, ttyHeader) {
-				if !strings.Contains(port.Name, "/cu") {
-					port.RelatedNames = append(port.RelatedNames, archBoardName)
-					port.FriendlyName = strings.Trim(boardName, "\n")
-				}
+		cmdOutMap := make(map[string]string)
+
+		for _, element := range cmdOutSlice {
+			if strings.Contains(element, "ID") || strings.Contains(element, "Manufacturer") {
+				element = strings.TrimSpace(element)
+				arr := strings.Split(element, ": ")
+				cmdOutMap[arr[0]] = arr[1]
 			}
 		}
+		ports[index].IdProduct = strings.Split(cmdOutMap["Product ID"], " ")[0]
+		ports[index].IdVendor = strings.Split(cmdOutMap["Vendor ID"], " ")[0]
+		ports[index].Manufacturer = cmdOutMap["Manufacturer"]
 	}
-
-	// additional remove phase
-	ports = Filter(ports, func(port OsSerialPort) bool {
-		return !strings.Contains(port.Name, "Blue") && !strings.Contains(port.Name, "/cu")
-	})
-
 	return ports
 }
 

Diff for: seriallist_linux.go

@@ -1,17 +1,16 @@
 package main
 
 import (
-	//"fmt"
+	"fmt"
 	//"github.com/tarm/goserial"
 	//"log"
 	"os"
 	"os/exec"
 	"strings"
 	//"encoding/binary"
-	//"strconv"
+	"strconv"
 	//"syscall"
 	//"fmt"
-	//"io"
 	"bytes"
 	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
@@ -20,48 +19,28 @@ import (
 	"sort"
 )
 
-func removeNonArduinoBoards(ports []OsSerialPort) []OsSerialPort {
-	usbcmd := exec.Command("lsusb", "-vvv")
-	grepcmd := exec.Command("grep", "0x2341", "-A1")
-	grep2cmd := exec.Command("grep", "idProduct")
-	//awkcmd := exec.Command("awk", "\'{print $2}\'")
-	//awkcmd := exec.Command("grep", "-E", "-o", "'0x[[:alnum:]]{4}'")
-
-	cmdOutput, _ := pipe_commands(usbcmd, grepcmd, grep2cmd)
-
-	cmdOutSliceT := strings.Split(string(cmdOutput), "\n")
+func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 
-	re := regexp.MustCompile("0x[[:alnum:]]{4}")
-
-	var cmdOutSlice []string
-
-	for _, element := range cmdOutSliceT {
-		cmdOutSlice = append(cmdOutSlice, re.FindString(element))
-	}
+	for index, _ := range ports {
+		ueventcmd := exec.Command("cat", "/sys/class/tty/"+filepath.Base(ports[index].Name)+"/device/uevent")
+		grep3cmd := exec.Command("grep", "PRODUCT=")
 
-	for _, element := range cmdOutSlice {
+		cmdOutput2, _ := pipe_commands(ueventcmd, grep3cmd)
+		cmdOutput2S := string(cmdOutput2)
 
-		if element == "" {
-			break
+		if len(cmdOutput2S) == 0 {
+			continue
 		}
 
-		archBoardName, boardName, _ := getBoardName(element)
-
-		for _, port := range ports {
-			ueventcmd := exec.Command("cat", "/sys/class/tty/"+filepath.Base(port.Name)+"/device/uevent")
-			grep3cmd := exec.Command("grep", "PRODUCT=")
-			cutcmd := exec.Command("cut", "-f2", "-d/")
+		infos := strings.Split(cmdOutput2S, "=")
 
-			cmdOutput2, _ := pipe_commands(ueventcmd, grep3cmd, cutcmd)
-			cmdOutput2S := string(cmdOutput2)
+		vid_pid := strings.Split(infos[1], "/")
 
-			if strings.Contains(element, strings.Trim(cmdOutput2S, "\n")) && cmdOutput2S != "" {
-				port.RelatedNames = append(port.RelatedNames, archBoardName)
-				port.FriendlyName = strings.Trim(boardName, "\n")
-			}
-		}
+		vid, _ := strconv.ParseInt(vid_pid[0], 16, 32)
+		pid, _ := strconv.ParseInt(vid_pid[1], 16, 32)
+		ports[index].IdVendor = fmt.Sprintf("0x%04x", vid)
+		ports[index].IdProduct = fmt.Sprintf("0x%04x", pid)
 	}
-
 	return ports
 }
 

Diff for: seriallist_windows.go

@@ -22,7 +22,7 @@ var (
 	serialListWindowsWg sync.WaitGroup
 )
 
-func removeNonArduinoBoards(ports []OsSerialPort) []OsSerialPort {
+func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 	ports, _ = getList()
 	return ports
 }
@@ -206,13 +206,8 @@ func getListViaWmiPnpEntity() ([]OsSerialPort, os.SyscallError) {
 			}
 		}
 
-		if list[i].IdVendor != "2341" {
-			list[i].FriendlyName = asString.ToString()
-		} else {
-			archBoardName, boardName, _ := getBoardName("0x" + list[i].IdProduct)
-			list[i].RelatedNames = append(list[i].RelatedNames, archBoardName)
-			list[i].FriendlyName = strings.Trim(boardName, "\n")
-		}
+		list[i].IdVendor = "0x" + list[i].IdVendor
+		list[i].IdProduct = "0x" + list[i].IdProduct
 
 		manufStr, _ := oleutil.GetProperty(item, "Manufacturer")
 		list[i].Manufacturer = manufStr.ToString()