From 1ab715ac492db65243e02648b3dc4ce050dfec28 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:01:58 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Config:=20javascript?= =?UTF-8?q?=E3=81=A7int/float=E3=81=AE=E5=9E=8B=E6=8C=87=E5=AE=9A=E3=81=8C?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81config?= =?UTF-8?q?=E3=81=A7setter=E6=99=82=E3=81=ABfloat=E3=81=AB=E3=82=AD?= =?UTF-8?q?=E3=83=A3=E3=82=B9=E3=83=88=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/config.py | 18 +++++++++--------- src-python/webui_controller.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src-python/config.py b/src-python/config.py index a398cddb..3f1e24a3 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -386,7 +386,7 @@ class Config: @MESSAGE_BOX_RATIO.setter def MESSAGE_BOX_RATIO(self, value): - if isinstance(value, float): + if isinstance(value, (int, float)): self._MESSAGE_BOX_RATIO = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @@ -542,7 +542,7 @@ class Config: @MIC_AVG_LOGPROB.setter def MIC_AVG_LOGPROB(self, value): - if isinstance(value, float) or isinstance(value, int): + if isinstance(value, (int, float)): self._MIC_AVG_LOGPROB = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @@ -553,7 +553,7 @@ class Config: @MIC_NO_SPEECH_PROB.setter def MIC_NO_SPEECH_PROB(self, value): - if isinstance(value, float) or isinstance(value, int): + if isinstance(value, (int, float)): self._MIC_NO_SPEECH_PROB = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @@ -641,7 +641,7 @@ class Config: @SPEAKER_AVG_LOGPROB.setter def SPEAKER_AVG_LOGPROB(self, value): - if isinstance(value, float) or isinstance(value, int): + if isinstance(value, (int, float)): self._SPEAKER_AVG_LOGPROB = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @@ -652,7 +652,7 @@ class Config: @SPEAKER_NO_SPEECH_PROB.setter def SPEAKER_NO_SPEECH_PROB(self, value): - if isinstance(value, float) or isinstance(value, int): + if isinstance(value, (int, float)): self._SPEAKER_NO_SPEECH_PROB = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @@ -811,8 +811,8 @@ class Config: def OVERLAY_SETTINGS(self, value): if isinstance(value, dict) and set(value.keys()) == set(self.OVERLAY_SETTINGS.keys()): for key, value in value.items(): - if isinstance(value, float): - self._OVERLAY_SETTINGS[key] = value + if isinstance(value, (int, float)): + self._OVERLAY_SETTINGS[key] = float(value) saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.OVERLAY_SETTINGS) @property @@ -837,8 +837,8 @@ class Config: for key, value in value.items(): match (key): case "x_pos" | "y_pos" | "z_pos" | "x_rotation" | "y_rotation" | "z_rotation": - if isinstance(value, float): - self._OVERLAY_SMALL_LOG_SETTINGS[key] = value + if isinstance(value, (int, float)): + self._OVERLAY_SMALL_LOG_SETTINGS[key] = float(value) case "display_duration" | "fadeout_duration": if isinstance(value, int): self._OVERLAY_SMALL_LOG_SETTINGS[key] = value diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 6621def1..c707a775 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -593,7 +593,7 @@ class Controller: @staticmethod def setMessageBoxRatio(data, *args, **kwargs) -> dict: - config.MESSAGE_BOX_RATIO = float(data) + config.MESSAGE_BOX_RATIO = data return {"status":200, "result":config.MESSAGE_BOX_RATIO} @staticmethod