From 870e276ec5e317e97237edeb7872792cd99855f2 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 19 Dec 2023 23:45:11 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20controller.py=20Message=20format?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=A7=E3=80=81=E5=85=B1=E9=80=9A=E3=81=97?= =?UTF-8?q?=E3=81=9F=E5=87=A6=E7=90=86=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/controller.py b/controller.py index f713ff9b..7f4a0db4 100644 --- a/controller.py +++ b/controller.py @@ -23,6 +23,23 @@ def callbackFilepathConfigFile(): print("callbackFilepathConfigFile", config.LOCAL_PATH.replace('/', '\\')) Popen(['explorer', config.LOCAL_PATH.replace('/', '\\')], shell=True) +def messageFormatter(format_type:str, translation, message): + if format_type == "RECEIVED": + FORMAT_WITH_T = config.RECEIVED_MESSAGE_FORMAT_WITH_T + FORMAT = config.RECEIVED_MESSAGE_FORMAT + elif format_type == "SEND": + FORMAT_WITH_T = config.SEND_MESSAGE_FORMAT_WITH_T + FORMAT = config.SEND_MESSAGE_FORMAT + else: + raise ValueError("format_type is not found", format_type) + + if len(translation) > 0: + osc_message = FORMAT_WITH_T.replace("[message]", message) + osc_message = osc_message.replace("[translation]", translation) + else: + osc_message = FORMAT.replace("[message]", message) + return osc_message + # func transcription send message def sendMicMessage(message): if len(message) > 0: @@ -41,11 +58,7 @@ def sendMicMessage(message): if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_SEND_MESSAGE_TO_VRC is True: - if len(translation) > 0: - osc_message = config.SEND_MESSAGE_FORMAT_WITH_T.replace("[message]", message) - osc_message = osc_message.replace("[translation]", translation) - else: - osc_message = config.SEND_MESSAGE_FORMAT.replace("[message]", message) + osc_message = messageFormatter("SEND", translation, message) model.oscSendMessage(osc_message) view.printToTextbox_SentMessage(message, translation) @@ -105,21 +118,13 @@ def receiveSpeakerMessage(message): if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_NOTICE_XSOVERLAY is True: - if len(translation) > 0: - xsoverlay_message = config.RECEIVED_MESSAGE_FORMAT_WITH_T.replace("[message]", message) - xsoverlay_message = xsoverlay_message.replace("[translation]", translation) - else: - xsoverlay_message = config.RECEIVED_MESSAGE_FORMAT.replace("[message]", message) + xsoverlay_message = messageFormatter("RECEIVED", translation, message) model.notificationXSOverlay(xsoverlay_message) # ------------Speaker2Chatbox------------ # send OSC message if config.ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC is True: - if len(translation) > 0: - osc_message = config.RECEIVED_MESSAGE_FORMAT_WITH_T.replace("[message]", message) - osc_message = osc_message.replace("[translation]", translation) - else: - osc_message = config.RECEIVED_MESSAGE_FORMAT.replace("[message]", message) + osc_message = messageFormatter("RECEIVED", translation, message) model.oscSendMessage(osc_message) # ------------Speaker2Chatbox------------ @@ -182,11 +187,7 @@ def sendChatMessage(message): # send OSC message if config.ENABLE_SEND_MESSAGE_TO_VRC is True: - if len(translation) > 0: - osc_message = config.SEND_MESSAGE_FORMAT_WITH_T.replace("[message]", message) - osc_message = osc_message.replace("[translation]", translation) - else: - osc_message = config.SEND_MESSAGE_FORMAT.replace("[message]", message) + osc_message = messageFormatter("SEND", translation, message) model.oscSendMessage(osc_message) # update textbox message log (Sent)