Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JSONify ModelItemDeleted.ids for QML if needed

Browse Source 
If a model has tuple keys, these already get turned into JSON strings
for the ModelItemSet pyotherside event (for QML and JS reasons).
Do the same for ModelItemDeleted's ids field, else the QML event handler
will be unable to find the items by IDs.
This commit is contained in:
miruka 2020-11-01 01:52:56 -04:00
parent b38fbc6d9b
commit 8ca8f490fa
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/models/model.py
View File

@ -11,6 +11,7 @@ from typing import (
from sortedcontainers import SortedList
from ..pyotherside_events import ModelCleared, ModelItemDeleted, ModelItemSet
from ..utils import serialize_value_for_qml
from . import SyncId
if TYPE_CHECKING:
@ -150,7 +151,8 @@ class Model(MutableMapping):
if self.sync_id:
if self._active_batch_removed is None:
ModelItemDeleted(self.sync_id, index, 1, (item.id,))
i = serialize_value_for_qml(item.id, json_list_dicts=True)
ModelItemDeleted(self.sync_id, index, 1, (i,))
else:
self._active_batch_removed.append((index, item.id))
@ -199,12 +201,15 @@ class Model(MutableMapping):
itertools.groupby(batch, key=lambda x: x[0])
]
def serialize_id(id_):
return serialize_value_for_qml(id_, json_list_dicts=True)
for group in groups:
ModelItemDeleted(
self.sync_id,
index = group[0][0],
count = len(group),
ids = [item[1] for item in group],
ids = [serialize_id(item[1]) for item in group],
)
self._active_batch_removed = None