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

Merge 43efc4339bef75e750f6ecbe7bad1dcc43317775 into dd6edb7a61f5e60976766ed784ce3b6488b5c603

Browse Source
This commit is contained in:
Abhay Raizada 2016-01-20 20:40:19 +00:00
commit 3b974d6ede
7 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/client.py
View File

@ -454,7 +454,11 @@ class SyncplayClient(object):
self.userlist.currentUser.room = roomName
if resetAutoplay:
self.resetAutoPlayState()
def sendChat(self,message):
if self._protocol and self._protocol.logged:
self._protocol.sendChatMessage(message)
def sendRoom(self):
room = self.userlist.currentUser.room
if self._protocol and self._protocol.logged and room:

1
syncplay/constants.py
View File

@ -60,6 +60,7 @@ FILENAME_STRIP_REGEX = u"[-~_\.\[\](): ]"
CONTROL_PASSWORD_STRIP_REGEX = u"[^a-zA-Z0-9\-]"
ROOM_NAME_STRIP_REGEX = u"^(\+)(?P<roomnamebase>.*)(:)(\w{12})$"
COMMANDS_UNDO = ["u", "undo", "revert"]
COMMANDS_CHAT = ["ch","chat"]
COMMANDS_LIST = ["l", "list", "users"]
COMMANDS_PAUSE = ["p", "play", "pause"]
COMMANDS_ROOM = ["r", "room"]

2
syncplay/messages.py
View File

@ -82,6 +82,7 @@ en = {
"commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not",
"commandlist-notification/create" : "\tc [name] - create managed room using name of current room",
"commandlist-notification/auth" : "\ta [password] - authenticate as room operator with operator password",
"commandlist-notification/chat" : "\tch [message] - send a chat message in a room",
"syncplay-version-notification" : "Syncplay version: {}", # syncplay.version
"more-info-notification" : "More info available at: {}", # projectURL
@ -358,6 +359,7 @@ en = {
"server-salt-argument" : "random string used to generate managed room passwords",
"server-disable-ready-argument" : u"disable readiness feature",
"server-motd-argument": "path to file from which motd will be fetched",
"server-chat-argument" : "Should chat be enabled?",
"server-messed-up-motd-unescaped-placeholders": "Message of the Day has unescaped placeholders. All $ signs should be doubled ($$).",
"server-messed-up-motd-too-long": "Message of the Day is too long - maximum of {} chars, {} given.",

12
syncplay/protocols.py
View File

@ -22,6 +22,8 @@ class JSONCommandProtocol(LineReceiver):
self.handleState(message[1])
elif command == "Error":
self.handleError(message[1])
elif command == "Chat":
self.handleChat(message[1])
else:
self.dropWithError(getMessage("unknown-command-server-error").format(message[1])) # TODO: log, not drop
@ -153,7 +155,8 @@ class SyncClientProtocol(JSONCommandProtocol):
def sendFileSetting(self, file_):
self.sendSet({"file": file_})
self.sendList()
def sendChatMessage(self,chatMessage):
self.sendMessage({"Chat": chatMessage})
def handleList(self, userList):
self._client.userlist.clearList()
for room in userList.iteritems():
@ -238,6 +241,10 @@ class SyncClientProtocol(JSONCommandProtocol):
"password": password
}
})
def handleChat(self,message):
messageString = '<'+message['username']+'>'+message['message']
self._client.ui.showMessage(messageString)
#TODO
def setReady(self, isReady, manuallyInitiated=True):
self.sendSet({
@ -326,6 +333,9 @@ class SyncServerProtocol(JSONCommandProtocol):
self._factory.addWatcher(self, username, roomName)
self._logged = True
self.sendHello(version)
def handleChat(self,chatMessage):
if self._factory.chat:
self._factory.sendChat(self._watcher,chatMessage)
def setWatcher(self, watcher):
self._watcher = watcher

11
syncplay/server.py
View File

@ -14,7 +14,7 @@ import argparse
from syncplay.utils import RoomPasswordProvider, NotControlledRoom, RandomStringGenerator, meetsMinVersion
class SyncFactory(Factory):
def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False):
def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False,chat =False):
print getMessage("welcome-server-notification").format(syncplay.version)
if password:
password = hashlib.md5(password).hexdigest()
@ -25,6 +25,7 @@ class SyncFactory(Factory):
self._salt = salt
self._motdFilePath = motdFilePath
self.disableReady = disableReady
self.chat=chat
if not isolateRooms:
self._roomManager = RoomManager()
else:
@ -128,6 +129,10 @@ class SyncFactory(Factory):
except ValueError:
self._roomManager.broadcastRoom(watcher, lambda w: w.sendControlledRoomAuthStatus(False, watcher.getName(), room._name))
def sendChat(self,watcher,message):
messageDict={"message":message,"username" : watcher.getName()}
self._roomManager.broadcastRoom(watcher, lambda w: w.sendChatMessage(messageDict))
def setReady(self, watcher, isReady, manuallyInitiated=True):
watcher.setReady(isReady)
self._roomManager.broadcastRoom(watcher, lambda w: w.sendSetReady(watcher.getName(), watcher.isReady(), manuallyInitiated))
@ -367,6 +372,9 @@ class Watcher(object):
def sendControlledRoomAuthStatus(self, success, username, room):
self._connector.sendControlledRoomAuthStatus(success, username, room)
def sendChatMessage(self,message):
self._connector.sendMessage({"Chat" : message})
def sendSetReady(self, username, isReady, manuallyInitiated=True):
self._connector.sendSetReady(username, isReady, manuallyInitiated)
@ -441,5 +449,6 @@ class ConfigurationGetter(object):
self._argparser.add_argument('--password', metavar='password', type=str, nargs='?', help=getMessage("server-password-argument"))
self._argparser.add_argument('--isolate-rooms', action='store_true', help=getMessage("server-isolate-room-argument"))
self._argparser.add_argument('--disable-ready', action='store_true', help=getMessage("server-disable-ready-argument"))
self._argparser.add_argument('--chat', action='store_true', help=getMessage("server-chat-argument"))
self._argparser.add_argument('--salt', metavar='salt', type=str, nargs='?', help=getMessage("server-salt-argument"))
self._argparser.add_argument('--motd-file', metavar='file', type=str, nargs='?', help=getMessage("server-motd-argument"))

