From 192507a605114dabd6b9cd9b171bbf115bd3c48b Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:48:28 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20[Remove]=20Config=20:?= =?UTF-8?q?=20IS=5FRESET=5FBUTTON=5FDISPLAYED=5FFOR=5F**=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/config.py | 51 ---------------------------------- src-python/webui_controller.py | 36 ++---------------------- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/src-python/config.py b/src-python/config.py index 9d5b3984..ee02eb05 100644 --- a/src-python/config.py +++ b/src-python/config.py @@ -177,51 +177,6 @@ class Config: if isinstance(value, bool): self._ENABLE_CHECK_ENERGY_RECEIVE = value - # @property - # def SENT_MESSAGES_LOG(self): - # return self._SENT_MESSAGES_LOG - - # @SENT_MESSAGES_LOG.setter - # def SENT_MESSAGES_LOG(self, value): - # if isinstance(value, list): - # self._SENT_MESSAGES_LOG = value - - # @property - # def CURRENT_SENT_MESSAGES_LOG_INDEX(self): - # return self._CURRENT_SENT_MESSAGES_LOG_INDEX - - # @CURRENT_SENT_MESSAGES_LOG_INDEX.setter - # def CURRENT_SENT_MESSAGES_LOG_INDEX(self, value): - # if isinstance(value, int): - # self._CURRENT_SENT_MESSAGES_LOG_INDEX = value - - @property - def IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION(self): - return self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION - - @IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION.setter - def IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION(self, value): - if isinstance(value, bool): - self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = value - - @property - def IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER(self): - return self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER - - @IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER.setter - def IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER(self, value): - if isinstance(value, bool): - self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = value - - # @property - # def IS_EASTER_EGG_ENABLED(self): - # return self._IS_EASTER_EGG_ENABLED - - # @IS_EASTER_EGG_ENABLED.setter - # def IS_EASTER_EGG_ENABLED(self, value): - # if isinstance(value, bool): - # self._IS_EASTER_EGG_ENABLED = value - # Save Json Data ## Main Window @property @@ -1008,12 +963,6 @@ class Config: self._ENABLE_CHECK_ENERGY_SEND = False self._ENABLE_CHECK_ENERGY_RECEIVE = False - # self._SENT_MESSAGES_LOG = [] - # self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0 - self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False - self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False - # self._IS_EASTER_EGG_ENABLED = False - # Save Json Data ## Main Window self._SELECTED_TAB_NO = "1" diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index e8d89bf0..1832b42b 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -1080,31 +1080,17 @@ class Controller: def setEnableUseTranslationFeature(*args, **kwargs) -> dict: config.USE_TRANSLATION_FEATURE = True if model.checkCTranslatorCTranslate2ModelWeight(): - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False def callback(): model.changeTranslatorCTranslate2Model() th_callback = Thread(target=callback) th_callback.daemon = True th_callback.start() - else: - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = True - return {"status":200, - "result":{ - "feature":config.USE_TRANSLATION_FEATURE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION, - }, - } + return {"status":200, "result":config.USE_TRANSLATION_FEATURE} @staticmethod def setDisableUseTranslationFeature(*args, **kwargs) -> dict: config.USE_TRANSLATION_FEATURE = False - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False - return {"status":200, - "result":{ - "feature":config.USE_TRANSLATION_FEATURE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION, - }, - } + return {"status":200, "result": config.USE_TRANSLATION_FEATURE} @staticmethod def getUseWhisperFeature(*args, **kwargs) -> dict: @@ -1114,29 +1100,24 @@ class Controller: def setEnableUseWhisperFeature(*args, **kwargs) -> dict: config.USE_WHISPER_FEATURE = True if model.checkTranscriptionWhisperModelWeight() is True: - config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False config.SELECTED_TRANSCRIPTION_ENGINE = "Whisper" else: - config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = True config.SELECTED_TRANSCRIPTION_ENGINE = "Google" return {"status":200, "result":{ "feature":config.USE_WHISPER_FEATURE, "transcription_engine":config.SELECTED_TRANSCRIPTION_ENGINE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER, }, } @staticmethod def setDisableUseWhisperFeature(*args, **kwargs) -> dict: config.USE_WHISPER_FEATURE = False - config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False config.SELECTED_TRANSCRIPTION_ENGINE = "Google" return {"status":200, "result":{ "feature":config.USE_WHISPER_FEATURE, "transcription_engine":config.SELECTED_TRANSCRIPTION_ENGINE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER, }, } @@ -1148,20 +1129,12 @@ class Controller: def setCtranslate2WeightType(data, *args, **kwargs) -> dict: config.CTRANSLATE2_WEIGHT_TYPE = str(data) if model.checkCTranslatorCTranslate2ModelWeight(): - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False def callback(): model.changeTranslatorCTranslate2Model() th_callback = Thread(target=callback) th_callback.daemon = True th_callback.start() - else: - config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = True - return {"status":200, - "result":{ - "feature":config.CTRANSLATE2_WEIGHT_TYPE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION, - }, - } + return {"status":200, "result":config.CTRANSLATE2_WEIGHT_TYPE} @staticmethod def getWhisperWeightType(*args, **kwargs) -> dict: @@ -1171,16 +1144,13 @@ class Controller: def setWhisperWeightType(data, *args, **kwargs) -> dict: config.WHISPER_WEIGHT_TYPE = str(data) if model.checkTranscriptionWhisperModelWeight() is True: - config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False config.SELECTED_TRANSCRIPTION_ENGINE = "Whisper" else: - config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = True config.SELECTED_TRANSCRIPTION_ENGINE = "Google" return {"status":200, "result":{ "weight_type":config.WHISPER_WEIGHT_TYPE, "transcription_engine":config.SELECTED_TRANSCRIPTION_ENGINE, - "reset":config.IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER, } }