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

Fixed handling different file messages

Browse Source
This commit is contained in:
Uriziel 2012-11-25 21:11:00 +01:00
parent 83524539fd
commit 22d9542615
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
syncplay/client.py
View File

@ -111,7 +111,7 @@ class SyncplayClient(object):
self._playerPaused = paused self._playerPaused = paused
if(self._lastGlobalUpdate): if(self._lastGlobalUpdate):
self._lastPlayerUpdate = time.time() self._lastPlayerUpdate = time.time()
if(pauseChange or seeked and self._protocol): if((pauseChange or seeked) and self._protocol):
if(seeked): if(seeked):
self.playerPositionBeforeLastSeek = self.getGlobalPosition() self.playerPositionBeforeLastSeek = self.getGlobalPosition()
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True) self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
@ -345,6 +345,14 @@ class SyncplayUserlist(object):
if(self.currentUser.file and not self.currentUser.isFileSame(file_)): if(self.currentUser.file and not self.currentUser.isFileSame(file_)):
message = "File you are playing appears to be different from <{}>'s".format(username) message = "File you are playing appears to be different from <{}>'s".format(username)
self.ui.showMessage(message) self.ui.showMessage(message)
if(self.currentUser.file['name'] <> file_['name']):
message = "Filename is different"
if(self.currentUser.file['size'] <> file_['size']):
message = "Size is different"
if(self.currentUser.file['duration'] <> file_['duration']):
message = "Duration is different"
self.ui.showMessage(message)
def addUser(self, username, room, file_, noMessage = False): def addUser(self, username, room, file_, noMessage = False):
if(username == self.currentUser.username): if(username == self.currentUser.username):
@ -401,8 +409,9 @@ class SyncplayUserlist(object):
def __addDifferentFileMessageIfNecessary(self, user, message): def __addDifferentFileMessageIfNecessary(self, user, message):
if(self.currentUser.file): if(self.currentUser.file):
fileHasSameSizeAsYour = user.file['size'] == self.currentUser.file['size'] fileHasSameSizeAsYour = user.file['size'] == self.currentUser.file['size']
fileHasSameNameYour = user.file['name'] == self.currentUser.file['name']
differentFileMessage = " (but their file size is different from yours!)" differentFileMessage = " (but their file size is different from yours!)"
message += differentFileMessage if not fileHasSameSizeAsYour else "" message += differentFileMessage if not fileHasSameSizeAsYour and fileHasSameNameYour else ""
return message return message
def __displayFileWatchersInRoomList(self, key, users): def __displayFileWatchersInRoomList(self, key, users):