move network code from uis to net

logic: add NewPlayer function

5 files changed, 11 insertions, 6 deletions

diff --git a/goffel.go b/goffel.go
index 3ee90e0..a6efeb7 100644
--- a/goffel.go
+++ b/goffel.go
@@ -7,6 +7,7 @@ import (
 
 	"muhq.space/go/muhq/goffel/logic"
 	"muhq.space/go/muhq/goffel/uis"
+	"muhq.space/go/muhq/goffel/net"
 )
 
 var (
@@ -30,10 +31,10 @@ func main() {
 	logic.SetFancyPrint(fancy)
 
 	if server {
-		s := uis.NewServer(port, greeting)
+		s := net.NewServer(port, greeting)
 		s.Serve()
 	} else if client {
-		c := uis.Client{Port: port}
+		c := net.Client{Port: port}
 		c.Run()
 	} else {
 		i := uis.Interactive{}
diff --git a/logic/player.go b/logic/player.go
index 31aa5d0..0642495 100644
--- a/logic/player.go
+++ b/logic/player.go
@@ -7,3 +7,7 @@ type Player struct {
 	Name string
 	Score Score
 }
+
+func NewPlayer(name string) Player {
+	return Player{name, NewScore()}
+}
diff --git a/uis/client.go b/net/client.go
index beca3a6..dae0fa1 100644
--- a/uis/client.go
+++ b/net/client.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Florian Fischer. All rights reserved.
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package uis
+package net
 
 type Client struct {
 	Port string
diff --git a/uis/server.go b/net/server.go
index 220699c..3c65b20 100644
--- a/uis/server.go
+++ b/net/server.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Florian Fischer. All rights reserved.
 // Use of this source code is governed by a MIT license found in the LICENSE file.
 
-package uis
+package net
 
 import (
 	"bufio"
@@ -423,7 +423,7 @@ func (s *Server) Serve() error {
 				helo.Players = line[1:]
 			}
 			for _, name := range helo.Players {
-				c.players = append(c.players, player{logic.Player{name, logic.NewScore()}, &c})
+				c.players = append(c.players, player{logic.NewPlayer(name), &c})
 			}
 			c.results = make(chan sMsg, len(c.players))
 
diff --git a/uis/interactive.go b/uis/interactive.go
index 8210122..5e7994e 100644
--- a/uis/interactive.go
+++ b/uis/interactive.go
@@ -36,7 +36,7 @@ func (i *Interactive) init() {
 		if err != nil {
 			break
 		}
-		i.players = append(i.players, Player{name, NewScore()})
+		i.players = append(i.players, NewPlayer(name))
 		count++
 
 	}