mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify - remove duplicate command types in favor of a better defined Command type in proto

Browse source
This commit is contained in:
Marc Di Luzio 2020-07-10 00:12:54 +01:00
parent 7d780d05bd
commit 96a137ad2f
9 changed files with 370 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

47
cmd/rove-server/internal/routes.go
View file

@ -79,18 +79,36 @@ func (s *Server) Status(ctx context.Context, req *rove.StatusRequest) (response
i, q := s.world.RoverCommands(resp)
var incoming, queued []*rove.Command
for _, i := range i {
incoming = append(incoming, &rove.Command{
c := &rove.Command{
Command: i.Command,
Bearing: i.Bearing,
Message: i.Message,
})
}
switch i.Command {
case rove.CommandType_move:
c.Data = &rove.Command_Bearing{
Bearing: i.Bearing,
}
case rove.CommandType_broadcast:
c.Data = &rove.Command_Message{
Message: i.Message,
}
}
incoming = append(incoming, c)
}
for _, q := range q {
queued = append(queued, &rove.Command{
c := &rove.Command{
Command: q.Command,
Bearing: q.Bearing,
Message: q.Message,
})
}
switch q.Command {
case rove.CommandType_move:
c.Data = &rove.Command_Bearing{
Bearing: q.Bearing,
}
case rove.CommandType_broadcast:
c.Data = &rove.Command_Message{
Message: q.Message,
}
}
queued = append(queued, c)
}
var logs []*rove.Log
for _, log := range rover.Logs {
@ -171,9 +189,16 @@ func (s *Server) Command(ctx context.Context, req *rove.CommandRequest) (*rove.C
var cmds []game.Command
for _, c := range req.Commands {
cmds = append(cmds, game.Command{
Bearing: c.Bearing,
Command: c.Command})
n := game.Command{
Command: c.Command,
}
switch c.Command {
case rove.CommandType_move:
n.Bearing = c.GetBearing()
case rove.CommandType_broadcast:
n.Message = c.GetMessage()
}
cmds = append(cmds, n)
}
if err := s.world.Enqueue(resp, cmds...); err != nil {

11
cmd/rove/main.go
View file

@ -12,7 +12,6 @@ import (
"github.com/mdiluz/rove/pkg/atlas"
"github.com/mdiluz/rove/pkg/bearing"
"github.com/mdiluz/rove/pkg/game"
"github.com/mdiluz/rove/pkg/objects"
"github.com/mdiluz/rove/pkg/rove"
"github.com/mdiluz/rove/pkg/version"
@ -222,8 +221,8 @@ func InnerMain(command string, args ...string) error {
}
commands = append(commands,
&rove.Command{
Command: game.CommandMove,
Bearing: args[i],
Command: rove.CommandType_move,
Data: &rove.Command_Bearing{Bearing: args[i]},
},
)
case "broadcast":
@ -235,15 +234,15 @@ func InnerMain(command string, args ...string) error {
}
commands = append(commands,
&rove.Command{
Command: game.CommandBroadcast,
Message: []byte(args[i]),
Command: rove.CommandType_broadcast,
Data: &rove.Command_Message{Message: []byte(args[i])},
},
)
default:
// By default just use the command literally
commands = append(commands,
&rove.Command{
Command: args[i],
Command: rove.CommandType(rove.CommandType_value[args[i]]),
},
)
}