Merge branch 'master_local' into qtpy-pyside2

resources/syncplayintf.lua

@@ -60,6 +60,25 @@ local line = ''
 local cursor = 1
 local key_hints_enabled = false
 
+non_us_chars = {
+    'ą','ć','ę','ł','ń','ś','ź','ż','Ą','Ć','Ę','Ł','Ń','Ś','Ź','Ż',
+    'à','è','ì','ò','ù','À','È','Ì','Ò','Ù',
+    'á', 'é', 'í', 'ó', 'ú', 'ý', 'Á', 'É', 'Í', 'Ó', 'Ú', 'Ý',
+    'â', 'ê', 'î', 'ô', 'û', 'Â', 'Ê', 'Î', 'Ô', 'Û',
+    'ã', 'ñ', 'õ', 'Ã', 'Ñ', 'Õ',
+    'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'Ÿ',
+    'å', 'Å','æ','Æ','œ','Œ','ç','Ç','ð','Ð','ø','Ø','¿','¡','ß',
+    '¤','†','×','÷','‡','±','—','–','¶','§','ˆ','˜','«','»','¦','‰','©','®','™',
+    'ž','Ž',
+    'ª','Þ','þ','ƒ','µ','°','º','•','„','“','…','¬','¥','£','€','¢','¹','²','³','½','¼','¾',
+    '·','Ĉ','ĉ','Ĝ','ĝ','Ĥ','ĥ','Ĵ','ĵ','Ŝ','ŝ','Ŭ','ŭ',
+    'Б','б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж','ж','З','з',
+    'И','и','Й','й','К','к','Л','л','М','м','Н','н','О','о','П','п',
+    'Р','р','С','с','Т','т','У','у','Ф','ф','Х','х','Ц','ц','Ч','ч',
+    'Ш','ш','Щ','щ','Ъ','ъ','Ы','ы','Ь','ь','Э','э','Ю','ю','Я','я',
+    '≥','≠'
+}
+
 function format_scrolling(xpos, ypos, text)
 	local chat_message = "\n"..chat_format .. "{\\pos("..xpos..","..ypos..")\\q2}"..text.."\\N\\n"
     return string.format(chat_message)
