Current user is aware of room position in user listing now
This commit is contained in:
parent
5bab6fafb7
commit
10a4d3f953
@ -371,6 +371,7 @@ class SyncplayUserlist(object):
|
|||||||
|
|
||||||
def addUser(self, username, room, file_, position = 0, noMessage = False):
|
def addUser(self, username, room, file_, position = 0, noMessage = False):
|
||||||
if(username == self.currentUser.username):
|
if(username == self.currentUser.username):
|
||||||
|
self.currentUser.lastPosition = position
|
||||||
return
|
return
|
||||||
user = SyncplayUser(username, room, file_, position)
|
user = SyncplayUser(username, room, file_, position)
|
||||||
self._users[username] = user
|
self._users[username] = user
|
||||||
@ -401,10 +402,7 @@ class SyncplayUserlist(object):
|
|||||||
self.addUser(username, room, file_)
|
self.addUser(username, room, file_)
|
||||||
|
|
||||||
def __addUserWithFileToList(self, rooms, user):
|
def __addUserWithFileToList(self, rooms, user):
|
||||||
if(self.currentUser.username == user.username):
|
currentPosition = self.ui.formatTime(user.lastPosition)
|
||||||
currentPosition = self.ui.formatTime(self._client.getGlobalPosition())
|
|
||||||
else:
|
|
||||||
currentPosition = self.ui.formatTime(user.lastPosition)
|
|
||||||
file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, self.ui.formatTime(user.file['duration']))
|
file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, self.ui.formatTime(user.file['duration']))
|
||||||
if (not rooms[user.room].has_key(file_key)):
|
if (not rooms[user.room].has_key(file_key)):
|
||||||
rooms[user.room][file_key] = {}
|
rooms[user.room][file_key] = {}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user