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

Changes in messages

Browse Source
This commit is contained in:
Uriziel 2012-10-15 10:24:04 +02:00
parent a61aaadb25
commit 24c517bf2e
4 changed files with 13 additions and 11 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.0.1' version = '1.0.3'
milestone = 'Tequila' milestone = 'Tequila'
projectURL = 'http://uriziel.github.com/syncplay/' projectURL = 'http://uriziel.github.com/syncplay/'

15
syncplay/client.py
View File

@ -335,7 +335,7 @@ class SyncplayUserlist(object):
elif (room and file_): elif (room and file_):
duration = self.ui.formatTime(file_['duration']) duration = self.ui.formatTime(file_['duration'])
message = "<{}> is playing '{}' ({})".format(username, file_['name'], duration) message = "<{}> is playing '{}' ({})".format(username, file_['name'], duration)
if(self.currentUser.room <> room): if(self.currentUser.room <> room or self.currentUser.username == username):
message += " in room: '{}'".format(room) message += " in room: '{}'".format(room)
self.ui.showMessage(message) self.ui.showMessage(message)
if(self.currentUser.file and not self.currentUser.isFileSame(file_)): if(self.currentUser.file and not self.currentUser.isFileSame(file_)):
@ -362,11 +362,14 @@ class SyncplayUserlist(object):
elif (room and room != user.room): elif (room and room != user.room):
self.__showUserChangeMessage(username, room, None) self.__showUserChangeMessage(username, room, None)
def modUser(self, username, room, file_, noMessage = False): def modUser(self, username, room, file_):
if(self._users.has_key(username)): if(self._users.has_key(username)):
user = self._users[username] user = self._users[username]
if(not noMessage): self.__displayModUserMessage(username, room, file_, user)
self.__displayModUserMessage(username, room, file_, user) user.room = room
user.file = file_
elif(username == self.currentUser.username):
self.__showUserChangeMessage(username, room, file_)
else: else:
self.addUser(username, room, file_) self.addUser(username, room, file_)
@ -401,9 +404,9 @@ class SyncplayUserlist(object):
def __displayFileWatchersInRoomList(self, key, users): def __displayFileWatchersInRoomList(self, key, users):
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+">"
message = self.__addDifferentFileMessageIfNecessary(user, message) message = self.__addDifferentFileMessageIfNecessary(user, message)
self.ui.showMessage("\t<" + message + ">", True, True) self.ui.showMessage("\t" + message, True, True)
def __displayPeopleInRoomWithNoFile(self, noFileList): def __displayPeopleInRoomWithNoFile(self, noFileList):
if (noFileList): if (noFileList):

2
syncplay/protocols.py
View File

@ -87,8 +87,6 @@ class SyncClientProtocol(JSONCommandProtocol):
else: else:
self._client.setUsername(username) self._client.setUsername(username)
self._client.setRoom(roomName) self._client.setRoom(roomName)
message = "You have joined room {} as <{}>".format(roomName, username)
self._client.ui.showMessage(message)
self.logged = True self.logged = True
self._client.sendFile() self._client.sendFile()

5
syncplay/ui/consoleUI.py
View File

@ -6,6 +6,8 @@ import syncplay
import os import os
class ConsoleUI(threading.Thread): class ConsoleUI(threading.Thread):
RE_ROOM = re.compile("^room( (.+))?")
def __init__(self): def __init__(self):
self.promptMode = threading.Event() self.promptMode = threading.Event()
self.PromptResult = "" self.PromptResult = ""
@ -49,8 +51,7 @@ class ConsoleUI(threading.Thread):
print("ERROR:\t" + message) print("ERROR:\t" + message)
def _executeCommand(self, data): def _executeCommand(self, data):
RE_ROOM = re.compile("^room( (\w+))?") matched_room = self.RE_ROOM.match(data)
matched_room = RE_ROOM.match(data)
if matched_room: if matched_room:
room = matched_room.group(2) room = matched_room.group(2)
if room == None: if room == None: