From a61aaadb25fa723e8143705d1f699944f30d5358 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Mon, 15 Oct 2012 09:34:44 +0200
Subject: [PATCH] Few changed in console ui Fixed room changing

---
 syncplay/client.py       |  9 +++++++--
 syncplay/ui/consoleUI.py | 39 +++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/syncplay/client.py b/syncplay/client.py
index eaf738c..c137abf 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -51,11 +51,11 @@ class SyncplayClient(object):
         self.ui = UiManager(self, ui)
         self.userlist = SyncplayUserlist(self.ui)
         if(args.room == None or args.room == ''):
-            room = 'default'
+            args.room = 'default'
         self.defaultRoom = args.room
         self.playerPositionBeforeLastSeek = 0.0
         self.setUsername(args.name)
-        self.setRoom(room)
+        self.setRoom(args.room)
         if(args.password):
             args.password = hashlib.md5(args.password).hexdigest()
         self._serverPassword = args.password
@@ -256,6 +256,11 @@ class SyncplayClient(object):
     def setRoom(self, roomName):
         self.userlist.currentUser.room = roomName
     
+    def sendRoom(self):
+        room = self.userlist.currentUser.room
+        if(self._protocol and self._protocol.logged and room):
+            self._protocol.sendRoomSetting(room)
+    
     def getRoom(self):
         return self.userlist.currentUser.room
     
diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py
index 693c7d5..7d97a95 100644
--- a/syncplay/ui/consoleUI.py
+++ b/syncplay/ui/consoleUI.py
@@ -17,18 +17,14 @@ class ConsoleUI(threading.Thread):
         self._syncplayClient = client
         
     def run(self):
-        try:
-            while True:
-                data = raw_input()
-                data = data.rstrip('\n\r')
-                if(not self.promptMode.isSet()):
-                    self.PromptResult = data
-                    self.promptMode.set()
-                elif(self._syncplayClient):
-                    self._executeCommand(data)
-        except:
-            self._syncplayClient.protocolFactory.stopRetrying()
-          
+        while True:
+            data = raw_input()
+            data = data.rstrip('\n\r')
+            if(not self.promptMode.isSet()):
+                self.PromptResult = data
+                self.promptMode.set()
+            elif(self._syncplayClient):
+                self._executeCommand(data)
         
     def promptFor(self, prompt = ">", message = ""):
         if message <> "":
@@ -38,7 +34,7 @@ class ConsoleUI(threading.Thread):
         self.promptMode.wait()
         return self.PromptResult
 
-    def showMessage(self, message, noTimestamp):
+    def showMessage(self, message, noTimestamp = False):
         if(os.name == "nt"):
             message = message.encode('ascii','replace') 
         if(noTimestamp):
@@ -63,21 +59,20 @@ class ConsoleUI(threading.Thread):
                 else:
                     room = self._syncplayClient.defaultRoom
             self._syncplayClient.setRoom(room)
+            self._syncplayClient.sendRoom()
         elif data == "r":
             tmp_pos = self._syncplayClient.getPlayerPosition()
             self._syncplayClient.setPosition(self._syncplayClient.playerPositionBeforeLastSeek)
             self._syncplayClient.playerPositionBeforeLastSeek = tmp_pos
         elif data == "p":
             self._syncplayClient.setPaused(not self._syncplayClient.getPlayerPaused())
-        elif data == "k": #TODO: remove?
-            self._syncplayClient.stop()
         elif data == 'help':
-            self.showMessage( "Available commands:" )
-            self.showMessage( "\thelp - this help" )
-            self.showMessage( "\tr - revert last seek" )
-            self.showMessage( "\tp - toggle pause" )
-            self.showMessage( "\troom [name] - change room" )
-            self.showMessage("Syncplay version: %s" % syncplay.version)
-            self.showMessage("More info available at: %s" % syncplay.projectURL)
+            self.showMessage( "Available commands:", True)
+            self.showMessage( "\thelp - this help", True )
+            self.showMessage( "\tr - revert last seek", True )
+            self.showMessage( "\tp - toggle pause", True )
+            self.showMessage( "\troom [name] - change room", True )
+            self.showMessage("Syncplay version: {}".format(syncplay.version), True)
+            self.showMessage("More info available at: {}".format(syncplay.projectURL), True)
         else:
             self.showMessage( "Unrecognized command, type 'help' for list of available commands" )