music-kraken/music-kraken-core
3
2
Fork 0
Code Issues 10 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

fix: some crashes

Browse Source
This commit is contained in:
Hazel 2024-04-17 18:13:03 +02:00
parent 7e4ba0b1a0
commit f000ad4484
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
music_kraken/objects/collection.py
View File

@ -60,8 +60,10 @@ class Collection(Generic[T]):
self._contains_ids.remove(__object.id) self._contains_ids.remove(__object.id)
for name, value in self._id_to_index_values[__object.id]: for name, value in self._id_to_index_values[__object.id]:
del self._indexed_values[name] if name in self._indexed_values:
del self._indexed_to_objects[value] del self._indexed_values[name]
if value in self._indexed_to_objects:
del self._indexed_to_objects[value]
del self._id_to_index_values[__object.id] del self._id_to_index_values[__object.id]
@ -228,7 +230,6 @@ class Collection(Generic[T]):
else: else:
# merge only if the two objects are not the same # merge only if the two objects are not the same
if existing_object.id == __object.id: if existing_object.id == __object.id:
exit()
return return
append_to._unmap_element(existing_object) append_to._unmap_element(existing_object)
@ -282,7 +283,7 @@ class Collection(Generic[T]):
yield from c.__iter__(finished_ids=finished_ids) yield from c.__iter__(finished_ids=finished_ids)
def __merge__(self, __other: Collection, override: bool = False): def __merge__(self, __other: Collection, override: bool = False):
self.extend(__other.__iter__()) self.extend(__other)
def __getitem__(self, item: int): def __getitem__(self, item: int):
if item < len(self._data): if item < len(self._data):

12
music_kraken/objects/parents.py
View File

@ -194,17 +194,23 @@ class OuterProxy:
if a._inner is b._inner: if a._inner is b._inner:
return return
# switch instances if more efficient # switch instances if more efficient
if len(b._inner._refers_to_instances) > len(a._inner._refers_to_instances): if len(b._inner._refers_to_instances) > len(a._inner._refers_to_instances):
a, b = b, a a, b = b, a
a._inner.__merge__(b._inner, override=override) a._inner.__merge__(b._inner, override=override)
for collection, child_collection in b._inner._is_collection_child.items(): for collection, child_collection in b._inner._is_collection_child.items():
collection.children.remove(child_collection) try:
collection.children.remove(child_collection)
except ValueError:
pass
for collection, parent_collection in b._inner._is_collection_parent.items(): for collection, parent_collection in b._inner._is_collection_parent.items():
collection.parents.remove(parent_collection) try:
collection.parents.remove(parent_collection)
except ValueError:
pass
a._inner._refers_to_instances.update(b._inner._refers_to_instances) a._inner._refers_to_instances.update(b._inner._refers_to_instances)