every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Update/bugfix] バックエンドからもらった初期データを繋げ、UIと初回同期

Browse Source 
initialization_complete エンドポイント修正 ('/'追加)
This commit is contained in:
Sakamoto Shiina
2024-10-28 21:04:55 +09:00
parent 68d05b38a8
commit afed3fffcd
4 changed files with 13 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-python/webui_mainloop.py
View File

@@ -35,7 +35,7 @@ run_mapping = {
"update_software_flag":"/run/update_software_flag", "update_software_flag":"/run/update_software_flag",
"initialization_complete":"run/initialization_complete", "initialization_complete":"/run/initialization_complete",
} }
controller.setRunMapping(run_mapping) controller.setRunMapping(run_mapping)

139
src-ui/app/App.jsx
View File

@@ -33,45 +33,14 @@ import {
} from "@logics_common"; } from "@logics_common";
import { import {
useSoftwareVersion,
useEnableAutoMicSelect,
useEnableAutoSpeakerSelect,
useSelectedMicHost,
useSelectedMicDevice,
useSelectedSpeakerDevice,
useMicThreshold,
useSpeakerThreshold,
useEnableAutoClearMessageInputBox,
useEnableSendOnlyTranslatedMessages,
useEnableAutoExportMessageLogs,
useEnableVrcMicMuteSync,
useEnableSendMessageToVrc,
useSendMessageButtonType,
useUiLanguage, useUiLanguage,
useUiScaling, useUiScaling,
useMessageLogUiScaling,
useSelectedFontFamily, useSelectedFontFamily,
useTransparency, useTransparency,
useMicHostList,
useMicDeviceList,
useSpeakerDeviceList,
useMicRecordTimeout,
useMicPhraseTimeout,
useMicMaxWords,
useMicWordFilterList,
useSpeakerRecordTimeout,
useSpeakerPhraseTimeout,
useSpeakerMaxWords,
useOscIpAddress,
useOscPort,
} from "@logics_configs"; } from "@logics_configs";
import { import {
useMainFunction, useMainFunction,
useIsMainPageCompactMode,
useLanguageSettings,
useSelectableLanguageList,
useMessageInputBoxRatio,
} from "@logics_main"; } from "@logics_main";
const StartPythonFacadeComponent = () => { const StartPythonFacadeComponent = () => {
@@ -79,119 +48,11 @@ const StartPythonFacadeComponent = () => {
const hasRunRef = useRef(false); const hasRunRef = useRef(false);
const { asyncFetchFonts } = useAsyncFetchFonts(); 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(() => { useEffect(() => {
if (!hasRunRef.current) { if (!hasRunRef.current) {
asyncStartPython().then(() => { asyncStartPython().then(() => {
startFeedingToWatchDog(); startFeedingToWatchDog();
fetchAndUpdateWindowGeometry();
// getUiLanguage();
// getUiScaling();
// getMessageLogUiScaling();
// getIsMainPageCompactMode();
// getMessageInputBoxRatio();
// getTransparency();
asyncFetchFonts(); 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) => { }).catch((err) => {
console.error(err); console.error(err);
}); });

4
src-ui/logics/common/useWindow.js
View File

@@ -51,9 +51,6 @@ export const useWindow = () => {
} }
}; };
const fetchAndUpdateWindowGeometry = () => {
asyncStdoutToPython("/get/data/main_window_geometry");
};
const WindowGeometryController = () => { const WindowGeometryController = () => {
useEffect(() => { useEffect(() => {
@@ -86,7 +83,6 @@ export const useWindow = () => {
return { return {
WindowGeometryController, WindowGeometryController,
asyncSaveWindowGeometry, asyncSaveWindowGeometry,
fetchAndUpdateWindowGeometry,
restoreWindowGeometry, restoreWindowGeometry,
}; };
}; };

12
src-ui/logics/useReceiveRoutes.js
View File

@@ -362,9 +362,21 @@ export const useReceiveRoutes = () => {
"/set/data/speaker_max_phrases": updateSpeakerMaxWords, "/set/data/speaker_max_phrases": updateSpeakerMaxWords,
}; };
const receiveRoutes = (parsed_data) => { 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) { switch (parsed_data.status) {
case 200: case 200:
if (parsed_data.endpoint === "/run/initialization_complete") {
initDataSyncProcess(parsed_data.result);
break;
};
const route = routes[parsed_data.endpoint]; const route = routes[parsed_data.endpoint];
(route) ? route(parsed_data.result) : console.error(`Invalid endpoint: ${parsed_data.endpoint}\nresult: ${JSON.stringify(parsed_data.result)}`); (route) ? route(parsed_data.result) : console.error(`Invalid endpoint: ${parsed_data.endpoint}\nresult: ${JSON.stringify(parsed_data.result)}`);
break; break;