From f4026816ee7d970b8532d86f71e0b72833bdfd73 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 14 Sep 2023 16:32:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=91=8D[Update]=20main=20Add=20callbac?= =?UTF-8?q?k=20ConfigWindow=20Open/Close?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/main.py b/main.py index d02f00a3..9e9c9333 100644 --- a/main.py +++ b/main.py @@ -49,6 +49,18 @@ def stopTranscriptionSendMessage(): model.stopMicTranscript() view.setMainWindowAllWidgetsStatusToNormal() +def startThreadingTranscriptionSendMessage(): + view.printToTextbox_enableTranscriptionSend() + th_startTranscriptionSendMessage = Thread(target=startTranscriptionSendMessage) + th_startTranscriptionSendMessage.daemon = True + th_startTranscriptionSendMessage.start() + +def stopThreadingTranscriptionSendMessage(): + view.printToTextbox_disableTranscriptionSend() + th_stopTranscriptionSendMessage = Thread(target=stopTranscriptionSendMessage) + th_stopTranscriptionSendMessage.daemon = True + th_stopTranscriptionSendMessage.start() + # func transcription receive message def receiveSpeakerMessage(message): if len(message) > 0: @@ -83,6 +95,18 @@ def stopTranscriptionReceiveMessage(): model.stopSpeakerTranscript() view.setMainWindowAllWidgetsStatusToNormal() +def startThreadingTranscriptionReceiveMessage(): + view.printToTextbox_enableTranscriptionReceive() + th_startTranscriptionReceiveMessage = Thread(target=startTranscriptionReceiveMessage) + th_startTranscriptionReceiveMessage.daemon = True + th_startTranscriptionReceiveMessage.start() + +def stopThreadingTranscriptionReceiveMessage(): + view.printToTextbox_disableTranscriptionReceive() + th_stopTranscriptionReceiveMessage = Thread(target=stopTranscriptionReceiveMessage) + th_stopTranscriptionReceiveMessage.daemon = True + th_stopTranscriptionReceiveMessage.start() + # func message box def sendChatMessage(message): if len(message) > 0: @@ -184,29 +208,17 @@ def callbackToggleTranscriptionSend(is_turned_on): view.setMainWindowAllWidgetsStatusToDisabled() config.ENABLE_TRANSCRIPTION_SEND = is_turned_on if config.ENABLE_TRANSCRIPTION_SEND is True: - view.printToTextbox_enableTranscriptionSend() - th_startTranscriptionSendMessage = Thread(target=startTranscriptionSendMessage) - th_startTranscriptionSendMessage.daemon = True - th_startTranscriptionSendMessage.start() + startThreadingTranscriptionSendMessage() else: - view.printToTextbox_disableTranscriptionSend() - th_stopTranscriptionSendMessage = Thread(target=stopTranscriptionSendMessage) - th_stopTranscriptionSendMessage.daemon = True - th_stopTranscriptionSendMessage.start() + stopThreadingTranscriptionSendMessage() def callbackToggleTranscriptionReceive(is_turned_on): view.setMainWindowAllWidgetsStatusToDisabled() config.ENABLE_TRANSCRIPTION_RECEIVE = is_turned_on if config.ENABLE_TRANSCRIPTION_RECEIVE is True: - view.printToTextbox_enableTranscriptionReceive() - th_startTranscriptionReceiveMessage = Thread(target=startTranscriptionReceiveMessage) - th_startTranscriptionReceiveMessage.daemon = True - th_startTranscriptionReceiveMessage.start() + startThreadingTranscriptionReceiveMessage() else: - view.printToTextbox_disableTranscriptionReceive() - th_stopTranscriptionReceiveMessage = Thread(target=stopTranscriptionReceiveMessage) - th_stopTranscriptionReceiveMessage.daemon = True - th_stopTranscriptionReceiveMessage.start() + stopThreadingTranscriptionReceiveMessage() def callbackToggleForeground(is_turned_on): config.ENABLE_FOREGROUND = is_turned_on @@ -217,8 +229,19 @@ def callbackToggleForeground(is_turned_on): view.printToTextbox_disableForeground() view.foregroundOff() - # Config Window +def callbackOpenConfigWindow(): + if config.ENABLE_TRANSCRIPTION_SEND is True: + stopThreadingTranscriptionSendMessage() + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: + stopThreadingTranscriptionReceiveMessage() + +def callbackCloseConfigWindow(): + if config.ENABLE_TRANSCRIPTION_SEND is True: + startThreadingTranscriptionSendMessage() + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: + startThreadingTranscriptionReceiveMessage() + # Compact Mode Switch def callbackEnableConfigWindowCompactMode(): config.IS_CONFIG_WINDOW_COMPACT_MODE = True From bf263c91d593cd0ba98e1dd680f33da7680ec903 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 14 Sep 2023 17:29:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20model=20=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=E5=A4=89=E6=95=B0=E3=82=92=E9=96=93?= =?UTF-8?q?=E9=81=95=E3=81=88=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit del self.translator -> del self.keyword_processor --- model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model.py b/model.py index 46ac13ea..ceef0686 100644 --- a/model.py +++ b/model.py @@ -67,7 +67,7 @@ class Model: self.translator = Translator() def resetKeywordProcessor(self): - del self.translator + del self.keyword_processor self.keyword_processor = KeywordProcessor() def authenticationTranslator(self, fnc, choice_translator=None, auth_key=None): From af1396876d130b09003daadb0b76d5e050951578 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 14 Sep 2023 17:32:18 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20config=20config.json?= =?UTF-8?q?=E3=81=8CUnicode=E3=82=A8=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=97?= =?UTF-8?q?=E3=81=A7=E4=BF=9D=E5=AD=98=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config.py b/config.py index a47cd8b6..3c30c647 100644 --- a/config.py +++ b/config.py @@ -12,11 +12,11 @@ from models.transcription.transcription_languages import transcription_lang from models.transcription.transcription_utils import getInputDevices, getOutputDevices, getDefaultInputDevice, getDefaultOutputDevice def saveJson(path, key, value): - with open(path, "r") as fp: + with open(path, "r", encoding="utf-8") as fp: json_data = load(fp) json_data[key] = value - with open(path, "w") as fp: - dump(json_data, fp, indent=4) + with open(path, "w", encoding="utf-8") as fp: + json_dump(json_data, fp, indent=4, ensure_ascii=False) class Config: _instance = None @@ -543,13 +543,13 @@ class Config: def load_config(self): if os_path.isfile(self.PATH_CONFIG) is not False: - with open(self.PATH_CONFIG, 'r') as fp: + with open(self.PATH_CONFIG, 'r', encoding="utf-8") as fp: config = json_load(fp) for key in config.keys(): setattr(self, key, config[key]) - with open(self.PATH_CONFIG, 'w') as fp: + with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp: setter_methods = [ name for name, obj in vars(type(self)).items() if isinstance(obj, property) and obj.fset is not None @@ -557,6 +557,6 @@ class Config: config = {} for method in setter_methods: config[method] = getattr(self, method) - json_dump(config, fp, indent=4) + json_dump(config, fp, indent=4, ensure_ascii=False) config = Config() \ No newline at end of file From 9aeea214983818674d046b9bc5da1c2b6d4e0664 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Fri, 15 Sep 2023 06:43:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=91=8D[Update]=20main=20add=20stop=20?= =?UTF-8?q?check=20Energy=20function=20for=20callbackCloseConfigWindow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index 9e9c9333..8ac04026 100644 --- a/main.py +++ b/main.py @@ -241,6 +241,8 @@ def callbackCloseConfigWindow(): startThreadingTranscriptionSendMessage() if config.ENABLE_TRANSCRIPTION_RECEIVE is True: startThreadingTranscriptionReceiveMessage() + model.stopCheckMicEnergy() + model.stopCheckSpeakerEnergy() # Compact Mode Switch def callbackEnableConfigWindowCompactMode():