Keep multi-account refresh responsive and batch monster feeding

This commit is contained in:
AttilaNet
2026-11-08 00:24:21 +08:00
parent 5f0a9eaac3
commit 67b4658e00
23 changed files with 780 additions and 107 deletions
+33 -6
View File
@@ -3,7 +3,7 @@ import copy
from dataclasses import asdict
from PySide6 import QtCore as C, QtWidgets as W
from .model import EggRule, duration
from .native_widgets import IntegerInput
from .native_widgets import IntegerInput, RowBatch
class EggTable(W.QTableWidget):
@@ -19,8 +19,9 @@ class EggTable(W.QTableWidget):
self.setHorizontalHeaderLabels(headers)
self.setEditTriggers(W.QAbstractItemView.EditTrigger.NoEditTriggers)
self.setSelectionBehavior(W.QAbstractItemView.SelectionBehavior.SelectRows)
self.horizontalHeader().setSectionResizeMode(W.QHeaderView.ResizeMode.ResizeToContents)
self.horizontalHeader().setStretchLastSection(True)
self.horizontalHeader().setSectionResizeMode(W.QHeaderView.ResizeMode.Interactive)
for column, width in enumerate((130, 45, 65, 65, 90, 95, 95, 95, 160, 95, 90, 90, 100, 100, 160)):
self.setColumnWidth(column, width)
self.verticalHeader().setDefaultSectionSize(24)
def default_rule(self, key):
@@ -29,7 +30,12 @@ class EggTable(W.QTableWidget):
return asdict(EggRule(market_id=market))
def set_data(self, snapshot, rules, default_market="sc_city1"):
self.snapshot, self.rules, self.default_market = snapshot, {str(key): asdict(EggRule(**rule)) for key, rule in rules.items()}, default_market
normalized = {str(key): asdict(EggRule(**rule)) for key, rule in rules.items()}
signature = (repr(snapshot.eggs(self.catalog)), normalized, default_market)
if getattr(self, "render_signature", None) == signature:
self.snapshot = snapshot
return
self.snapshot, self.rules, self.default_market = snapshot, normalized, default_market
self.updating = True
self.setSortingEnabled(False)
groups = {}
@@ -40,8 +46,13 @@ class EggTable(W.QTableWidget):
group["ids"].append(str(egg["id"]))
keys = list(dict.fromkeys(list(groups) + list(self.rules)))
keys = [key for key in keys if self.catalog.monster(key)]
old_keys = [self.item(i, 0).data(C.Qt.ItemDataRole.UserRole) for i in range(self.rowCount()) if self.item(i, 0)]
keys = [key for key in old_keys if key in keys] + [key for key in keys if key not in old_keys]
self.setRowCount(len(keys))
for i, key in enumerate(keys):
if not hasattr(self, "row_batch"):
self.row_batch = RowBatch(self)
def apply(entry):
i, key = entry
data, rule = self.catalog.monster(key), self.rules.get(key, self.default_rule(key))
group = groups.get(key, {"count": 0, "ids": []})
total = max(1, self.catalog.total_time(key))
@@ -55,7 +66,19 @@ class EggTable(W.QTableWidget):
item.setData(C.Qt.ItemDataRole.UserRole, key)
item.setToolTip(f"魔物编号 {key}")
self.setItem(i, j, item)
existing = self.cellWidget(i, 3)
if existing and existing.property("egg_type_id") == key:
controls = [self.cellWidget(i, col) for col in range(3, 9)]
blockers = [C.QSignalBlocker(control) for control in controls]
controls[0].setChecked(rule["enabled"])
for control, field in ((controls[1], "priority"), (controls[3], "refill_below"), (controls[4], "refill_target")):
if not control.hasFocus():
control.setValue(rule[field])
controls[2].setCurrentIndex(max(0, controls[2].findData(rule["action"])))
controls[5].setCurrentIndex(max(0, controls[5].findData(rule["market_id"])))
return
enabled = W.QCheckBox()
enabled.setProperty("egg_type_id", key)
enabled.setChecked(rule["enabled"])
priority, below, target = IntegerInput(), IntegerInput(), IntegerInput()
for control, low, high, value in ((priority, 1, 999, rule["priority"]), (below, 0, 1000, rule["refill_below"]),
@@ -95,7 +118,11 @@ class EggTable(W.QTableWidget):
control.valueChanged.connect(commit)
action.currentIndexChanged.connect(commit)
market.currentIndexChanged.connect(commit)
self.setSortingEnabled(True)
def finish():
self.setSortingEnabled(True)
self.updating = False
self.render_signature = copy.deepcopy(signature)
self.row_batch.start(enumerate(keys), apply, finish)
self.updating = False
def add_rule(self, type_id):