swap to async #1

Merged
asaril merged 10 commits from async into main 2023-06-15 00:32:18 +02:00
Showing only changes of commit 6fa7277813 - Show all commits

View file

@ -1,6 +1,7 @@
""" """
MS Teams controller using a Neokey 1x4 and a RP2040. MS Teams controller using a Neokey 1x4 and a RP2040.
""" """
import logging
import json import json
import time import time
import asyncio import asyncio
@ -8,7 +9,9 @@ from typing import Any
import serial_asyncio import serial_asyncio
from argparse import ArgumentParser from argparse import ArgumentParser
from websockets.client import connect, WebSocketClientProtocol from websockets.client import connect, WebSocketClientProtocol
from pydantic import BaseModel from pydantic import BaseModel, ValidationError
log = logging.getLogger(__name__)
class Button(BaseModel): class Button(BaseModel):
@ -240,9 +243,10 @@ class TeamsCtrl:
async def process_ws(self) -> None: async def process_ws(self) -> None:
async for raw_msg in self.ws: async for raw_msg in self.ws:
try:
msg = TeamsMsg.parse_raw(raw_msg) msg = TeamsMsg.parse_raw(raw_msg)
if self.meeting_state != msg.meetingUpdate.meetingState: if self.meeting_state != msg.meetingUpdate.meetingState:
print( log.debug(
f"state changed:\n{self.meeting_state}\nto\n{msg.meetingUpdate.meetingState}" f"state changed:\n{self.meeting_state}\nto\n{msg.meetingUpdate.meetingState}"
) )
changes: dict[str, bool] = {} changes: dict[str, bool] = {}
@ -259,6 +263,12 @@ class TeamsCtrl:
self.meeting_state = msg.meetingUpdate.meetingState self.meeting_state = msg.meetingUpdate.meetingState
if next_state is not None: if next_state is not None:
self.set_next_state(next_state=next_state) self.set_next_state(next_state=next_state)
except ValidationError:
if isinstance(raw_msg, bytes):
m = raw_msg.decode("utf-8")
else:
m = raw_msg
log.info(f"got unknown meetingState: {m}")
async def process_statemachine(self) -> None: async def process_statemachine(self) -> None:
while not self.loop.is_closed(): while not self.loop.is_closed():