[0.8.2] area selection synchronized to remote

Author: Radekyspec

app_state/__init__.py

@@ -105,7 +105,8 @@ class RoomInfo(StateBase):
 
 # Area (category) selections for live stream configuration
 parent_area = ["请选择"]
-area_options = {}
+area_options: dict[str, List[str]] = {}
+area_reverse: dict[str, str] = {}
 area_codes = {}
 
 # OBS WebSocket client

models/window/stream_config.py

@@ -239,7 +239,7 @@ def update_child_combo(self, text):
             self.child_combo.addItems(app_state.area_options[text])
             self.child_combo.setEnabled(True)
             self.enable_child_combo_autosave(_enabled)
-            self._save_area()
+            self._save_area(self.child_combo.currentText())
         else:
             self.child_combo.clear()
             self.child_combo.setEnabled(False)
@@ -459,11 +459,10 @@ def _valid_area(self):
             app_state.area_options[self.parent_combo.currentText()]
 
     @Slot()
-    def _save_area(self):
+    def _save_area(self, child_area: str):
         if self._valid_area() and self._child_combo_autosave:
             # self.save_area_btn.setEnabled(False)
-            area_updater = AreaUpdateWorker(self,
-                                            self.child_combo.currentText())
+            area_updater = AreaUpdateWorker(self, child_area)
             self.parent_window.add_thread(
                 area_updater,
                 on_finished=area_updater.on_finished,

models/workers/area/area_update.py

@@ -46,9 +46,11 @@ def run(self, /) -> None:
     @Slot()
     def on_finished(self, *args, **kwargs):
         app_state.room_info[
-            "parent_area"] = self.parent.parent_combo.currentText()
+            "parent_area"] = app_state.area_reverse[self.area]
         app_state.room_info[
-            "area"] = self.parent.child_combo.currentText()
+            "area"] = self.area
+        self.parent.parent_combo.setCurrentText(app_state.room_info["parent_area"])
+        self.parent.child_combo.setCurrentText(app_state.room_info["area"])
         self._session.close()
 
     @Slot()
@@ -57,5 +59,7 @@ def on_exception(self, *args, **kwargs):
         self.parent.parent_combo.setCurrentText(
             app_state.room_info["parent_area"])
         self.parent.child_combo.setCurrentText(app_state.room_info["area"])
+        # roll back if an exception occurs
+        self.area = app_state.room_info["area"]
         self.parent.enable_child_combo_autosave(enabled)
         self.parent.modify_area_btn.setEnabled(True)

models/workers/area/fetch_area.py

@@ -25,12 +25,14 @@ def run(self, /) -> None:
         self.logger.info("Area/getList Response")
         response = response.json()
         for area_info in response["data"]["area_v1_info"]:
-            app_state.parent_area.append(area_info["name"])
-            app_state.area_options[area_info["name"]] = []
+            parent = area_info["name"]
+            app_state.parent_area.append(parent)
+            app_state.area_options[parent] = []
             for sub_area in area_info["list"]:
                 app_state.area_codes[sub_area["name"]] = sub_area["id"]
                 app_state.area_options[area_info["name"]].append(
                     sub_area["name"])
+                app_state.area_reverse[sub_area["name"]] = parent
         app_state.scan_status["area_updated"] = True
 
     @Slot()