From ae18c92a5a9955e166b0db741ad7b528af32862b Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Thu, 19 Sep 2024 11:43:24 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model:=20?= =?UTF-8?q?=E8=A8=80=E8=AA=9E=E3=82=B9=E3=83=AF=E3=83=83=E3=83=97=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3/=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=AD=A3=E3=81=AB=E4=BC=B4=E3=81=84=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AE=E5=86=85=E5=AE=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_controller.py | 18 ++++---- src-python/webui_mainloop.py | 80 +++++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 49067713..ee7b0815 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -466,15 +466,17 @@ def setTargetLanguageAndCountry(select:dict, *args, **kwargs) -> dict: def swapYourLanguageAndTargetLanguage(*args, **kwargs) -> dict: printLog("swapYourLanguageAndTargetLanguage") - your_language = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] - your_language_primary = your_language["primary"] - target_language = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] - target_language_primary = target_language["primary"] + your_languages = config.SELECTED_TAB_YOUR_LANGUAGES + your_language_primary = your_languages[config.SELECTED_TAB_NO]["primary"] - your_language["primary"] = target_language_primary - target_language["primary"] = your_language_primary - setYourLanguageAndCountry(your_language) - setTargetLanguageAndCountry(target_language) + target_languages = config.SELECTED_TAB_TARGET_LANGUAGES + target_language_primary = target_languages[config.SELECTED_TAB_NO]["primary"] + + your_languages[config.SELECTED_TAB_NO]["primary"] = target_language_primary + target_languages[config.SELECTED_TAB_NO]["primary"] = your_language_primary + + setYourLanguageAndCountry(your_languages) + setTargetLanguageAndCountry(target_languages) return { "status":200, "result":{ diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 62b6c0d3..35c352e1 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -398,7 +398,7 @@ if __name__ == "__main__": for key in controller_mapping.keys(): controller_mapping[key]["status"] = True - process = "main" + process = "test_all" match process: case "main": main.loop() @@ -425,29 +425,77 @@ if __name__ == "__main__": # handleControllerRequest("/controller/callback_enable_translation") # handleControllerRequest("/controller/callback_enable_convert_message_to_romaji") data = {"id":"123456", "message":"ใƒ†ใ‚นใƒˆ"} - case "/controller/callback_selected_translation_engine": - data = "DeepL" + case "/controller/callback_set_translation_engines": + data = { + "1":"CTranslate2", + "2":"CTranslate2", + "3":"CTranslate2", + } case "/controller/set_your_language_and_country": data = { - "primary": { + "1":{ + "primary":{ "language": "English", "country": "Hong Kong" - } + }, + }, + "2":{ + "primary":{ + "language":"Japanese", + "country":"Japan" + }, + }, + "3":{ + "primary":{ + "language":"Japanese", + "country":"Japan" + }, + }, } case "/controller/set_target_language_and_country": - data = { - "primary": { - "language": "Japanese", - "country": "Japan" + data ={ + "1":{ + "primary": { + "language": "Japanese", + "country": "Japan" + }, + "secondary": { + "language": "English", + "country": "United States" + }, + "tertiary": { + "language": "Chinese Simplified", + "country": "China" + } }, - "secondary": { - "language": "English", - "country": "United States" + "2":{ + "primary":{ + "language":"English", + "country":"United States", + }, + "secondary":{ + "language":"English", + "country":"United States" + }, + "tertiary":{ + "language":"English", + "country":"United States" + }, + }, + "3":{ + "primary":{ + "language":"English", + "country":"United States", + }, + "secondary":{ + "language":"English", + "country":"United States" + }, + "tertiary":{ + "language":"English", + "country":"United States" + }, }, - "tertiary": { - "language": "Chinese Simplified", - "country": "China" - } } case "/controller/callback_set_transparency": data = 0.5