Merge pull request #288 from VirtualLiveLab/feature-eizoukizaiPC

wolに映像機材PCを追加

Author: zsxdcf256

src/app/wol/fn.py

@@ -5,31 +5,35 @@
 import aiohttp
 
 # https://www.notion.so/virtual-live-lab/ddf6d9708a2e45469f675c37e6d09e28
-type ComputerType = Literal["left", "right", "stream"]
+type ComputerType = Literal["left", "right", "stream", "kizai"]
 
 
 class ComputerStatus(TypedDict):
     left: bool | None
     right: bool | None
     stream: bool | None
+    kizai: bool | None
 
 
 class ComputerAddresses(TypedDict):
     left: str
     right: str
     stream: str
+    kizai: str
 
 
 PC_MAC_ADDRESSES: ComputerAddresses = {
     "left": "04:7C:16:01:41:A7",
     "right": "FC:34:97:BA:12:F1",
     "stream": "34:5A:60:A9:5F:CA",
+    "kizai": "4C:C5:D9:4F:2D:9D",
 }
 
 PC_IP_ADDRESSES: ComputerAddresses = {
     "left": "192.168.39.31",
     "right": "192.168.39.30",
     "stream": "192.168.39.32",
+    "kizai": "192.168.39.33",
 }
 
 
@@ -55,11 +59,15 @@ async def get_computer_status() -> ComputerStatus:
         session.get(
             "https://wol.vlldev.com/check_status", params={"ip_address": PC_IP_ADDRESSES["stream"], "test_type": "icmp"}
         ) as stream_response,
+        session.get(
+            "https://wol.vlldev.com/check_status", params={"ip_address": PC_IP_ADDRESSES["kizai"], "test_type": "icmp"}
+        ) as kizai_response,
     ):
         left_is_wake = convert_status_str_to_bool(await left_response.text())
         right_is_wake = convert_status_str_to_bool(await right_response.text())
         stream_is_wake = convert_status_str_to_bool(await stream_response.text())
-        return {"left": left_is_wake, "right": right_is_wake, "stream": stream_is_wake}
+        kizai_is_wake = convert_status_str_to_bool(await kizai_response.text())
+        return {"left": left_is_wake, "right": right_is_wake, "stream": stream_is_wake, "kizai": kizai_is_wake}
 
 
 class ComputerBootResult(Enum):

src/app/wol/view.py

@@ -56,6 +56,19 @@ async def handle_wol_stream(self, interaction: Interaction) -> None:
             case ComputerBootResult.ERROR:
                 await interaction.followup.send("エラーが発生しました。", ephemeral=True)
 
+    async def handle_wol_kizai(self, interaction: Interaction) -> None:
+        await interaction.response.defer(ephemeral=True)
+        res = await boot_computer("kizai")
+
+        match res:
+            case ComputerBootResult.STARTED:
+                self.status.set_state(lambda c: {**c, "kizai": True})
+                await interaction.followup.send("映像機材PCの起動を開始しました。", ephemeral=True)
+            case ComputerBootResult.CANCELED:
+                await interaction.followup.send("映像機材PCは既に起動しています。", ephemeral=True)
+            case ComputerBootResult.ERROR:
+                await interaction.followup.send("エラーが発生しました。", ephemeral=True)
+
     async def handle_refresh(self, interaction: Interaction) -> None:
         await interaction.response.defer(ephemeral=True)
         current_status = await get_computer_status()
@@ -84,6 +97,7 @@ def get_label(*, status: bool | None) -> str:
         e.add_field(name="左PC", value=get_label(status=self.status()["left"]))
         e.add_field(name="右PC", value=get_label(status=self.status()["right"]))
         e.add_field(name="配信PC", value=get_label(status=self.status()["stream"]))
+        e.add_field(name="映像機材PC", value=get_label(status=self.status()["kizai"]))
 
         return ViewObject(
             embeds=[e],
@@ -106,6 +120,12 @@ def get_label(*, status: bool | None) -> str:
                     style={"color": "blurple", "disabled": self.disabled() or bool(self.status()["stream"]), "row": 0},
                     on_click=self.handle_wol_stream,
                 ),
+                Button(
+                    "映像機材PCを起動する",
+                    custom_id="wol_kizai",
+                    style={"color": "blurple", "disabled": self.disabled() or bool(self.status()["kizai"]), "row": 0},
+                    on_click=self.handle_wol_kizai,
+                ),
                 Button(
                     "表示を更新する",
                     custom_id="wol_refresh",