From 22d9542615a6ebf716f4ce3441c30ac84f94c3da Mon Sep 17 00:00:00 2001 From: Uriziel Date: Sun, 25 Nov 2012 21:11:00 +0100 Subject: [PATCH] Fixed handling different file messages --- syncplay/client.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 42b0f0f..12ca997 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -111,7 +111,7 @@ class SyncplayClient(object): self._playerPaused = paused if(self._lastGlobalUpdate): self._lastPlayerUpdate = time.time() - if(pauseChange or seeked and self._protocol): + if((pauseChange or seeked) and self._protocol): if(seeked): self.playerPositionBeforeLastSeek = self.getGlobalPosition() 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_)): message = "File you are playing appears to be different from <{}>'s".format(username) 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): if(username == self.currentUser.username): @@ -401,8 +409,9 @@ class SyncplayUserlist(object): def __addDifferentFileMessageIfNecessary(self, user, message): if(self.currentUser.file): 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!)" - message += differentFileMessage if not fileHasSameSizeAsYour else "" + message += differentFileMessage if not fileHasSameSizeAsYour and fileHasSameNameYour else "" return message def __displayFileWatchersInRoomList(self, key, users):