Merge pull request #418 from ksiyuan/master

#404 REPL :stop command fails for overly long segments

client/repl/client.go

@@ -461,6 +461,18 @@ arguments will save the updated score to the same file.`,
 			},
 		},
 
+		"stopall": {
+			helpSummary: "Stops all player process.",
+			run: func(client *Client, argsString string) error {
+				_, err := client.sendRequest(map[string]interface{}{"op": "stopall"})
+				if err != nil {
+					return err
+				}
+
+				return nil
+			},
+		},
+
 		"version": {
 			helpSummary: "Displays the version numbers of the Alda server and client.",
 			run: func(client *Client, argsString string) error {

client/repl/player_management.go

@@ -84,7 +84,7 @@ func (server *Server) withTransmitter(
 // For practical purposes, if Port is 0, then we can be reasonably certain that
 // the server doesn't have a player to talk to.
 func (server *Server) hasPlayer() bool {
-	return server.player.Port != 0
+	return server.player != system.PlayerState{}
 }
 
 // The `managePlayers` loop regularly checks to see if the player process that
@@ -142,7 +142,9 @@ func (server *Server) managePlayers() {
 			// TODO: Maybe UserFacingErrors could have an optional error code that we
 			// can depend on here?
 			if err == nil {
-				server.player = updatedState
+				if updatedState.Port != 0{
+					server.player = updatedState
+				}
 			} else if strings.HasPrefix(err.Error(), "No player was found") {
 				// If the state information tells us that the player process no longer
 				// exists, then we forget about that player process and a new one will be
@@ -162,7 +164,9 @@ func (server *Server) managePlayers() {
 				log.Warn().Err(err).Msg("No player processes available.")
 			} else {
 				log.Info().Interface("player", player).Msg("Found player process.")
-				server.player = player
+				if player.Port != 0{
+					server.player = player
+				}
 			}
 		}
 

client/repl/server.go

@@ -513,6 +513,28 @@ var ops = map[string]func(*Server, nREPLRequest){
 		server.respondDone(req, map[string]interface{}{"text": server.input})
 	},
 
+	"stopall": func(server *Server, req nREPLRequest) {
+		players := []system.PlayerState{}
+		knownPlayers, _ := system.ReadPlayerStates()
+		players = append(players, knownPlayers...)
+
+		for _, player := range players {
+			transmitter := transmitter.OSCTransmitter{Port: player.Port}
+			if err := transmitter.TransmitStopMessage(); err != nil {
+				log.Warn().
+					Interface("player", player).
+					Err(err).
+					Msg("Failed to send \"stop\" message to player process.")
+			} else {
+				log.Info().
+					Interface("player", player).
+					Msg("Sent \"stop\" message to player process.")
+			}
+		}
+
+		server.respondDone(req, nil)
+	},
+
 	"stop": func(server *Server, req nREPLRequest) {
 		if err := server.withTransmitter(
 			func(transmitter transmitter.OSCTransmitter) error {

client/system/process_management.go

@@ -173,11 +173,12 @@ func ReadPlayerStates() ([]PlayerState, error) {
 	}
 
 	states := []PlayerState{}
+	var state PlayerState
 
 	if err := processFiles(
 		CachePath("state", "players", generated.ClientVersion),
 		func(filename string, contents []byte, readError error) {
-			var state PlayerState
+
 
 			if readError == nil {
 				err := json.Unmarshal(contents, &state)
@@ -195,6 +196,10 @@ func ReadPlayerStates() ([]PlayerState, error) {
 		return nil, err
 	}
 
+	if state.ReadError != nil{
+		return nil, state.ReadError
+	}
+
 	return states, nil
 }