@@ -891,6 +910,7 @@ function add_specialalphabindings(charinput)
     local alphabindingarray = charinput
 	for i, alphabinding in ipairs(alphabindingarray) do
     	alpharowbindings[#alpharowbindings + 1] = {alphabinding, function() handle_char_input(alphabinding) end }
+	    bindings[#bindings + 1] = {alphabinding, function() handle_char_input(alphabinding) end}
 	end
 end
 
@@ -912,22 +932,7 @@ add_alpharowbinding('~','~')
 add_alpharowbinding('\'','\'')
 add_alpharowbinding('@','@')
 
-add_specialalphabindings({'à','è','ì','ò','ù','À','È','Ì','Ò','Ù'})
-add_specialalphabindings({'á', 'é', 'í', 'ó', 'ú', 'ý', 'Á', 'É', 'Í', 'Ó', 'Ú', 'Ý'})
-add_specialalphabindings({'â', 'ê', 'î', 'ô', 'û', 'Â', 'Ê', 'Î', 'Ô', 'Û'})
-add_specialalphabindings({'ã', 'ñ', 'õ', 'Ã', 'Ñ', 'Õ'})
-add_specialalphabindings({'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'Ÿ'})
-add_specialalphabindings({'å', 'Å','æ','Æ','œ','Œ','ç','Ç','ð','Ð','ø','Ø','¿','¡','ß'})
-add_specialalphabindings({'¤','†','×','÷','‡','±','—','–','¶','§','ˆ','˜','«','»','¦','‰','©','®','™'})
-add_specialalphabindings({'ž','Ž'})
-add_specialalphabindings({'ª','Þ','þ','ƒ','µ','°','º','•','„','“','…','¬','¥','£','€','¢','¹','²','³','½','¼','¾'})
-add_specialalphabindings({'·','Ĉ','ĉ','Ĝ','ĝ','Ĥ','ĥ','Ĵ','ĵ','Ŝ','ŝ','Ŭ','ŭ'})
-add_specialalphabindings({'Б','б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж','ж','З','з'})
-add_specialalphabindings({'И','и','Й','й','К','к','Л','л','М','м','Н','н','О','о','П','п'})
-add_specialalphabindings({'Р','р','С','с','Т','т','У','у','Ф','ф','Х','х','Ц','ц','Ч','ч'})
-add_specialalphabindings({'Ш','ш','Щ','щ','Ъ','ъ','Ы','ы','Ь','ь','Э','э','Ю','ю','Я','я'})
-add_specialalphabindings({'≥','≠'})
-
+add_specialalphabindings(non_us_chars)
 add_repl_bindings(bindings)
 
 -- Add a script-message to show the REPL and fill it with the provided text

syncplay/__init__.py

@@ -1,4 +1,4 @@
 version = '1.5.2'
 milestone = 'Yoitsu'
-release_number = '55'
+release_number = '56'
 projectURL = 'http://syncplay.pl/'

syncplay/messages_de.py

@@ -431,6 +431,7 @@ de = {
     "server-disable-ready-argument" : u"Bereitschaftsfeature deaktivieren",
     "server-motd-argument": u"Pfad zur Datei, von der die Nachricht des Tages geladen wird",
     "server-chat-argument" : "Should chat be disabled?", # TODO: Translate
+    "server-chat-maxchars-argument": u"Maximum number of characters in a chat message (default is {})",  # TODO: Translate
     "server-messed-up-motd-unescaped-placeholders": u"Die Nachricht des Tages hat unmaskierte Platzhalter. Alle $-Zeichen sollten verdoppelt werden ($$).",
     "server-messed-up-motd-too-long": u"Die Nachricht des Tages ist zu lang - Maximal {} Zeichen, aktuell {}.",
 

syncplay/messages_en.py

@@ -435,6 +435,7 @@ en = {
     "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 disabled?",
+    "server-chat-maxchars-argument" : u"Maximum number of characters in a chat message (default is {})", # Default number of characters
     "server-messed-up-motd-unescaped-placeholders": "Message of the Day has unescaped placeholders. All $ signs should be doubled ($$).",
     "server-messed-up-motd-too-long": u"Message of the Day is too long - maximum of {} chars, {} given.",
 

syncplay/messages_ru.py

@@ -437,6 +437,7 @@ ru = {
     "server-disable-ready-argument" : u"отключить статусы готов/не готов",
     "server-motd-argument" : u"путь к файлу, из которого будет извлекаться MOTD-сообщение",
     "server-chat-argument" : "Should chat be disabled?", # TODO: Translate
+    "server-chat-maxchars-argument": u"Maximum number of characters in a chat message (default is {})",  # TODO: Translate
     "server-messed-up-motd-unescaped-placeholders" : u"MOTD-сообщение содержит неэкранированные спец.символы. Все знаки $ должны быть продублированы ($$).",
     "server-messed-up-motd-too-long" : u"MOTD-сообщение слишком длинное: максимальная длина - {} символ(ов), текущая длина - {} символ(ов).",
 

syncplay/server.py

@@ -14,7 +14,7 @@ import argparse
 from syncplay.utils import RoomPasswordProvider, NotControlledRoom, RandomStringGenerator, meetsMinVersion, playlistIsValid, truncateText
 
 class SyncFactory(Factory):
-    def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False,disableChat=False):
+    def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False,disableChat=False, maxChatMessageLength=constants.MAX_CHAT_MESSAGE_LENGTH):
         self.isolateRooms = isolateRooms
         print getMessage("welcome-server-notification").format(syncplay.version)
         if password:
@@ -27,6 +27,7 @@ class SyncFactory(Factory):
         self._motdFilePath = motdFilePath
         self.disableReady = disableReady
         self.disableChat = disableChat
+        self.maxChatMessageLength = maxChatMessageLength
         if not isolateRooms:
             self._roomManager = RoomManager()
         else:
@@ -48,7 +49,7 @@ class SyncFactory(Factory):
         features["readiness"] = not self.disableReady
         features["managedRooms"] = True
         features["chat"] = not self.disableChat
-        features["maxChatMessageLength"] = constants.MAX_CHAT_MESSAGE_LENGTH
+        features["maxChatMessageLength"] = self.maxChatMessageLength
         features["maxUsernameLength"] = constants.MAX_USERNAME_LENGTH
         features["maxRoomNameLength"] = constants.MAX_ROOM_NAME_LENGTH
         features["maxFilenameLength"] = constants.MAX_FILENAME_LENGTH
@@ -547,3 +548,4 @@ class ConfigurationGetter(object):
         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))

syncplayServer.py

@@ -19,5 +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,args.disable_chat))
+    reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready,args.disable_chat, args.max_chat_message_length))
     reactor.run()