cleanup and optimizations

Author: umbynos

dummy-monitor/main.go

@@ -101,21 +101,3 @@ func (d *dummyMonitor) Close() error {
 // In a real implementation it can be used to tear down resources
 // used to monitor Ports.
 func (d *dummyMonitor) Quit() {}
-
-var dummyCounter = 0
-
-// createDummyPort creates a Port with fake data
-func createDummyPort() *monitor.Port {
-	dummyCounter++
-	return &monitor.Port{
-		Address:       fmt.Sprintf("%d", dummyCounter),
-		AddressLabel:  "Dummy upload port",
-		Protocol:      "dummy",
-		ProtocolLabel: "Dummy protocol",
-		Properties: properties.NewFromHashmap(map[string]string{
-			"vid": "0x2341",
-			"pid": "0x0041",
-			"mac": fmt.Sprintf("%d", dummyCounter*384782),
-		}),
-	}
-}

monitor.go

@@ -169,13 +169,12 @@ func (d *Server) hello(cmd string) {
 
 func (d *Server) describe() {
 	if !d.initialized {
-		d.outputChan <- messageError("describe", "Monitor not STARTed")
+		d.outputChan <- messageError("describe", "Monitor not initialized")
 		return
 	}
-	var portDescription *PortDescriptor
 	portDescription, err := d.impl.Describe()
 	if err != nil {
-		d.outputChan <- messageError("hello", err.Error())
+		d.outputChan <- messageError("describe", err.Error())
 		return
 	}
 	d.outputChan <- &message{
@@ -187,10 +186,10 @@ func (d *Server) describe() {
 
 func (d *Server) configure(cmd string) {
 	if !d.initialized {
-		d.outputChan <- messageError("configure", "Monitor not STARTed")
+		d.outputChan <- messageError("configure", "Monitor not initialized")
 		return
 	}
-	re := regexp.MustCompile(`^(\w+) (\w+)$`)
+	re := regexp.MustCompile(`^([\w.-]+) (.+)$`)
 	matches := re.FindStringSubmatch(cmd)
 	if len(matches) != 3 {
 		d.outputChan <- messageError("configure", "Invalid CONFIGURE command")
@@ -216,8 +215,6 @@ func (d *Server) close() {
 
 }
 
-func (d *Server) errorEvent(msg string) {
-	d.outputChan <- messageError("start_sync", msg)
 }
 
 func (d *Server) outputProcessor(outWriter io.Writer) {