From afed3fffcde1b6edda8c2d73eb44df90db40b28c Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:04:55 +0900 Subject: [PATCH] =?UTF-8?q?[Update/bugfix]=20=E3=83=90=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=8B=E3=82=89=E3=82=82=E3=82=89?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=88=9D=E6=9C=9F=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=92=E7=B9=8B=E3=81=92=E3=80=81UI=E3=81=A8=E5=88=9D?= =?UTF-8?q?=E5=9B=9E=E5=90=8C=E6=9C=9F=20initialization=5Fcomplete=20?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20('/'=E8=BF=BD=E5=8A=A0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_mainloop.py | 2 +- src-ui/app/App.jsx | 139 ------------------------------ src-ui/logics/common/useWindow.js | 4 - src-ui/logics/useReceiveRoutes.js | 12 +++ 4 files changed, 13 insertions(+), 144 deletions(-) diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 1b0961cd..1840014a 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -35,7 +35,7 @@ run_mapping = { "update_software_flag":"/run/update_software_flag", - "initialization_complete":"run/initialization_complete", + "initialization_complete":"/run/initialization_complete", } controller.setRunMapping(run_mapping) diff --git a/src-ui/app/App.jsx b/src-ui/app/App.jsx index 55f35d36..8ed648e8 100644 --- a/src-ui/app/App.jsx +++ b/src-ui/app/App.jsx @@ -33,45 +33,14 @@ import { } from "@logics_common"; import { - useSoftwareVersion, - useEnableAutoMicSelect, - useEnableAutoSpeakerSelect, - useSelectedMicHost, - useSelectedMicDevice, - useSelectedSpeakerDevice, - useMicThreshold, - useSpeakerThreshold, - useEnableAutoClearMessageInputBox, - useEnableSendOnlyTranslatedMessages, - useEnableAutoExportMessageLogs, - useEnableVrcMicMuteSync, - useEnableSendMessageToVrc, - useSendMessageButtonType, useUiLanguage, useUiScaling, - useMessageLogUiScaling, useSelectedFontFamily, useTransparency, - useMicHostList, - useMicDeviceList, - useSpeakerDeviceList, - useMicRecordTimeout, - useMicPhraseTimeout, - useMicMaxWords, - useMicWordFilterList, - useSpeakerRecordTimeout, - useSpeakerPhraseTimeout, - useSpeakerMaxWords, - useOscIpAddress, - useOscPort, } from "@logics_configs"; import { useMainFunction, - useIsMainPageCompactMode, - useLanguageSettings, - useSelectableLanguageList, - useMessageInputBoxRatio, } from "@logics_main"; const StartPythonFacadeComponent = () => { @@ -79,119 +48,11 @@ const StartPythonFacadeComponent = () => { const hasRunRef = useRef(false); const { asyncFetchFonts } = useAsyncFetchFonts(); - const { fetchAndUpdateWindowGeometry } = useWindow(); - - const { getMicHostList } = useMicHostList(); - const { getMicDeviceList } = useMicDeviceList(); - const { getSpeakerDeviceList } = useSpeakerDeviceList(); - - const { getIsMainPageCompactMode } = useIsMainPageCompactMode(); - const { getSoftwareVersion } = useSoftwareVersion(); - const { getEnableAutoMicSelect } = useEnableAutoMicSelect(); - const { getEnableAutoSpeakerSelect } = useEnableAutoSpeakerSelect(); - const { getSelectedMicHost } = useSelectedMicHost(); - const { getSelectedMicDevice } = useSelectedMicDevice(); - const { getSelectedSpeakerDevice } = useSelectedSpeakerDevice(); - const { getMicThreshold, getEnableAutomaticMicThreshold } = useMicThreshold(); - const { getSpeakerThreshold, getEnableAutomaticSpeakerThreshold } = useSpeakerThreshold(); - - const { getEnableAutoClearMessageInputBox } = useEnableAutoClearMessageInputBox(); - const { getEnableSendOnlyTranslatedMessages } = useEnableSendOnlyTranslatedMessages(); - const { getEnableAutoExportMessageLogs } = useEnableAutoExportMessageLogs(); - const { getEnableVrcMicMuteSync } = useEnableVrcMicMuteSync(); - const { getEnableSendMessageToVrc } = useEnableSendMessageToVrc(); - - const { getSendMessageButtonType } = useSendMessageButtonType(); - const { getUiLanguage } = useUiLanguage(); - const { getUiScaling } = useUiScaling(); - const { getMessageLogUiScaling } = useMessageLogUiScaling(); - const { getSelectedFontFamily } = useSelectedFontFamily(); - const { getTransparency } = useTransparency(); - - const { - getSelectedPresetTabNumber, - getEnableMultiTranslation, - getSelectedYourLanguages, - getSelectedTargetLanguages, - getTranslationEngines, - getSelectedTranslationEngines, - } = useLanguageSettings(); - const { getSelectableLanguageList } = useSelectableLanguageList(); - const { getMessageInputBoxRatio } = useMessageInputBoxRatio(); - - const { getMicRecordTimeout } = useMicRecordTimeout(); - const { getMicPhraseTimeout } = useMicPhraseTimeout(); - const { getMicMaxWords } = useMicMaxWords(); - const { getMicWordFilterList } = useMicWordFilterList(); - - const { getSpeakerRecordTimeout } = useSpeakerRecordTimeout(); - const { getSpeakerPhraseTimeout } = useSpeakerPhraseTimeout(); - const { getSpeakerMaxWords } = useSpeakerMaxWords(); - - const { getOscIpAddress } = useOscIpAddress(); - const { getOscPort } = useOscPort(); - useEffect(() => { if (!hasRunRef.current) { asyncStartPython().then(() => { startFeedingToWatchDog(); - - fetchAndUpdateWindowGeometry(); - - // getUiLanguage(); - // getUiScaling(); - // getMessageLogUiScaling(); - // getIsMainPageCompactMode(); - // getMessageInputBoxRatio(); - // getTransparency(); - asyncFetchFonts(); - // getSelectedFontFamily(); - - // getSoftwareVersion(); - - // getSelectedPresetTabNumber(); - // getEnableMultiTranslation(); - // getSelectedYourLanguages(); - // getSelectedTargetLanguages(); - // getSelectableLanguageList(); - // getTranslationEngines(); - // getSelectedTranslationEngines(); - - // getMicHostList(); - // getMicDeviceList(); - // getSpeakerDeviceList(); - - // getEnableAutoMicSelect(); - // getEnableAutoSpeakerSelect(); - // getSelectedMicHost(); - // getSelectedMicDevice(); - // getSelectedSpeakerDevice(); - - // getMicThreshold(); - // getSpeakerThreshold(); - // getEnableAutomaticMicThreshold(); - // getEnableAutomaticSpeakerThreshold(); - - // getMicRecordTimeout(); - // getMicPhraseTimeout(); - // getMicMaxWords(); - // getMicWordFilterList(); - - // getSpeakerRecordTimeout(); - // getSpeakerPhraseTimeout(); - // getSpeakerMaxWords(); - - // getEnableAutoClearMessageInputBox(); - // getSendMessageButtonType(); - - // getEnableSendOnlyTranslatedMessages(); - // getEnableAutoExportMessageLogs(); - // getEnableVrcMicMuteSync(); - // getEnableSendMessageToVrc(); - - // getOscIpAddress(); - // getOscPort(); }).catch((err) => { console.error(err); }); diff --git a/src-ui/logics/common/useWindow.js b/src-ui/logics/common/useWindow.js index 760e866b..9d2a7669 100644 --- a/src-ui/logics/common/useWindow.js +++ b/src-ui/logics/common/useWindow.js @@ -51,9 +51,6 @@ export const useWindow = () => { } }; - const fetchAndUpdateWindowGeometry = () => { - asyncStdoutToPython("/get/data/main_window_geometry"); - }; const WindowGeometryController = () => { useEffect(() => { @@ -86,7 +83,6 @@ export const useWindow = () => { return { WindowGeometryController, asyncSaveWindowGeometry, - fetchAndUpdateWindowGeometry, restoreWindowGeometry, }; }; diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 639edfd1..cd109e60 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -362,9 +362,21 @@ export const useReceiveRoutes = () => { "/set/data/speaker_max_phrases": updateSpeakerMaxWords, }; + const receiveRoutes = (parsed_data) => { + const initDataSyncProcess = (payload) => { + for (const [endpoint, value] of Object.entries(payload)) { + const route = routes[endpoint]; + (route) ? route(value) : console.error(`Invalid endpoint: ${endpoint}\vvalue: ${JSON.stringify(value)}`); + } + }; + switch (parsed_data.status) { case 200: + if (parsed_data.endpoint === "/run/initialization_complete") { + initDataSyncProcess(parsed_data.result); + break; + }; const route = routes[parsed_data.endpoint]; (route) ? route(parsed_data.result) : console.error(`Invalid endpoint: ${parsed_data.endpoint}\nresult: ${JSON.stringify(parsed_data.result)}`); break;