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

Because python 2.6

Browse Source
This commit is contained in:
Uriziel 2012-09-30 20:42:49 +02:00
parent 176d922866
commit 342ee3651d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/server.py
View File

@ -232,7 +232,7 @@ class WatcherInfo(object):
class SyncFactory(Factory): class SyncFactory(Factory):
def __init__(self, password = '', banlist = None , isolate_rooms = False, min_pause_lock = 2 , update_time_limit = 1): def __init__(self, password = '', banlist = None , isolate_rooms = False, min_pause_lock = 2 , update_time_limit = 1):
print "Welcome to Syncplay server, ver. {}".format(syncplay.version) print "Welcome to Syncplay server, ver. {0}".format(syncplay.version)
self.watchers = dict() self.watchers = dict()
self.paused = {} self.paused = {}
self.pause_change_time = None self.pause_change_time = None
@ -262,7 +262,7 @@ class SyncFactory(Factory):
watcher.max_position = min(w.max_position for w in self.watchers.itervalues()) watcher.max_position = min(w.max_position for w in self.watchers.itervalues())
self.watchers[watcher_proto] = watcher self.watchers[watcher_proto] = watcher
watcher_proto.sender.send_hello(name) watcher_proto.sender.send_hello(name)
print "{} connected to room '{}'".format(name, room) print "{0} connected to room '{1}'".format(name, room)
self.send_state_to(watcher) self.send_state_to(watcher)
self.send_ping_to(watcher) self.send_ping_to(watcher)
self.broadcast(watcher, lambda receiver: receiver.watcher_proto.sender.send_room(watcher.name, watcher.room)) self.broadcast(watcher, lambda receiver: receiver.watcher_proto.sender.send_room(watcher.name, watcher.room))
@ -271,7 +271,7 @@ class SyncFactory(Factory):
watcher = self.watchers.pop(watcher_proto, None) watcher = self.watchers.pop(watcher_proto, None)
if not watcher: if not watcher:
return return
print "{} left server".format(watcher.name) print "{0} left server".format(watcher.name)
self.removeRoomIfEmpty(watcher.room) self.removeRoomIfEmpty(watcher.room)
watcher.active = False watcher.active = False
self.broadcast(watcher, lambda receiver: receiver.watcher_proto.sender.send_left(watcher.name)) self.broadcast(watcher, lambda receiver: receiver.watcher_proto.sender.send_left(watcher.name))