Skip to content

Commit 70a085c

Browse files
committed
perf:更新资源时锁定资源,防止更新路径出错
1 parent 2a79f54 commit 70a085c

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

app/common/signal_bus.py

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class SignalBus(QObject):
3838
custom_info = pyqtSignal(dict) # 自定义动作/识别器成功信号
3939
setting_Visible = pyqtSignal(str) # 设置界面可见信号
4040
speedrun = pyqtSignal() # 速通模式信号
41+
lock_res_changed = pyqtSignal(bool) # 锁定资源改变信号
4142

4243

4344
signalBus = SignalBus()

app/view/scheduled_interface.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def __init__(self, parent=None):
2727
signalBus.update_task_list.connect(self.update_task_list_passive)
2828
signalBus.switch_config.connect(self.switch_config)
2929
signalBus.readme_available.connect(self.update_readme)
30+
signalBus.lock_res_changed.connect(self.lock_res_changed)
3031
self.init_widget_text()
3132
if cfg.get(cfg.resource_exist):
3233
self.initialize_config_combobox()
@@ -41,6 +42,17 @@ def __init__(self, parent=None):
4142
self.add_res_button.clicked.connect(self.add_resource)
4243
self.delete_res_button.clicked.connect(self.res_delete)
4344

45+
def lock_res_changed(self, status):
46+
if status:
47+
self.res_combox.setEnabled(False)
48+
self.add_res_button.setEnabled(False)
49+
self.delete_res_button.setEnabled(False)
50+
51+
else:
52+
self.res_combox.setEnabled(True)
53+
self.add_res_button.setEnabled(True)
54+
self.delete_res_button.setEnabled(True)
55+
4456
def init_widget_text(self):
4557
"""初始化界面文本"""
4658
self.Cfg_Combox_title.setText(self.tr("Configuration"))
@@ -84,7 +96,7 @@ def add_resource(self):
8496
"""添加资源"""
8597
w = CustomMessageBox(self)
8698
if w.exec():
87-
if w.name_data =="":
99+
if w.name_data == "":
88100
return
89101
logger.debug(f"添加资源{w.name_data}")
90102
self.res_combox.clear()
@@ -284,7 +296,6 @@ def res_changed(self, resource_name: str = ""):
284296
if cfg.get(cfg.auto_update_resource):
285297
logger.debug("res_changed发送信号")
286298
signalBus.auto_update.emit()
287-
288299

289300
def res_delete(self):
290301
"""删除当前选定的资源"""

app/view/setting_interface.py

+2
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,7 @@ def update_check(self):
729729
self.Updatethread.start()
730730
self.updateCard.button2.setEnabled(False)
731731
self.updateCard.button2.setText(self.tr("Checking for updates..."))
732+
signalBus.lock_res_changed.emit(True)
732733

733734
def on_update_finished(self, data_dict: dict):
734735
"""更新检查完成的回调函数。"""
@@ -750,6 +751,7 @@ def on_update_finished(self, data_dict: dict):
750751
self.updateCard.button2.setText(self.tr("Check for updates"))
751752
self.updateCard.button2.setEnabled(True)
752753
signalBus.title_changed.emit()
754+
signalBus.lock_res_changed.emit(False)
753755

754756
def __initWidget(self):
755757
self.resize(1000, 800)

main.py

-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ def main(resource: str, config: str, directly: bool):
139139
cfg.set(cfg.maa_config_path, maa_config_list[maa_resource_name][config])
140140
maa_config_name = config
141141
maa_config_path = maa_config_list[maa_resource_name][config]
142-
143142
else:
144143
cfg.set(cfg.maa_config_name, "default")
145144
cfg.set(cfg.maa_config_path, maa_config_list[maa_resource_name]["default"])

0 commit comments

Comments
 (0)