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

Better messages and list command

Browse Source
This commit is contained in:
Uriziel 2012-12-11 22:30:37 +01:00
parent d6adeba3d5
commit 7b02de825f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/__init__.py
View File

@ -1,3 +1,3 @@
version = '1.1.8' version = '1.1.9'
milestone = 'Tequila' milestone = 'Tequila'
projectURL = 'http://uriziel.github.com/syncplay/' projectURL = 'http://uriziel.github.com/syncplay/'

14
syncplay/client.py
View File

@ -345,15 +345,15 @@ 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)
differences = []
if(self.currentUser.file['name'] <> file_['name']): if(self.currentUser.file['name'] <> file_['name']):
message = "Filename is different" differences.append("filename")
self.ui.showMessage(message)
if(self.currentUser.file['size'] <> file_['size']): if(self.currentUser.file['size'] <> file_['size']):
message = "Size is different" differences.append("size")
self.ui.showMessage(message)
if(self.currentUser.file['duration'] <> file_['duration']): if(self.currentUser.file['duration'] <> file_['duration']):
message = "Duration is different" differences.append("duration")
self.ui.showMessage(message) message = "Your file differs in the following way(s): " + ", ".join(differences)
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):
@ -422,6 +422,8 @@ class SyncplayUserlist(object):
self.ui.showMessage("File: {} is being played by:".format(key), True, True) self.ui.showMessage("File: {} is being played by:".format(key), True, True)
for user in sorted(users.itervalues()): for user in sorted(users.itervalues()):
message = "<"+user.username+">" message = "<"+user.username+">"
if(self.currentUser.username == user.username):
message = "*" + message + "*"
message = self.__addDifferentFileMessageIfNecessary(user, message) message = self.__addDifferentFileMessageIfNecessary(user, message)
self.ui.showMessage("\t" + message, True, True) self.ui.showMessage("\t" + message, True, True)

3
syncplay/ui/consoleUI.py
View File

@ -78,6 +78,8 @@ class ConsoleUI(threading.Thread):
tmp_pos = self._syncplayClient.getPlayerPosition() tmp_pos = self._syncplayClient.getPlayerPosition()
self._syncplayClient.setPosition(self._syncplayClient.playerPositionBeforeLastSeek) self._syncplayClient.setPosition(self._syncplayClient.playerPositionBeforeLastSeek)
self._syncplayClient.playerPositionBeforeLastSeek = tmp_pos self._syncplayClient.playerPositionBeforeLastSeek = tmp_pos
elif data == "l":
self._syncplayClient.userlist.showUserList()
elif data == "p": elif data == "p":
self._syncplayClient.setPaused(not self._syncplayClient.getPlayerPaused()) self._syncplayClient.setPaused(not self._syncplayClient.getPlayerPaused())
elif data == 'help': elif data == 'help':
@ -85,6 +87,7 @@ class ConsoleUI(threading.Thread):
self.showMessage("\thelp - this help", True) self.showMessage("\thelp - this help", True)
self.showMessage("\tr - revert last seek", True) self.showMessage("\tr - revert last seek", True)
self.showMessage("\tp - toggle pause", True) self.showMessage("\tp - toggle pause", True)
self.showMessage("\tl - show user list", True)
self.showMessage("\troom [name] - change room", True) self.showMessage("\troom [name] - change room", True)
self.showMessage("\t[s][+-][time] - seek to the given value of time, if + or - is not specified it's absolute time in seconds or min:sec", True) self.showMessage("\t[s][+-][time] - seek to the given value of time, if + or - is not specified it's absolute time in seconds or min:sec", True)
self.showMessage("Syncplay version: {}".format(syncplay.version), True) self.showMessage("Syncplay version: {}".format(syncplay.version), True)