From 69d9de686e9b2aa7051496a43f8ac4b891555850 Mon Sep 17 00:00:00 2001
From: misyaguziya <53165965+misyaguziya@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:49:51 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Optimize=20:=20?=
 =?UTF-8?q?Init=E5=AE=8C=E4=BA=86=E6=99=82=E3=81=AB`run\initialization=5Fc?=
 =?UTF-8?q?omplete`=E3=81=A7config=E8=A8=AD=E5=AE=9A=E5=80=A4=E3=82=92?=
 =?UTF-8?q?=E3=81=99=E3=81=B9=E3=81=A6result=E3=81=A7=E6=B8=A1=E3=81=99?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-python/webui_controller.py | 39 ++++++++++++----------------------
 src-python/webui_mainloop.py   |  8 ++-----
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py
index af52009e..9a9712e2 100644
--- a/src-python/webui_controller.py
+++ b/src-python/webui_controller.py
@@ -25,31 +25,6 @@ class Controller:
     def setRun(self, run:Callable[[int, str, Any], None]) -> None:
         self.run = run
 
-    # configの初期値を設定
-    def sendConfigStatusTrueData(self) -> None:
-        for endpoint, dict_data in self.init_mapping.items():
-            if dict_data["status"] is True:
-                response = dict_data["variable"](None)
-                status = response.get("status", None)
-                result = response.get("result", None)
-                self.run(
-                    status,
-                    endpoint,
-                    result,
-                )
-
-    def sendConfigStatusFalseData(self) -> None:
-        for endpoint, dict_data in self.init_mapping.items():
-            if dict_data["status"] is False:
-                response = dict_data["variable"](None)
-                status = response.get("status", None)
-                result = response.get("result", None)
-                self.run(
-                    status,
-                    endpoint,
-                    result,
-                )
-
     # response functions
     def updateMicHostList(self) -> None:
         self.run(
@@ -72,6 +47,18 @@ class Controller:
             model.getListSpeakerDevice(),
         )
 
+    def updateConfigSettings(self) -> None:
+        settings = {}
+        for endpoint, dict_data in self.init_mapping.items():
+            response = dict_data["variable"](None)
+            result = response.get("result", None)
+            settings[endpoint] = result
+        self.run(
+            200,
+            self.run_mapping["initialization_complete"],
+            settings,
+        )
+
     def restartAccessDevices(self) -> None:
         if config.ENABLE_TRANSCRIPTION_SEND is True:
             self.startThreadingTranscriptionSendMessage()
@@ -1733,6 +1720,8 @@ class Controller:
         if config.AUTO_SPEAKER_SELECT is True:
             self.setEnableAutoSpeakerSelect()
 
+        self.updateConfigSettings()
+
         printLog("End Initialization")
 
         self.startWatchdog()
\ No newline at end of file
diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py
index 7088ff49..1b0961cd 100644
--- a/src-python/webui_mainloop.py
+++ b/src-python/webui_mainloop.py
@@ -34,6 +34,8 @@ run_mapping = {
     "speaker_device_list":"/run/speaker_device_list",
 
     "update_software_flag":"/run/update_software_flag",
+
+    "initialization_complete":"run/initialization_complete",
 }
 
 controller.setRunMapping(run_mapping)
@@ -395,15 +397,9 @@ if __name__ == "__main__":
     main.startReceiver()
     main.startHandler()
 
-    # mappingのget/data/*でかつstatus:Trueのendpointを実行する
-    controller.sendConfigStatusTrueData()
-
     controller.setWatchdogCallback(main.stop)
     controller.init()
 
-    # mappingのget/data/*でかつstatus:Falseのendpointを実行する
-    controller.sendConfigStatusFalseData()
-
     # mappingのすべてのstatusをTrueにする
     for key in mapping.keys():
         mapping[key]["status"] = True