Upgraded file comparing function
This commit is contained in:
parent
b1c8683fd0
commit
3f0fe0c015
@ -512,9 +512,16 @@ class SyncplayClientManager(object):
|
|||||||
def getUsersWithNotMatchingFilenames(self):
|
def getUsersWithNotMatchingFilenames(self):
|
||||||
if(self.currentUser.filename == None):
|
if(self.currentUser.filename == None):
|
||||||
return []
|
return []
|
||||||
matchingFilename = lambda x: (x.filename == None or x.filename == self.currentUser.filename) or x.room <> self.currentUser.room
|
matchingFilename = lambda x: self._areUsersFilesSame(x)
|
||||||
return list(itertools.ifilterfalse(matchingFilename, self.users))
|
return list(itertools.ifilterfalse(matchingFilename, self.users))
|
||||||
|
|
||||||
|
def _areUsersFilesSame(self, user):
|
||||||
|
filenameCheck = (user.filename == None or user.filename == self.currentUser.filename)
|
||||||
|
sizeCheck = (user.filesize == None or user.filesize == self.currentUser.filesize)
|
||||||
|
durationCheck = (user.fileduration == None or user.fileduration == self.currentUser.fileduration)
|
||||||
|
roomCheck = user.room <> self.currentUser.room
|
||||||
|
return (filenameCheck and sizeCheck and durationCheck) or roomCheck
|
||||||
|
|
||||||
def setUsersRoom(self, username, room):
|
def setUsersRoom(self, username, room):
|
||||||
for u in self.users:
|
for u in self.users:
|
||||||
if(u.name == username):
|
if(u.name == username):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user