every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛[bugfix] Config : 保存用timerがcancelされていない問題を修正

Browse Source
This commit is contained in:
misyaguziya
2024-10-28 10:07:33 +09:00
parent fea2cdae61
commit 68d05b38a8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src-python/config.py
View File

@@ -17,9 +17,9 @@ def json_serializable(var_name):
class Config: class Config:
_instance = None _instance = None
config_data = {} _config_data = {}
timer = None _timer = None
debounce_time = 2 _debounce_time = 2
def __new__(cls): def __new__(cls):
if cls._instance is None: if cls._instance is None:
@@ -30,16 +30,16 @@ class Config:
def saveConfigToFile(self): def saveConfigToFile(self):
with open(self.PATH_CONFIG, "w", encoding="utf-8") as fp: with open(self.PATH_CONFIG, "w", encoding="utf-8") as fp:
json_dump(self.config_data, fp, indent=4, ensure_ascii=False) json_dump(self._config_data, fp, indent=4, ensure_ascii=False)
def saveConfig(self, key, value): def saveConfig(self, key, value):
self.config_data[key] = value self._config_data[key] = value
if isinstance(self.timer, threading.Timer) and self.timer.is_alive(): if isinstance(self._timer, threading.Timer) and self._timer.is_alive():
self.timer.cancel() self._timer.cancel()
timer = threading.Timer(self.debounce_time, self.saveConfigToFile) self._timer = threading.Timer(self._debounce_time, self.saveConfigToFile)
timer.daemon = True self._timer.daemon = True
timer.start() self._timer.start()
# Read Only # Read Only
@property @property
@@ -1172,14 +1172,14 @@ class Config:
with open(self.PATH_CONFIG, 'r', encoding="utf-8") as fp: with open(self.PATH_CONFIG, 'r', encoding="utf-8") as fp:
if fp.readable() and fp.seek(0, 2) > 0: if fp.readable() and fp.seek(0, 2) > 0:
fp.seek(0) fp.seek(0)
self.config_data = json_load(fp) self._config_data = json_load(fp)
for key, value in self.config_data.items(): for key, value in self._config_data.items():
setattr(self, key, value) setattr(self, key, value)
with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp: with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp:
for var_name, var_func in json_serializable_vars.items(): for var_name, var_func in json_serializable_vars.items():
self.config_data[var_name] = var_func(self) self._config_data[var_name] = var_func(self)
json_dump(self.config_data, fp, indent=4, ensure_ascii=False) json_dump(self._config_data, fp, indent=4, ensure_ascii=False)
config = Config() config = Config()