From d9e8c5391acd77ad88da51c115a0414c3de0d2aa Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Sat, 19 Aug 2023 21:38:32 +0100 Subject: [PATCH] raw property added. lets you set raw mode during runtime --- streamlabsio/client.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/streamlabsio/client.py b/streamlabsio/client.py index 5f6f564..2ff478d 100644 --- a/streamlabsio/client.py +++ b/streamlabsio/client.py @@ -33,8 +33,26 @@ class Client: raise SteamlabsSIOConnectionError( "no connection could be established to the Streamlabs SIO server" ) from e + self.log_mode() return self + @property + def raw(self): + return self._raw + + @raw.setter + def raw(self, val): + self._raw = val + self.log_mode() + + def log_mode(self): + INFO_MSG = (f"Running client in {'raw' if self.raw else 'normal'} mode.",) + if self.raw: + INFO_MSG += ("raw JSON messages will be passed to callbacks",) + else: + INFO_MSG += ("event data objects will be passed to callbacks",) + self.logger.info(" ".join(INFO_MSG)) + def _token_from_toml(self) -> str: try: import tomllib @@ -56,10 +74,10 @@ class Client: raise FileNotFoundError("config.toml was not found") with open(filepath, "rb") as f: conn = tomllib.load(f) - assert "token" in conn.get( - "streamlabs" - ), "token not found in config.toml" - return conn["streamlabs"].get("token") + assert ( + "streamlabs" in conn and "token" in conn["streamlabs"] + ), "expected [streamlabs][token] in config.toml" + return conn["streamlabs"]["token"] except (FileNotFoundError, tomllib.TOMLDecodeError) as e: self.logger.error(f"{type(e).__name__}: {e}") raise @@ -71,13 +89,11 @@ class Client: if "for" in data and data["type"] in set( self.streamlabs + self.twitch + self.youtube ): - message = data["message"][0] if isinstance(data["message"][0], dict) else {} + message = data["message"][0] self.obs.trigger( data["for"], data["type"], - message - if self._raw - else as_dataclass(data["type"], message), + message if self.raw else as_dataclass(data["type"], message), ) self.logger.debug(data)