Fix inspection issues

g3force · g3force · commit 30b15222ec5d · 2021-11-05T19:07:24.000+01:00
diff --git a/cmd/ssl-auto-ref-client/main.go b/cmd/ssl-auto-ref-client/main.go
@@ -210,8 +210,8 @@ func (c *Client) sendRequest(request *rcon.AutoRefToController, doLog bool) {
 	}
 
 	logIf(doLog, "Waiting for reply...")
-	reply := rcon.ControllerToAutoRef{}
-	if err := sslconn.ReceiveMessage(c.reader, &reply); err != nil {
+	reply := &rcon.ControllerToAutoRef{}
+	if err := sslconn.ReceiveMessage(c.reader, reply); err != nil {
 		log.Fatal("Failed receiving controller reply: ", err)
 	}
 	logIf(doLog, "Received reply: ", reply)
diff --git a/cmd/ssl-ref-client/main.go b/cmd/ssl-ref-client/main.go
@@ -17,13 +17,15 @@ import (
 
 var refereeAddress = flag.String("address", "224.5.23.1:10003", "The multicast address of ssl-game-controller")
 var fullScreen = flag.Bool("fullScreen", false, "Print the formatted message to the console, clearing the screen during print")
+var verbose = flag.Bool("verbose", false, "Verbose output")
 
 var history []state.Referee_Command
 
 func main() {
 	flag.Parse()
 
 	server := sslnet.NewMulticastServer(consume)
+	server.Verbose = *verbose
 	server.Start(*refereeAddress)
 
 	signals := make(chan os.Signal, 1)
diff --git a/internal/app/config/config.go b/internal/app/config/config.go
@@ -254,7 +254,7 @@ func DefaultControllerConfig() (c Controller) {
 	return
 }
 
-// loadConfig loads the controller config
+// LoadConfig loads the controller config
 func LoadConfig(configFileName string) Controller {
 	cfg, err := LoadControllerConfig(configFileName)
 	if err != nil {
diff --git a/internal/app/config/division.go b/internal/app/config/division.go
@@ -7,7 +7,7 @@ const (
 	DivB Division = "DIV_B"
 )
 
-// Division contain all known command enum constants
+// Divisions contain all known command enum constants
 var Divisions = []Division{DivA, DivB}
 
 // Valid checks if the Division enum value is among the known values
diff --git a/internal/app/engine/proposals.go b/internal/app/engine/proposals.go
@@ -26,7 +26,7 @@ func (e *Engine) EnqueueGameEvent(gameEvent *state.GameEvent) {
 
 	switch autoRefBehavior {
 	case AutoRefConfig_BEHAVIOR_IGNORE:
-		log.Printf("Ignoring game event from autoRef: %v", *gameEvent)
+		log.Printf("Ignoring game event from autoRef: %v", gameEvent)
 	case AutoRefConfig_BEHAVIOR_LOG:
 		e.Enqueue(&statemachine.Change{
 			Origin: &changeOriginEngine,
diff --git a/internal/app/geom/geometry.go b/internal/app/geom/geometry.go
@@ -16,46 +16,46 @@ func NewVector2Float32(x, y float32) *Vector2 {
 }
 
 // Length returns the length of this vector
-func (m *Vector2) Length() float64 {
-	x := *m.X
-	y := *m.Y
-	return math.Sqrt(float64(x*x + y*y))
+func (x *Vector2) Length() float64 {
+	vx := *x.X
+	vy := *x.Y
+	return math.Sqrt(float64(vx*vx + vy*vy))
 }
 
 // Sub subtracts the given vector from this one
-func (m *Vector2) Sub(o *Vector2) *Vector2 {
-	return NewVector2Float32(*m.X-*o.X, *m.Y-*o.Y)
+func (x *Vector2) Sub(o *Vector2) *Vector2 {
+	return NewVector2Float32(*x.X-*o.X, *x.Y-*o.Y)
 }
 
 // DistanceTo returns the distance between this vector and the given one
-func (m *Vector2) DistanceTo(o *Vector2) float64 {
-	return m.Sub(o).Length()
+func (x *Vector2) DistanceTo(o *Vector2) float64 {
+	return x.Sub(o).Length()
 }
 
 // X64 returns the x value as float64
-func (m *Vector2) X64() float64 {
-	return float64(*m.X)
+func (x *Vector2) X64() float64 {
+	return float64(*x.X)
 }
 
 // Y64 returns the y value as float64
-func (m *Vector2) Y64() float64 {
-	return float64(*m.Y)
+func (x *Vector2) Y64() float64 {
+	return float64(*x.Y)
 }
 
 // ToVector2 converts this vector into a new 2d vector, dropping the z part
-func (m *Vector3) ToVector2() *Vector2 {
-	return NewVector2Float32(*m.X, *m.Y)
+func (x *Vector3) ToVector2() *Vector2 {
+	return NewVector2Float32(*x.X, *x.Y)
 }
 
 // StringPretty converts the vector into a pretty printed string
-func (m *Vector2) StringPretty() string {
-	x := float32(0)
-	y := float32(0)
-	if m.X != nil {
-		x = *m.X
+func (x *Vector2) StringPretty() string {
+	vx := float32(0)
+	vy := float32(0)
+	if x.X != nil {
+		vx = *x.X
 	}
-	if m.Y != nil {
-		y = *m.Y
+	if x.Y != nil {
+		vy = *x.Y
 	}
-	return fmt.Sprintf("x: %v, y: %v", x, y)
+	return fmt.Sprintf("x: %v, y: %v", vx, vy)
 }
diff --git a/internal/app/geom/rectangle.go b/internal/app/geom/rectangle.go
@@ -43,17 +43,17 @@ func (r *Rectangle) MaxX() float64 {
 	return r.center.X64() + r.xExtent/2.0
 }
 
-// MaxX returns the smallest x value
+// MinX returns the smallest x value
 func (r *Rectangle) MinX() float64 {
 	return r.center.X64() - r.xExtent/2.0
 }
 
-// MaxX returns the largest y value
+// MaxY returns the largest y value
 func (r *Rectangle) MaxY() float64 {
 	return r.center.Y64() + r.yExtent/2.0
 }
 
-// MaxX returns the smallest y value
+// MinY returns the smallest y value
 func (r *Rectangle) MinY() float64 {
 	return r.center.Y64() - r.yExtent/2.0
 }
diff --git a/internal/app/state/command.go b/internal/app/state/command.go
@@ -13,8 +13,8 @@ func NewCommandNeutral(t Command_Type) (c *Command) {
 }
 
 // NeedsTeam returns true if the command must be specialized with a team
-func (m Command) NeedsTeam() bool {
-	switch *m.Type {
+func (x *Command) NeedsTeam() bool {
+	switch *x.Type {
 	case Command_UNKNOWN,
 		Command_HALT,
 		Command_STOP,
@@ -29,14 +29,14 @@ func (m Command) NeedsTeam() bool {
 		Command_BALL_PLACEMENT:
 		return true
 	default:
-		log.Fatal("Missing case for command ", m)
+		log.Fatal("Missing case for command ", x)
 		return false
 	}
 }
 
 // IsRunning returns true, if the current commands indicates that the game is running (the ball is in play)
-func (m Command) IsRunning() bool {
-	switch *m.Type {
+func (x *Command) IsRunning() bool {
+	switch *x.Type {
 	case Command_DIRECT,
 		Command_INDIRECT,
 		Command_NORMAL_START,
@@ -47,8 +47,8 @@ func (m Command) IsRunning() bool {
 }
 
 // IsPrepare returns true, if the current command is a prepare command
-func (m Command) IsPrepare() bool {
-	switch *m.Type {
+func (x *Command) IsPrepare() bool {
+	switch *x.Type {
 	case Command_PENALTY,
 		Command_KICKOFF:
 		return true
diff --git a/internal/app/state/gameevent.go b/internal/app/state/gameevent.go
@@ -5,11 +5,11 @@ import (
 )
 
 // ByTeam extracts the `ByTeam` attribute from the game event details, if present
-func (m GameEvent) ByTeam() Team {
-	if m.GetEvent() == nil {
+func (x *GameEvent) ByTeam() Team {
+	if x.GetEvent() == nil {
 		return Team_UNKNOWN
 	}
-	event := reflect.ValueOf(m.GetEvent())
+	event := reflect.ValueOf(x.GetEvent())
 	if event.Elem().NumField() == 0 {
 		return Team_UNKNOWN
 	}
@@ -25,11 +25,11 @@ func (m GameEvent) ByTeam() Team {
 }
 
 // SetByTeam sets the value of the `ByTeam` attribute to the given value, if present and not nil
-func (m GameEvent) SetByTeam(team Team) {
-	if m.GetEvent() == nil {
+func (x *GameEvent) SetByTeam(team Team) {
+	if x.GetEvent() == nil {
 		return
 	}
-	event := reflect.ValueOf(m.GetEvent())
+	event := reflect.ValueOf(x.GetEvent())
 	if event.Elem().NumField() == 0 {
 		return
 	}
diff --git a/internal/app/state/gameevent_test.go b/internal/app/state/gameevent_test.go
@@ -36,8 +36,8 @@ func TestGameEvent_ByTeam(t *testing.T) {
 		},
 		{
 			name: "Event without ByTeam",
-			event: &GameEvent_Prepared_{
-				Prepared: &GameEvent_Prepared{},
+			event: &GameEvent_NoProgressInGame_{
+				NoProgressInGame: &GameEvent_NoProgressInGame{},
 			},
 			want: Team_UNKNOWN,
 		},
@@ -86,8 +86,8 @@ func TestGameEvent_SetByTeam(t *testing.T) {
 		},
 		{
 			name: "Event without ByTeam",
-			event: &GameEvent_Prepared_{
-				Prepared: &GameEvent_Prepared{},
+			event: &GameEvent_NoProgressInGame_{
+				NoProgressInGame: &GameEvent_NoProgressInGame{},
 			},
 			want: Team_UNKNOWN,
 		},
diff --git a/internal/app/state/state.go b/internal/app/state/state.go
@@ -35,29 +35,29 @@ func NewState() (s *State) {
 	return
 }
 
-func (m *State) Clone() *State {
+func (x *State) Clone() *State {
 	s := new(State)
-	proto.Merge(s, m)
+	proto.Merge(s, x)
 	return s
 }
 
 // TeamInfo returns the team info for the given team
-func (m *State) TeamInfo(team Team) *TeamInfo {
-	return m.TeamState[team.String()]
+func (x *State) TeamInfo(team Team) *TeamInfo {
+	return x.TeamState[team.String()]
 }
 
 // TeamByName returns the team for the given team name
-func (m *State) TeamByName(name string) Team {
-	for teamColor, teamInfo := range m.TeamState {
+func (x *State) TeamByName(name string) Team {
+	for teamColor, teamInfo := range x.TeamState {
 		if *teamInfo.Name == name {
 			return Team(Team_value[teamColor])
 		}
 	}
 	return Team_UNKNOWN
 }
 
-func (m *State) StringJson() string {
-	if b, err := protojson.Marshal(m); err != nil {
+func (x *State) StringJson() string {
+	if b, err := protojson.Marshal(x); err != nil {
 		return err.Error()
 	} else {
 		return string(b)
diff --git a/internal/app/statemachine/change.go b/internal/app/statemachine/change.go
@@ -4,8 +4,8 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
-func (m *Change) StringJson() string {
-	if b, err := protojson.Marshal(m); err != nil {
+func (x *Change) StringJson() string {
+	if b, err := protojson.Marshal(x); err != nil {
 		return err.Error()
 	} else {
 		return string(b)
diff --git a/internal/app/statemachine/change_ballplacement.go b/internal/app/statemachine/change_ballplacement.go
@@ -14,7 +14,7 @@ func (s *StateMachine) processChangeStartBallPlacement(newState *state.State) (c
 	}
 
 	if *newState.NextCommand.Type == state.Command_PENALTY || *newState.NextCommand.Type == state.Command_KICKOFF {
-		log.Printf("Human ref places the ball for %v", *newState.NextCommand)
+		log.Printf("Human ref places the ball for %v", newState.NextCommand)
 		changes = append(changes, s.createCommandChange(state.NewCommandNeutral(state.Command_HALT)))
 	}
 
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -25,7 +25,12 @@ func DetectHost(address string) string {
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer conn.Close()
+	defer func(conn *net.UDPConn) {
+		err := conn.Close()
+		if err != nil {
+			log.Print("Failed to close connection: ", err)
+		}
+	}(conn)
 	_, udpAddr, err := conn.ReadFromUDP([]byte{0})
 	if err != nil {
 		log.Fatal(err)
diff --git a/pkg/timer/provider.go b/pkg/timer/provider.go
@@ -6,34 +6,10 @@ import "time"
 // This is usually the system time, but can be something else for unit tests.
 type TimeProvider func() time.Time
 
-// SysTimeProvider is the default system time provider
-var SysTimeProvider = func() time.Time { return time.Now() }
-
 // SleepConsumer sleeps the given amount of time.
 // This is usually the time.Sleep method, but can be something else for unit tests.
 type SleepConsumer func(time.Duration)
 
-// SysSleepConsumer is the default system sleep consumer
-var SysSleepConsumer = func(d time.Duration) { time.Sleep(d) }
-
-// NewFixedTimeProviderFromNanoSeconds creates a time provider from long nano seconds that always returns a fixed time
-func NewFixedTimeProviderFromNanoSeconds(timestamp int64) TimeProvider {
-	sec := int64(timestamp / 1e9)
-	nSec := timestamp - sec*1e9
-	return func() time.Time {
-		return time.Unix(sec, nSec)
-	}
-}
-
-// NewFixedTimeProviderFromSeconds creates a time provider from floating point seconds that always returns a fixed time
-func NewFixedTimeProviderFromSeconds(timestamp float64) TimeProvider {
-	sec := int64(timestamp)
-	nSec := int64((timestamp - float64(sec)) * 1e9)
-	return func() time.Time {
-		return time.Unix(sec, nSec)
-	}
-}
-
 func TimestampToTime(timestamp float64) time.Time {
 	sec := int64(timestamp)
 	nSec := int64((timestamp - float64(sec)) * 1e9)
diff --git a/src/components/Field.vue b/src/components/Field.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <iframe :src="visionClientAddress"
-                frameborder="none"
+                title="vision-client"
                 v-if="showVisionClient"
                 class="vision-client">
         </iframe>

Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,8 @@ func (c Client) sendRequest(request rcon.AutoRefToController, doLog bool) {`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`logIf(doLog, "Waiting for reply...")`
`213`		`- reply := rcon.ControllerToAutoRef{}`
`214`		`- if err := sslconn.ReceiveMessage(c.reader, &reply); err != nil {`
	`213`	`+ reply := &rcon.ControllerToAutoRef{}`
	`214`	`+ if err := sslconn.ReceiveMessage(c.reader, reply); err != nil {`
`215`	`215`	`log.Fatal("Failed receiving controller reply: ", err)`
`216`	`216`	`}`
`217`	`217`	`logIf(doLog, "Received reply: ", reply)`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func DefaultControllerConfig() (c Controller) {`
`254`	`254`	`return`
`255`	`255`	`}`
`256`	`256`
`257`		`-// loadConfig loads the controller config`
	`257`	`+// LoadConfig loads the controller config`
`258`	`258`	`func LoadConfig(configFileName string) Controller {`
`259`	`259`	`cfg, err := LoadControllerConfig(configFileName)`
`260`	`260`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ const (`
`7`	`7`	`DivB Division = "DIV_B"`
`8`	`8`	`)`
`9`	`9`
`10`		`-// Division contain all known command enum constants`
	`10`	`+// Divisions contain all known command enum constants`
`11`	`11`	`var Divisions = []Division{DivA, DivB}`
`12`	`12`
`13`	`13`	`// Valid checks if the Division enum value is among the known values`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,17 @@ func (r *Rectangle) MaxX() float64 {`
`43`	`43`	`return r.center.X64() + r.xExtent/2.0`
`44`	`44`	`}`
`45`	`45`
`46`		`-// MaxX returns the smallest x value`
	`46`	`+// MinX returns the smallest x value`
`47`	`47`	`func (r *Rectangle) MinX() float64 {`
`48`	`48`	`return r.center.X64() - r.xExtent/2.0`
`49`	`49`	`}`
`50`	`50`
`51`		`-// MaxX returns the largest y value`
	`51`	`+// MaxY returns the largest y value`
`52`	`52`	`func (r *Rectangle) MaxY() float64 {`
`53`	`53`	`return r.center.Y64() + r.yExtent/2.0`
`54`	`54`	`}`
`55`	`55`
`56`		`-// MaxX returns the smallest y value`
	`56`	`+// MinY returns the smallest y value`
`57`	`57`	`func (r *Rectangle) MinY() float64 {`
`58`	`58`	`return r.center.Y64() - r.yExtent/2.0`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	// ByTeam extracts the `ByTeam` attribute from the game event details, if present
`8`		`-func (m GameEvent) ByTeam() Team {`
`9`		`- if m.GetEvent() == nil {`
	`8`	`+func (x *GameEvent) ByTeam() Team {`
	`9`	`+ if x.GetEvent() == nil {`
`10`	`10`	`return Team_UNKNOWN`
`11`	`11`	`}`
`12`		`- event := reflect.ValueOf(m.GetEvent())`
	`12`	`+ event := reflect.ValueOf(x.GetEvent())`
`13`	`13`	`if event.Elem().NumField() == 0 {`
`14`	`14`	`return Team_UNKNOWN`
`15`	`15`	`}`
`@@ -25,11 +25,11 @@ func (m GameEvent) ByTeam() Team {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	// SetByTeam sets the value of the `ByTeam` attribute to the given value, if present and not nil
`28`		`-func (m GameEvent) SetByTeam(team Team) {`
`29`		`- if m.GetEvent() == nil {`
	`28`	`+func (x *GameEvent) SetByTeam(team Team) {`
	`29`	`+ if x.GetEvent() == nil {`
`30`	`30`	`return`
`31`	`31`	`}`
`32`		`- event := reflect.ValueOf(m.GetEvent())`
	`32`	`+ event := reflect.ValueOf(x.GetEvent())`
`33`	`33`	`if event.Elem().NumField() == 0 {`
`34`	`34`	`return`
`35`	`35`	`}`