Builder clean

go/src/flowserver/chatroom.go

@@ -41,17 +41,6 @@ func (r *ChatRoom) ClientAdd(c *websocket.Conn, handle string) error {
 
 	r.clients = append(r.clients, &ChatClient{handle, c})
 
-	// Add event joined
-	//XXX: temp
-	/*{
-		dataMap := map[string]interface{}{
-			"handle": handle,
-			"type":   "join",
-			"time":   time.Now().UTC().Format(time.RFC3339),
-		}
-		r.Events = append(r.Events, dataMap)
-		r.broadcast(c, flowmsg.SendMessage{OP: "chatEvent", Data: dataMap})
-	}*/
 	r.broadcastClientList()
 
 	for _, ev := range r.Events {
@@ -76,15 +65,6 @@ func (r *ChatRoom) ClientRemove(c *websocket.Conn) {
 	}
 
 	r.broadcastClientList()
-	/*{
-		dataMap := map[string]interface{}{
-			"handle": cli.Handle,
-			"type":   "left",
-			"time":   time.Now().UTC().Format(time.RFC3339),
-		}
-		r.Events = append(r.Events, dataMap)
-		r.broadcast(c, flowmsg.SendMessage{OP: "chatEvent", Data: dataMap})
-	}*/
 }
 
 // ClientRename renames a client
@@ -99,7 +79,6 @@ func (r *ChatRoom) ClientRename(c *websocket.Conn, newHandle string) error {
 			break
 		}
 	}
-	log.Println("ClientRename from", cli.Handle, " to ", cli.Handle)
 	if cli == nil {
 		log.Println("Cli:Err")
 		return errors.New("Client not found")
@@ -110,7 +89,7 @@ func (r *ChatRoom) ClientRename(c *websocket.Conn, newHandle string) error {
 
 }
 
-// Event Message broad a cast a message to clients in session
+// Event Message broadcast a message to clients in session
 func (r *ChatRoom) Event(cl *websocket.Conn, v interface{}) error {
 	r.Lock()
 	defer r.Unlock()

go/src/flowserver/flowbuilder/builder.go

@@ -162,7 +162,6 @@ func (fb *FlowBuilder) addTriggersTo(node Node) error {
 				if !exec {
 					log.Println("Mismatching trigger, but its a test")
 				}
-
 				//op := opfb.flow.GetOp(t.To) // Repeating
 				go op.Process(name) // Background
 			},
@@ -176,132 +175,6 @@ func (fb *FlowBuilder) Flow() *flow.Flow {
 	return fb.flow
 }
 
-// FlowBuild build the graph based on an starting node
-/*func FlowBuild(rawData []byte, r *registry.R, startingID string) (*flow.Flow, error) {
-
-	var build func(ID string) (flow.Operation, error)
-	build = func(ID string) (flow.Operation, error) {
-		if _, ok := nodeTrack[ID]; ok {
-			return nil, ErrLoop //fmt.Errorf("[%v] Looping through nodes is disabled:", ID)
-		}
-		nodeTrack[ID] = true
-		defer delete(nodeTrack, ID)
-
-		// If flow already has ID just return
-		if op := f.GetOp(ID); op != nil {
-			log.Println("Return operation")
-			return op, nil
-		}
-
-		node := doc.fetchNodeByID(ID)
-		if node == nil {
-			return nil, fmt.Errorf("node not found [%v]", startingID)
-		}
-
-		var op flow.Operation
-
-		switch node.Src {
-		case "Input":
-			inputID, err := strconv.Atoi(node.Prop["input"])
-			if err != nil {
-				return nil, errors.New("Invalid inputID value, must be a number")
-			}
-			op, _ = f.In(inputID) // By id perhaps
-		case "Variable":
-			raw := node.Prop["init"]
-			val, err := parseValue(nil, raw)
-			if err != nil {
-				op, _ = f.DefErrOp(node.ID, err)
-			} else {
-				op = f.DefVar(node.ID, node.Label, val)
-			}
-		case "Const":
-			raw := node.Label
-			val, err := parseValue(nil, raw)
-			if err != nil {
-				op, _ = f.DefErrOp(node.ID, err)
-			} else {
-				op, _ = f.DefConst(node.ID, val)
-			}
-		default:
-			// Load entry
-			entry, err := r.Entry(node.Src)
-			if err != nil {
-				return nil, err
-			}
-			//// Process inputs ////
-			param := make([]flow.Data, len(entry.Inputs))
-			for i := range param {
-				l := doc.fetchLinkTo(node.ID, i)
-				if l == nil {
-					// Const value
-					v, err := parseValue(entry.Inputs[i], node.DefaultInputs[i])
-					if err != nil {
-						param[i], _ = f.ErrOp(err)
-						continue
-					}
-					param[i] = v
-					continue
-				}
-				inOp, err := build(l.From)
-				if err != nil {
-					return nil, err
-				}
-				param[i] = inOp
-			}
-			op, err = f.DefOp(node.ID, node.Src, param...)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		// Process triggers for this node
-		triggers := doc.fetchTriggerFrom(node.ID)
-		for _, t := range triggers {
-			_, err := build(t.To)
-			if err != nil {
-				return nil, err
-			}
-			// Register the thing here
-			f.Hook(flow.Hook{
-				Any: func(name string, ID string, triggerTime time.Time, extra ...interface{}) {
-					if name != "Error" && name != "Finish" {
-						return
-					}
-					if ID != t.From {
-						log.Printf("ID[%v] triggered [%v], I'm t.From: %v", ID, name, t.From)
-						return
-					}
-					exec := false
-					for _, o := range t.On {
-						if name == o {
-							exec = true
-							break
-						}
-					}
-					if !exec {
-						log.Println("Mismatching trigger, but its a test")
-					}
-
-					op := f.GetOp(t.To) // Repeating
-					go op.Process(name) // Background
-				},
-			})
-
-		}
-		return op, nil
-	}
-
-	_, err = build(startingID)
-	if err != nil {
-		log.Println("Error building")
-		return nil, err
-	}
-
-	log.Println("Flow:", f)
-	return f, nil
-}*/
-
 // Or give a string
 func parseValue(typ reflect.Type, raw string) (flow.Data, error) {
 	if typ == nil {