From 2dbd814fa4f82357106aa82bbb387bf77f845d6e Mon Sep 17 00:00:00 2001 From: Uriziel Date: Mon, 24 Sep 2012 13:39:35 +0200 Subject: [PATCH] Updated room command room cmd now defaults to filename server now allows more characters in room names --- syncplay/server.py | 2 +- syncplay/ui/consoleUI.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/syncplay/server.py b/syncplay/server.py index eca98b1..3584da6 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -129,7 +129,7 @@ class SyncServerProtocol(CommandProtocol): def room(self, args): watcher = self.factory.watchers.get(self.__protocol) old_room = watcher.room - watcher.room = str(re.sub('[^\w]','',args[0])) + watcher.room = str(args[0].encode('ascii','replace')) self.factory.broadcast(watcher, lambda receiver: receiver.watcher_proto.sender.send_room(watcher.name,watcher.room)) if not watcher.room in self.factory.paused: self.factory.paused[watcher.room] = True diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py index c47b38f..5f8afae 100644 --- a/syncplay/ui/consoleUI.py +++ b/syncplay/ui/consoleUI.py @@ -72,7 +72,7 @@ class ConsoleUI(threading.Thread): elif matched_room: room = matched_room.group(2) if room == None: - room = 'default' + room = self._syncplayClient.users.currentUser.filename self._syncplayClient.users.currentUser.room = room self._syncplayClient.checkIfFileMatchesOthers() self._syncplayClient.protocol.sender.send_room(room)