Merge pull request #298 from micheljung/feature/rehost

Process 'Rehost'

src/client/_clientwindow.py

@@ -1218,7 +1218,7 @@ def request_launch():
             self.game_session.ready.connect(request_launch)
             self.game_session.listen()
 
-    def host_game(self, title, mod, visibility, mapname, password):
+    def host_game(self, title, mod, visibility, mapname, password, is_rehost=False):
         def request_launch():
             msg = {
                 'command': 'game_host',
@@ -1227,12 +1227,14 @@ def request_launch():
                 'visibility': visibility,
                 'mapname': mapname,
                 'password': password,
+                'is_rehost': is_rehost
             }
             if self.connectivity.state == 'STUN':
                 msg['relay_address'] = self.connectivity.relay_address
             self.send(msg)
             self.game_session.ready.disconnect(request_launch)
         if self.game_session:
+            self.game_session.game_password = password
             self.game_session.ready.connect(request_launch)
             self.game_session.listen()
 
@@ -1250,6 +1252,7 @@ def request_launch():
             self.send(msg)
             self.game_session.ready.disconnect(request_launch)
         if self.game_session:
+            self.game_session.game_password = password
             self.game_session.ready.connect(request_launch)
             self.game_session.listen()
 
@@ -1308,6 +1311,8 @@ def handle_game_launch(self, message):
 
         info = dict(uid=message['uid'], recorder=self.login, featured_mod=message['mod'], launched_at=time.time())
 
+        self.game_session.game_uid = message['uid']
+
         fa.run(info, self.game_session.relay_port, arguments)
 
     def handle_coop_info(self, message):
@@ -1320,6 +1325,12 @@ def handle_mod_info(self, message):
         self.modInfo.emit(message)
 
     def handle_game_info(self, message):
+        if message['uid'] == self.game_session.game_uid:
+            self.game_session.game_map = message['mapname']
+            self.game_session.game_mod = message['featured_mod']
+            self.game_session.game_name = message['title']
+            self.game_session.game_visibility = message['visibility']
+
         if 'games' in message:
             for game in message['games']:
                 self.gameInfo.emit(game)

src/fa/game_session.py

@@ -29,6 +29,13 @@ class GameSession(QObject):
     def __init__(self, client, connectivity):
         QObject.__init__(self)
         self._state = GameSessionState.OFF
+        self._rehost = False
+        self.game_uid = None
+        self.game_name = None
+        self.game_mod = None
+        self.game_visibility = None
+        self.game_map = None
+        self.game_password = None
 
         # Subscribe to messages targeted at 'game' from the server
         client.subscribe_to('game', self)
@@ -147,6 +154,9 @@ def _on_game_message(self, command, args):
             elif args[0] == 'Lobby':
                 # TODO: Eagerly initialize the game by hosting/joining early
                 pass
+        elif command == 'Rehost':
+            self._rehost = True
+
         self.send(command, args)
 
     def _turn_state_changed(self, val):
@@ -161,3 +171,19 @@ def _exited(self, status):
         self.state = GameSessionState.OFF
         self._logger.info("Game has exited with status code: {}".format(status))
         self.send('GameState', ['Ended'])
+
+        if self._rehost:
+            self.client.host_game(title=self.game_name,
+                                  mod=self.game_mod,
+                                  visibility=self.game_visibility,
+                                  mapname=self.game_map,
+                                  password=self.game_password,
+                                  is_rehost=True)
+
+        self._rehost = False
+        self.game_uid = None
+        self.game_name = None
+        self.game_mod = None
+        self.game_visibility = None
+        self.game_map = None
+        self.game_password = None