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

Fix for not existing player

Browse Source
This commit is contained in:
Uriziel 2012-06-27 12:38:05 +02:00
parent 9c3fcb0dc2
commit 6451a3b9b0
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
syncplay/client.py
View File

@ -50,11 +50,11 @@ class SyncClientProtocol(CommandProtocol):
if what: if what:
message = '%s is present and is playing \'%s\' in the room: \'%s\'' % (who, what, where) message = '%s is present and is playing \'%s\' in the room: \'%s\'' % (who, what, where)
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
else: else:
message = '%s is present in the room: \'%s\'' % (who, where) message = '%s is present in the room: \'%s\'' % (who, where)
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
@arg_count(4, 5) @arg_count(4, 5)
def handle_connected_state(self, args): def handle_connected_state(self, args):
@ -90,25 +90,25 @@ class SyncClientProtocol(CommandProtocol):
who, where, what = args who, where, what = args
message = '%s is playing \'%s\' in the room: \'%s\'' % (who, what, where) message = '%s is playing \'%s\' in the room: \'%s\'' % (who, what, where)
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
@arg_count(1) @arg_count(1)
def handle_connected_joined(self, args): def handle_connected_joined(self, args):
message = '%s joined' % args[0] message = '%s joined' % args[0]
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
@arg_count(2) @arg_count(2)
def handle_connected_room(self, args): def handle_connected_room(self, args):
message = '%s entered the room: \'%s\'' % (args[0], args[1]) message = '%s entered the room: \'%s\'' % (args[0], args[1])
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
@arg_count(1) @arg_count(1)
def handle_connected_left(self, args): def handle_connected_left(self, args):
message = '%s left' % args[0] message = '%s left' % args[0]
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
def send_list(self): def send_list(self):
self.send_message('list') self.send_message('list')
@ -160,18 +160,15 @@ class SyncClientFactory(ClientFactory):
print 'Connection lost, reconnecting' print 'Connection lost, reconnecting'
reactor.callLater(0.1, connector.connect) reactor.callLater(0.1, connector.connect)
else: else:
if(self.manager.player):
message = 'Disconnected'
print message
self.manager.player.display_message(message)
def clientConnectionFailed(self, connector, reason):
if(self.manager.player):
message = 'Disconnected' message = 'Disconnected'
print message print message
self.manager.player.display_message(message) if(self.manager.player): self.manager.player.display_message(message)
def clientConnectionFailed(self, connector, reason):
message = 'Connection failed'
print message
if(self.manager.player): self.manager.player.display_message(message)
print 'Connection failed'
self.manager.stop() self.manager.stop()
def stop_retrying(self): def stop_retrying(self):