From 34ed7816995d750cea34d33046dfb9766a2db666 Mon Sep 17 00:00:00 2001 From: Etoh Date: Wed, 4 Jan 2023 19:04:29 +0000 Subject: [PATCH] Expand UTF-8 --- syncplay/client.py | 2 +- syncplay/clientManager.py | 2 +- syncplay/ep_client.py | 1 + syncplay/ep_server.py | 1 + syncplay/messages.py | 15 +++++++++++++++ syncplay/players/basePlayer.py | 1 + syncplay/players/iina.py | 1 + syncplay/players/ipc_iina.py | 1 + syncplay/players/mpc.py | 2 +- syncplay/players/mpcbe.py | 2 +- syncplay/players/mpvnet.py | 1 + syncplay/players/playerFactory.py | 1 + syncplay/players/vlc.py | 2 +- syncplay/protocols.py | 15 ++++++++++++--- syncplay/server.py | 1 + syncplay/ui/ConfigurationGetter.py | 2 +- syncplay/ui/GuiConfiguration.py | 2 +- syncplay/ui/consoleUI.py | 2 +- syncplay/ui/gui.py | 2 +- syncplay/utils.py | 2 +- .../python_mpv_jsonipc/python_mpv_jsonipc.py | 3 +-- syncplayClient.py | 2 +- syncplayServer.py | 2 +- 23 files changed, 48 insertions(+), 17 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 0b105e0..44f588e 100755 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -1,4 +1,4 @@ - +# coding:utf8 import ast import collections import hashlib diff --git a/syncplay/clientManager.py b/syncplay/clientManager.py index b2caafa..f222226 100755 --- a/syncplay/clientManager.py +++ b/syncplay/clientManager.py @@ -1,4 +1,4 @@ - +# coding:utf8 from syncplay import ui from syncplay.messages import getMessage from syncplay.ui.ConfigurationGetter import ConfigurationGetter diff --git a/syncplay/ep_client.py b/syncplay/ep_client.py index f93793b..6d1a93f 100644 --- a/syncplay/ep_client.py +++ b/syncplay/ep_client.py @@ -1,3 +1,4 @@ +# coding:utf8 import sys from syncplay.clientManager import SyncplayClientManager diff --git a/syncplay/ep_server.py b/syncplay/ep_server.py index 548ddd0..12ea6c2 100644 --- a/syncplay/ep_server.py +++ b/syncplay/ep_server.py @@ -1,3 +1,4 @@ +# coding:utf8 import sys from twisted.internet import reactor diff --git a/syncplay/messages.py b/syncplay/messages.py index f0f891c..75d6121 100755 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -73,6 +73,21 @@ def getMissingStrings(): return missingStrings +def listMessages(languages): + languageNames = [] + for language in languages: + languageNames.append(messages[language]["LANGUAGE"]) + comparison = "Listing Syncplay messages in the following languages: {}.\n".format(", ".join(languageNames)) + for message in messages["en"]: + comparison = comparison + "[{}]\n".format(message) + for language in languages: + languageName = messages[language]["LANGUAGE"] + messageText = messages[language][message] if message in messages[language] else "" + comparison = comparison + "{}: {}\n".format(languageName, messageText) + comparison = comparison + "\n" + return comparison + +# print(listMessages(["en","fi"])) def getInitialLanguage(): try: diff --git a/syncplay/players/basePlayer.py b/syncplay/players/basePlayer.py index 8067c13..bfee0aa 100755 --- a/syncplay/players/basePlayer.py +++ b/syncplay/players/basePlayer.py @@ -1,3 +1,4 @@ +# coding:utf8 from syncplay import constants diff --git a/syncplay/players/iina.py b/syncplay/players/iina.py index 12ee2c3..b697492 100644 --- a/syncplay/players/iina.py +++ b/syncplay/players/iina.py @@ -1,3 +1,4 @@ +# coding:utf8 import os from syncplay import constants from syncplay.utils import findResourcePath diff --git a/syncplay/players/ipc_iina.py b/syncplay/players/ipc_iina.py index 3c16fb6..a698f0c 100755 --- a/syncplay/players/ipc_iina.py +++ b/syncplay/players/ipc_iina.py @@ -1,3 +1,4 @@ +# coding:utf8 import os.path import subprocess import time diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index 84ae840..c320a7a 100755 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -1,4 +1,4 @@ - +# coding:utf8 import os.path import re import time diff --git a/syncplay/players/mpcbe.py b/syncplay/players/mpcbe.py index ff11ab7..a6c14dc 100755 --- a/syncplay/players/mpcbe.py +++ b/syncplay/players/mpcbe.py @@ -1,4 +1,4 @@ - +# coding:utf8 import os.path from syncplay import constants diff --git a/syncplay/players/mpvnet.py b/syncplay/players/mpvnet.py index ef28d18..7640f80 100644 --- a/syncplay/players/mpvnet.py +++ b/syncplay/players/mpvnet.py @@ -1,3 +1,4 @@ +# coding:utf8 import os from syncplay import constants from syncplay.players.mpv import MpvPlayer diff --git a/syncplay/players/playerFactory.py b/syncplay/players/playerFactory.py index 2171d4e..83ed60d 100755 --- a/syncplay/players/playerFactory.py +++ b/syncplay/players/playerFactory.py @@ -1,3 +1,4 @@ +# coding:utf8 import syncplay.players diff --git a/syncplay/players/vlc.py b/syncplay/players/vlc.py index b60bb62..a678574 100755 --- a/syncplay/players/vlc.py +++ b/syncplay/players/vlc.py @@ -1,4 +1,4 @@ - +# coding:utf8 import os import random import re diff --git a/syncplay/protocols.py b/syncplay/protocols.py index 53cdaf3..5eada71 100755 --- a/syncplay/protocols.py +++ b/syncplay/protocols.py @@ -99,12 +99,21 @@ class SyncClientProtocol(JSONCommandProtocol): try: if "Invalid DNS-ID" in str(reason.value): self._client._serverSupportsTLS = False - elif "tlsv1 alert protocol version" in str(reason.value): + elif "atlsv1 alert protocol version" in str(reason.value): self._client._clientSupportsTLS = False - elif "certificate verify failed" in str(reason.value): + elif "acertificate verify failed" in str(reason.value): self.dropWithError(getMessage("startTLS-server-certificate-invalid")) - elif "mismatched_id=DNS_ID" in str(reason.value): + elif "amismatched_id=DNS_ID" in str(reason.value): self.dropWithError(getMessage("startTLS-server-certificate-invalid-DNS-ID")) + elif reason: + try: + self._client.ui.showErrorMessage(str(type(reason))) + self._client.ui.showErrorMessage(str(reason)) + if reason.stack: + self._client.ui.showErrorMessage(str(reason.stack)) + self._client.ui.showErrorMessage(str(reason.value)) + except: + pass except: pass self._client.destroyProtocol() diff --git a/syncplay/server.py b/syncplay/server.py index 66e9888..935a249 100755 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -1,3 +1,4 @@ +# coding:utf8 import argparse import codecs import hashlib diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index d55fbd4..38b78aa 100755 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -1,4 +1,4 @@ - +# coding:utf8 import argparse import ast import codecs diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index c5d0512..c1864bb 100755 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -1,4 +1,4 @@ - +# coding:utf8 import os import sys import threading diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py index 5ea9819..41ba3d7 100755 --- a/syncplay/ui/consoleUI.py +++ b/syncplay/ui/consoleUI.py @@ -1,4 +1,4 @@ - +# coding:utf8 import re import sys import threading diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index 36c3355..727fe1d 100755 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -1,4 +1,4 @@ - +# coding:utf8 import os import re import sys diff --git a/syncplay/utils.py b/syncplay/utils.py index 034a625..3d60eb9 100755 --- a/syncplay/utils.py +++ b/syncplay/utils.py @@ -1,4 +1,4 @@ - +# coding:utf8 import ast import datetime import hashlib diff --git a/syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py b/syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py index 87224fa..e69c087 100644 --- a/syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py +++ b/syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py @@ -1,3 +1,4 @@ +# coding:utf8 import threading import socket import json @@ -85,8 +86,6 @@ class WindowsSocket(threading.Thread): try: self.socket.send_bytes(json.dumps(data).encode('utf-8') + b'\n') except OSError as ex: - if len(ex.args) == 1 and ex.args[0] == "handle is closed": - raise BrokenPipeError("handle is closed") raise ex def run(self): diff --git a/syncplayClient.py b/syncplayClient.py index 2f40d78..0b66fa3 100755 --- a/syncplayClient.py +++ b/syncplayClient.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 - +# coding:utf8 import sys # libpath diff --git a/syncplayServer.py b/syncplayServer.py index 369714f..ff3f4f0 100755 --- a/syncplayServer.py +++ b/syncplayServer.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -#coding:utf8 +# coding:utf8 import sys