Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix error when server run without --max-chat-message-length being set (
  • Loading branch information
Et0h authored and albertosottile committed Feb 12, 2018
1 parent 73c1419 commit 693a3d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions syncplay/client.py
Expand Up @@ -560,10 +560,14 @@ def checkForFeatureSupport(self, featureList):
elif not self.serverFeatures["sharedPlaylists"]:
self.ui.showErrorMessage(getMessage("shared-playlists-disabled-by-server-error"))
# TODO: Have messages for all unsupported & disabled features
constants.MAX_CHAT_MESSAGE_LENGTH = self.serverFeatures["maxChatMessageLength"]
constants.MAX_USERNAME_LENGTH = self.serverFeatures["maxUsernameLength"]
constants.MAX_ROOM_NAME_LENGTH = self.serverFeatures["maxRoomNameLength"]
constants.MAX_FILENAME_LENGTH = self.serverFeatures["maxFilenameLength"]
if self.serverFeatures["maxChatMessageLength"] is not None:
constants.MAX_CHAT_MESSAGE_LENGTH = self.serverFeatures["maxChatMessageLength"]
if self.serverFeatures["maxUsernameLength"] is not None:
constants.MAX_USERNAME_LENGTH = self.serverFeatures["maxUsernameLength"]
if self.serverFeatures["maxRoomNameLength"] is not None:
constants.MAX_ROOM_NAME_LENGTH = self.serverFeatures["maxRoomNameLength"]
if self.serverFeatures["maxFilenameLength"] is not None:
constants.MAX_FILENAME_LENGTH = self.serverFeatures["maxFilenameLength"]
constants.MPV_SYNCPLAYINTF_CONSTANTS_TO_SEND = ["MaxChatMessageLength={}".format(constants.MAX_CHAT_MESSAGE_LENGTH),
u"inputPromptStartCharacter={}".format(constants.MPV_INPUT_PROMPT_START_CHARACTER),
u"inputPromptEndCharacter={}".format(constants.MPV_INPUT_PROMPT_END_CHARACTER),
Expand Down
4 changes: 2 additions & 2 deletions syncplay/server.py
Expand Up @@ -27,7 +27,7 @@ def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None
self._motdFilePath = motdFilePath
self.disableReady = disableReady
self.disableChat = disableChat
self.maxChatMessageLength = maxChatMessageLength
self.maxChatMessageLength = maxChatMessageLength # if maxChatMessageLength is not None else constants.MAX_CHAT_MESSAGE_LENGTH
if not isolateRooms:
self._roomManager = RoomManager()
else:
Expand Down Expand Up @@ -548,4 +548,4 @@ def _prepareArgParser(self):
self._argparser.add_argument('--disable-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"))
self._argparser.add_argument('--max-chat-message-length', metavar='maxChatMessageLength', type=int, nargs='?',help=getMessage("server-chat-maxchars-argument").format(constants.MAX_CHAT_MESSAGE_LENGTH))
self._argparser.add_argument('--max-chat-message-length', metavar='maxChatMessageLength',type=int, nargs='?',help=getMessage("server-chat-maxchars-argument").format(constants.MAX_CHAT_MESSAGE_LENGTH))

0 comments on commit 693a3d9

Please sign in to comment.