From 86ff8e6dd91ec6f38af0f9c36daeabcb62bd8d86 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Thu, 13 Feb 2020 20:16:10 +0100
Subject: [PATCH] first test

---
 Game.py                                       |   6 +++---
 __main__.py                                   |  19 ++++++++++++++++--
 __pycache__/InputHandler.cpython-38.pyc       | Bin 845 -> 847 bytes
 __pycache__/Solenoid.cpython-38.pyc           | Bin 868 -> 870 bytes
 __pycache__/__main__.cpython-38.pyc           | Bin 359 -> 1366 bytes
 __pycache__/config.cpython-38.pyc             | Bin 200 -> 379 bytes
 config.py                                     |   6 ++++++
 displays/__pycache__/Display.cpython-38.pyc   | Bin 612 -> 614 bytes
 factories/EventFactory.py                     |  14 ++++++++++++-
 factories/GameFactory.py                      |   4 +++-
 .../__pycache__/EventFactory.cpython-38.pyc   | Bin 2675 -> 3145 bytes
 .../__pycache__/GameFactory.cpython-38.pyc    | Bin 1774 -> 1807 bytes
 12 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/Game.py b/Game.py
index 0888dfa..776e16e 100644
--- a/Game.py
+++ b/Game.py
@@ -3,9 +3,9 @@ import signal
 
 
 class Game:
-    def __init__(self, input_handler, player_state, game_state):
+    def __init__(self, input_handler, events, game_state):
         self.input_handler = input_handler
-        self.player_state = player_state
+        self.events = events
         self.game_state = game_state
         signal.signal(signal.SIGINT, self.interrupt)
         self.is_running = asyncio.Condition()
@@ -15,7 +15,7 @@ class Game:
         print('Received SIGINT. Stopping Game :-)')
         self.is_running.release()
 
-    def run(self):
+    async def run(self):
         self.is_running.acquire()
         asyncio.run(self.input_handler.handleInputs())
 
diff --git a/__main__.py b/__main__.py
index 9d06c02..4b614cd 100644
--- a/__main__.py
+++ b/__main__.py
@@ -1,16 +1,31 @@
+import argparse
+import config
+
 from factories.NetworkFactory import NetworkFactory
 from factories.GameFactory import GameFactory
 
+
 def main():
     args = parseCommandLine()
     game = createGame(args)
     game.run()
 
 def parseCommandLine():
-    return
+    parser = argparse.ArgumentParser(description='A game for the flippR')
+    parser.add_argument('-o', '--OutputServerAddress', dest='OutputServerAddress', default=defaultOutputServerAddress())
+    parser.add_argument('-i', '--InputServerAddress', dest='InputServerAddress', default=defaultInputServerAddress())
+
+    return parser.parse_args()
+
+def defaultOutputServerAddress():
+    return config.SOCKET_PATH + config.OUTPUT_SOCKET_NAME
+
+def defaultInputServerAddress():
+    return config.SOCKET_PATH + config.INPUT_SOCKET_NAME
 
 def createGame(args):
-    NetworkFactory.createNetwork(args['OutputServerAddress'], args['InputServerAddress'])
+    print(args)
+    NetworkFactory.createNetwork(args.OutputServerAddress, args.InputServerAddress)
     gameFactory = GameFactory()
     game = gameFactory.createGame()
     return game
