Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix on room changing

Browse Source
This commit is contained in:
Uriziel 2012-09-18 13:19:33 +02:00
parent c24ff27720
commit 549b16cb2a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/server.py
View File

@ -127,15 +127,14 @@ class SyncServerProtocol(CommandProtocol):
@state('connected') @state('connected')
@argumentCount(1) @argumentCount(1)
def room(self, args): def room(self, args):
watcher = self.factory.watchers.get(self) watcher = self.factory.watchers.get(self._protocol)
old_room = watcher.room old_room = watcher.room
watcher.room = str(re.sub('[^\w]','',args[0])) watcher.room = str(re.sub('[^\w]','',args[0]))
self.factory.broadcast(watcher, lambda receiver: receiver.watcher_proto.send_room(watcher.name,watcher.room)) self.factory.broadcast(watcher, lambda receiver: receiver.watcher_proto.send_room(watcher.name,watcher.room))
if not watcher.room in self.factory.paused: if not watcher.room in self.factory.paused:
self.factory.paused[watcher.room] = True self.factory.paused[watcher.room] = True
self.factory.remove_room_if_empty(old_room) self.factory.remove_room_if_empty(old_room)
watcher = self.factory.watchers.get(self.__protocol)
@state('connected') @state('connected')
@argumentCount(0) @argumentCount(0)
def list(self, args): def list(self, args):
@ -446,5 +445,4 @@ class SyncFactory(Factory):
if(self.isolate_rooms): if(self.isolate_rooms):
self.broadcast_room(sender, what) self.broadcast_room(sender, what)
for receiver in self.watchers.itervalues(): for receiver in self.watchers.itervalues():
#if receiver != sender:
what(receiver) what(receiver)

2
syncplay/ui/consoleUI.py
View File

@ -74,7 +74,7 @@ class ConsoleUI(threading.Thread):
room = 'default' room = 'default'
self._syncplayClient.users.currentUser.room = room self._syncplayClient.users.currentUser.room = room
self._syncplayClient.checkIfFileMatchesOthers() self._syncplayClient.checkIfFileMatchesOthers()
#self._syncplayClient.protocol.sender.send_room(room) self._syncplayClient.protocol.sender.send_room(room)
elif data == "r": elif data == "r":
tmp_pos = self._syncplayClient.player_position tmp_pos = self._syncplayClient.player_position
self._syncplayClient.player.set_position(self._syncplayClient.player_position_before_last_seek) self._syncplayClient.player.set_position(self._syncplayClient.player_position_before_last_seek)