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

Fix bug when there are file differences and a user has no file open

Browse Source
This commit is contained in:
Et0h 2015-01-25 22:21:59 +00:00
parent 8c99bcc794
commit aa224b63f6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/__init__.py
View File

@ -1,4 +1,4 @@
version = '1.3.0' version = '1.3.0'
milestone = 'Chami' milestone = 'Chami'
release_number = '2' release_number = '3'
projectURL = 'http://syncplay.pl/' projectURL = 'http://syncplay.pl/'

17
syncplay/client.py
View File

@ -659,8 +659,9 @@ class SyncplayClient(object):
if not self._client._player: if not self._client._player:
return return
osdMessage = None osdMessage = None
if not self._userlist.areAllFilesInRoomSame(): fileDifferencesForRoom = self._userlist.getFileDifferencesForRoom()
fileDifferencesMessage = getMessage("room-file-differences").format(self._userlist.getFileDifferencesForRoom()) if not self._userlist.areAllFilesInRoomSame() and fileDifferencesForRoom is not None:
fileDifferencesMessage = getMessage("room-file-differences").format(fileDifferencesForRoom)
if self._userlist.currentUser.canControl() and self._userlist.isReadinessSupported(): if self._userlist.currentUser.canControl() and self._userlist.isReadinessSupported():
if self._userlist.areAllUsersInRoomReady(): if self._userlist.areAllUsersInRoomReady():
osdMessage = u"{}{}{}".format(fileDifferencesMessage, self._client._player.osdMessageSeparator, getMessage("all-users-ready").format(self._userlist.readyUserCount())) osdMessage = u"{}{}{}".format(fileDifferencesMessage, self._client._player.osdMessageSeparator, getMessage("all-users-ready").format(self._userlist.readyUserCount()))
@ -789,10 +790,14 @@ class SyncplayUserlist(object):
message += getMessage("playing-notification/room-addendum").format(room) message += getMessage("playing-notification/room-addendum").format(room)
self.ui.showMessage(message, hideFromOSD) self.ui.showMessage(message, hideFromOSD)
if self.currentUser.file and not self.currentUser.isFileSame(file_) and self.currentUser.room == room: if self.currentUser.file and not self.currentUser.isFileSame(file_) and self.currentUser.room == room:
message = getMessage("file-differences-notification").format(self.getFileDifferencesForUser(self.currentUser.file, file_)) fileDifferences = self.getFileDifferencesForUser(self.currentUser.file, file_)
self.ui.showMessage(message, True) if fileDifferences is not None:
message = getMessage("file-differences-notification").format(fileDifferences)
self.ui.showMessage(message, True)
def getFileDifferencesForUser(self, currentUserFile, otherUserFile): def getFileDifferencesForUser(self, currentUserFile, otherUserFile):
if not currentUserFile or not otherUserFile:
return None
differences = [] differences = []
differentName = not utils.sameFilename(currentUserFile['name'], otherUserFile['name']) differentName = not utils.sameFilename(currentUserFile['name'], otherUserFile['name'])
differentSize = not utils.sameFilesize(currentUserFile['size'], otherUserFile['size']) differentSize = not utils.sameFilesize(currentUserFile['size'], otherUserFile['size'])
@ -803,12 +808,14 @@ class SyncplayUserlist(object):
return ", ".join(differences) return ", ".join(differences)
def getFileDifferencesForRoom(self): def getFileDifferencesForRoom(self):
if not self.currentUser.file:
return None
differences = [] differences = []
differentName = False differentName = False
differentSize = False differentSize = False
differentDuration = False differentDuration = False
for otherUser in self._users.itervalues(): for otherUser in self._users.itervalues():
if otherUser.room == self.currentUser.room: if otherUser.room == self.currentUser.room and otherUser.file:
if not utils.sameFilename(self.currentUser.file['name'], otherUser.file['name']): if not utils.sameFilename(self.currentUser.file['name'], otherUser.file['name']):
differentName = True differentName = True
if not utils.sameFilesize(self.currentUser.file['size'], otherUser.file['size']): if not utils.sameFilesize(self.currentUser.file['size'], otherUser.file['size']):