diff --git a/__pycache__/InputHandler.cpython-38.pyc b/__pycache__/InputHandler.cpython-38.pyc
index 92b3ecc7f5304993391de5056e4926e6be5362be..e1a6ed6b3c639b8e1f658992b050d3239d6c58bb 100644
GIT binary patch
delta 54
zcmX@hcAkwll$V!_0SI_vT;i5(<V|A~F#z&X7;6~f8EP1^7>aaC7@HX;w=%Xc3T)<L
Ha%KboKpqRV

delta 52
zcmX@lc9xAdl$V!_0SGoky2LHn$eYF}qzB}sFxD`{Gt@9-F%)T)Fivh~Y+>Zv%){i&
F2mnAk3(Wuk

diff --git a/__pycache__/Solenoid.cpython-38.pyc b/__pycache__/Solenoid.cpython-38.pyc
index b9250bfb670b17fb4777faf7089b7fb283265c3a..d1722f755050b3dd1cf0ace00e61db271880d6c2 100644
GIT binary patch
delta 35
ocmaFD_Kb};l$V!_0SI_vT;i5(<kewf7XtE17@9ZRF{v>E0E%}9BLDyZ

delta 33
mcmaFH_JoZ$l$V!_0SGoky2LHn$g9J|Dgfk_Y<6H$V*~(*vIji?

diff --git a/__pycache__/__main__.cpython-38.pyc b/__pycache__/__main__.cpython-38.pyc
index 48fdb7cc20fd1b6c4a926fbe3140c894ccc4c94c..69ef6034b0d9a6c6ceab8e73d92bc8f2a3728826 100644
GIT binary patch
literal 1366
zcmb7E%}yIJ5VpNPS@Oeg5G^OJTPgGfP}K-girNO$gv%aSZDWTnWOpO4(~2lLrB~jd
z2Xf>I`Yyiq)HkSl>Wq^>5FA=ZW6ym4nb~h<a$2br35*}#56*sDg#1KfaWF7mgXEuJ
z;)K&K38pIzDA=sa5-YGMVpi8qoWKFy=FT?~xZLFhSPR_aOR##p$V;#;@iMQ#S`;O|
ze97dQaK{90(I)X%et{p-@Tp#I2=z6Smv5rB%H$OwrNbx@Gqa7y<^zL7*$2tDVNzsF
zMnuse8PgFR(i=8G2c$`EX~VblYA=$x*w2zAO8NUZ6}s4#B2of9XiN4}pJ_Xi=ef4e
z0lFm;Y5G&yeHn&H6sKXh+q=>>svbIZVItI}9+hR#9z;h0z<m?l9w>@jP)<3!rXw;W
z7mQm-n6k!%yVo|IVumzj-(xq<1mgFLjlpJp2ZP$_WO7G+hP4~_dLMlnl(@*-GVZB3
zO9!l$4K{1F<G$+kRa3|>Le@E#BG2{46QIum8?Gx|;Gz@ty9yqN2i02bD1CH){W0dd
z+5^4}ufcL%p7#@xsuQGH2IYwJ5Oxiww`UHX2tq%f?LBr76wTZCOb(yw8cUkAOs5hs
zD;=0BAUS4*&@!#kDl_PVl;GxF!C=BLB_M1ID3&$=P$X_UOFQwoE;Wz$-yO8VlX~lI
zuzq~nIyr5HGptenaIg>q7Kt>0tbtYq$<Ym=67ByEL2ke;iO&RUM~#1RyAEf!K;~}I
zZesz?hXo3LpDD%{peQJ}F{RKfHw=o=0<k9yYzJBhTgRP{5gW2OF9q%NWSlCA9~M-m
zZ8K|CiPXy#oY0TNs`o94xd=*Fva{xuOSo&ux@QazWAEk&5$L4VX+I&Zy?NXDWw{D~
zVJ3LiG5-y*$af$9Sxkf5yx%@taBf1wq?@`hnUTno2^T%3a5xMX;=2n{dwWU7`(5!0
XIn6OM9`#t6mMzcm3Z4bOf=B-XeYq`l

literal 359
zcmYjLF;2rk5Zt{xTULTg8cK>t*O(6=gam>v4WhY%ljXZa5wU~LP7x`o!b6gh2k;rU
zRD6Mo-ID@dX=is<qnUlq^AS)9bN}*5^NY!_1d&_nc0%C5;Sy>zh~R{i?_h+NPQ8k7
z>BS!CnmmC{zex)k`|)F0`-igXR$)`|?Nsc_eMjA15OlDI9c<x%N7&&O58}vfKyEnI
zGO*Z;s^H7cvuQ8Gy3xXn=l=;tG5LU?Nc@u*SJu|$qOrDk+w_W8$#E$GV2T+AUi<7M
rn`&jwXYt#GZ;Qe2G5$~8P>QuNWdKR^x~^Alz4SLoEGC_aEXnW}HepIJ

diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
index 7248578d132dbf8607a119ff91002add947062ff..95daaad97f85fab3a434f37ea2cb57314c83799c 100644
GIT binary patch
delta 295
zcmX@X_?xLdl$V!_0SE+Vy2jZvGB7*_agYHMkmCTv#TGy!g&~D8harj~l_85Ug-Md3
zNCw8rV@hF;VoG6&VoqU=Vo70(VohO>VoPC&VozZVX3*q#3DnKt7sVgp;vOFq>KEea
z>l*Lk8B|}zqF<6*P$jG%te2LPSx^uZpHh@rmRh8jnO7x(A(&rU@{$>7&`VYzp~-QJ
zDZls@dum=;W>J3LE$(1{XK&Y#_yETck6VJCegUB&@lYW@M_<=lLjIv4Xkt+lgFV<d
efo2tPPFyG@3iLliF%OX7V3A;CVPs(fVnzUCokj-$

delta 115
zcmey(bb>J`l$V!_0SGcySi}_r>Bk@rGGGL99Dul307#@TL@}f=Mlq%^MKPr?2Qz50
pykrInzhngwK+NE$$vp9|CmRcpS;R8ghf#_bBwq~TvoNwS0ssNn5SRb}

diff --git a/config.py b/config.py
index 4c726c9..ce29550 100644
--- a/config.py
+++ b/config.py
@@ -1,4 +1,10 @@
+import os
+
 # Game Config
+## Network Config
+SOCKET_PATH = os.environ["XDG_RUNTIME_DIR"] if os.environ["XDG_RUNTIME_DIR"] else '/tmp'
+INPUT_SOCKET_NAME = "/S.flippR_driver.in"
+OUTPUT_SOCKET_NAME = "/S.flippR_driver.out"
 ## Player State config
 BALLS_PER_GAME = 3
 BEGINNING_UPPER_PLAYFIELD_TIME = 5
diff --git a/displays/__pycache__/Display.cpython-38.pyc b/displays/__pycache__/Display.cpython-38.pyc
index 416c9d15d08b8a94a930b18c764a86d0f121917a..17b1fd2681fc14f13ff71713560255ac5b53b215 100644
GIT binary patch
delta 35
ocmaFD@{ENyl$V!_0SI_vT;dLI<h5XA7Xk807@9YGF-kE40F2NFNB{r;

delta 33
mcmaFH@`Qyql$V!_0SGoky2Ksa$ZNsKDg@+}Z1!Q4Vgvw+zXxIf

diff --git a/factories/EventFactory.py b/factories/EventFactory.py
index 104deaa..06881a6 100644
--- a/factories/EventFactory.py
+++ b/factories/EventFactory.py
@@ -1,3 +1,5 @@
+import inspect
+
 from events.PointEvent import PointEvent
 from events.EndOfBallEvent import EndOfBallEvent
 from events.RightFlapEvent import RightFlapEvent
@@ -6,13 +8,23 @@ from events.RightKickerEvent import RightKickerEvent
 from events.EnterUpperPlayfieldEvent import EnterUpperPlayfieldEvent
 from events.StartGameEvent import StartGameEvent
 
+
 class EventFactory:
     def __init__(self, targets, currentPlayer, upperPlayfieldFlippers, flipper):
         self.targets = targets
         self.currentPlayer = currentPlayer
         self.upperPlayfieldFlippers = upperPlayfieldFlippers
         self.flipper = flipper
-        
+
+    def allEvents(self):
+        methods = inspect.getmembers(self, predicate=inspect.ismethod)
+        createMethods = [method[1] for method in methods if 'create' in method]
+        result = []
+        for method in createMethods:
+            result.append(method())
+
+        return result
+
     def createPointEvent(self):
         event = PointEvent(self.currentPlayer)
         for target in self.targets:
diff --git a/factories/GameFactory.py b/factories/GameFactory.py
index 6fc4f12..cc3ff27 100644
--- a/factories/GameFactory.py
+++ b/factories/GameFactory.py
@@ -10,6 +10,7 @@ from InputHandler import InputHandler
 
 from GameState import GameState
 
+from Game import Game
 
 class GameFactory:
     def __init__(self):
@@ -31,8 +32,9 @@ class GameFactory:
         gameState = GameState(players, self.getHighScore(), players[0].id)
 
         eventFactory = EventFactory(targets, gameState.currentPlayer)
-        pointEvent = eventFactory.createPointEvent()
+        events = eventFactory.allEvents()
 
+        return Game(inputHandler, gameState, events)
 
     def createPlayers(self):
         players = []
diff --git a/factories/__pycache__/EventFactory.cpython-38.pyc b/factories/__pycache__/EventFactory.cpython-38.pyc
index da0ca17c6a6bbc8024afeaed7f1a58eaabcf294b..72b2deb8f9ff1a14471003a69eedbc0dd4c95113 100644
GIT binary patch
delta 900
zcmZva&ui2`6vyXHvdJX-qpRI*EiANFX-TVV6|IMsBG~H5B9vZ&71m6stCQVr5(P_^
zqU}YjNIQby#d_?;oA@_~7tgtQtk>e*H(6SxI>Y<Scix+M?=j3_<?ET!a<OO=9PWpO
z`*YS#skYI=9VZ+Fan(u%1k|OVv?jDbclAu`A{Q90k?EW;1Lm?!8^Q`~*Uq#l@<G8Z
zWSWU$P;yH^ZWC^Cdy8;;le&EzmWY!-P%SJvklJ^5_TIxiIRncDUfCjUfmiXsfP4$z
zp(uTNbt8vIb+nsk(JUe+k04Q`9A48daLTnUlE6IKgf3krT`i&WWTo8I6KzjR^iA>+
zfUJ!r8fMm2RjU*Fyy-P!-vdl|G$;yHX$dW=Ay!F3HdZQF0@FV>LOlTvLu7}p>6nV9
zh8Oyn<Ul0}%Lw$*`c!HJe*Cb_Ggl9%Fqqo2q8Y_rJLt?+aUU57gHXcA`ozLhzZKtV
zcyT*?R&NNA?W6jv@Y-HOM02Q)?mBvEHd|50_u|xE_2a+~9{6FDvS!q)n;MNy$8T{b
z7xt;TX3rhD#a_R6vhJeP2>s}Zh{HkI$n{^hj;r>o<_ZV`Whj9T3`%r;;QuYkZTbaj
za$eg$J%TsFJYt__g~L&mSpL$gFuKdm$-3UmAD;=wvfyXE3ghyd{^~?z94^S0xi=@g
z{c_qEgv)Z#*#9R|HHTqZUNhhQ6ZvUYVP=;-hqLkpn}i$k6T5<+>j#@~hE>bw6~+}D
yg-L~r3U!4kg%NqlsyXUSq6&fmGnj>z`!hoe15P;{!bP^M!;1P4j27Upsr?3!EX0KX

delta 458
zcmY+8yGjE=6hQZG_AxX2NJyg57$g$KWG#e{FOZ0ZAfl#l3JY0<z-|I-h^2^j3KFhh
zo5muk#Kvz3HrD=uV3)#9oY_L%xy<3reQ;+oH_f{($6<;%PlwH;3>mnki&OFP6(0g6
z1P&lw4b(8jQ?aK4E!4RlyA~Ls$<5gHfP|FO*o}aN7Pn$I13PrM1Im`-6Q5oyKD|=8
z>$82OW_`%jHF#&c-FBz9*+1#@2G0XHz$Uab(U8YScmsxgwSmXl7&7SSx7nN+iY$SV
z8l|Pr;E)#aOLt)wC$u80ZT&Vy^KtdXaA5)OjhjTpGgqOEd*)pt`)PWxf(0^4WM4@g
zJp3jPiR_S8VO?y!ggkDuHE7^DtAmYW<}DZG=ZX>~iA9OB#F9isB8O?aP>rZ?dC#%}
Z1c)I*|BJZ3Q%mE9HO;!B#fE>O{s4CBR=)rM

diff --git a/factories/__pycache__/GameFactory.cpython-38.pyc b/factories/__pycache__/GameFactory.cpython-38.pyc
index 89e757fd4517d0aaa9797c8936d147c9bff26e6d..a36b2c2684dc60a7f5508ca1e0bfaf953c7535ec 100644
GIT binary patch
delta 496
zcmZutO-sWt7*4X<W^L2WO{en%^dO^n@FECfdYijQ4-OG_P|8}zpxY#^17+x8-aP1t
zN71YL8~hob>L2jrU(h!l_yOi6Pm<?--zQJ<!LBW~$C!>_ygyVAUPf#YpN&=zmptU9
z1J+>;hEWZ9x@TM>&lr-1<(YM4v(f#zX5(0?xg9Z&BdrVy5gLkHyp3b=hOcm5w1{nH
zfe#aXtcyFcfgSNms)a}&kbyE#hp9SxA`Zt;W*efE+RvxmAgK2JZWMCaXKOqsM5<Db
zRe#Lpf#nHI!7kRD+;<}%jQDeK4lMwLDW-&y0x@9~hH{}wBis@<N)b<rXJvUkCkffX
zivY3awZr4UJ#DBGeLlY7`x-t2MJ4g6?5-4Kk4)H@CnA3h@mWZ%iT=cnGc79@B*^Y0
z@k{nc+kk8aW=H|RxlS3ST(XXxiPdJWd(>{lBC9@bO7cIAm{vMH?<DZI<X48$7sVz#
JKM4Xmh%d<DT`d3r

delta 483
zcmeC@d&kQg%FD~e00bK%UE-=H^2##iP1KGTac4;3OyO!_Na1Q`isDV-4rb8gnYgNM
zvH@c;s|8SX$>ddxZj4crKQeYR3Qn$N(&XU>iWY-SV&s^-iOHPNZSpH7SH2X6V1|`U
zenpHxX-%%luFT=00?9?Gi6yB4`I&hou4SotC7SF-0+ZJ>+t@^L6~G0H1c5prgb<K*
ziwmO5Jux>`5@Zz*kYHfsVB}!pU=m~EVVtbWQm?=V6e|MBL<vJJ$w{nCEpo{$E&wu$
z_$MD>Q8W<%DUtvY;vkjmDG=ExHjtXsA~cJOM1hJ_Crh#hsfvK~fSjetSOhi%)rm!7
zKq=kH6Igxxgh47n&IIcQOCT8w)&}xa5h%PsZZ75k5<tIjaqw_(fJOZ@`J&j8^YhX&
q)1xM9v8^ye*ag>qi^C>2KczG$)eaQ8#ULkfF!BJy0t}geEM@@h5?zY`