4
syncplay/ui/consoleUI.py
View File

@ -134,6 +134,9 @@ class ConsoleUI(threading.Thread):
self._syncplayClient.playerPositionBeforeLastSeek = tmp_pos
elif command.group('command') in constants.COMMANDS_LIST:
self._syncplayClient.getUserList()
elif command.group('command') in constants.COMMANDS_CHAT:
message= command.group('parameter')
self._syncplayClient.sendChat(message)
elif command.group('command') in constants.COMMANDS_PAUSE:
self._syncplayClient.setPaused(not self._syncplayClient.getPlayerPaused())
elif command.group('command') in constants.COMMANDS_ROOM:
@ -172,6 +175,7 @@ class ConsoleUI(threading.Thread):
self.showMessage(getMessage("commandlist-notification/toggle"), True)
self.showMessage(getMessage("commandlist-notification/create"), True)
self.showMessage(getMessage("commandlist-notification/auth"), True)
self.showMessage(getMessage("commandlist-notification/chat"), True)
self.showMessage(getMessage("syncplay-version-notification").format(syncplay.version), True)
self.showMessage(getMessage("more-info-notification").format(syncplay.projectURL), True)

3
syncplayServer.py
View File

@ -19,6 +19,5 @@ from syncplay.server import SyncFactory, ConfigurationGetter
if __name__ == '__main__':
argsGetter = ConfigurationGetter()
args = argsGetter.getConfiguration()
reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready))
reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready,args.chat))
reactor.run()