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

fix: if 2 proxies refer to multiple objects the merge unsyncs them causing a recursion depth error

Browse Source
This commit is contained in:
Hazel
2024-04-15 13:56:40 +02:00
parent 5284c1f55c
commit a5ede2a6ad
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
development/objects_collection.py
View File

@@ -11,7 +11,11 @@ if __name__ == "__main__":
Song( Song(
title="song", title="song",
album_list=[ album_list=[
Album(title="album", albumsort=123), Album(
title="album",
albumsort=123,
main_artist=Artist(name="artist"),
),
], ],
), ),
Song( Song(

21
music_kraken/objects/parents.py
View File

@@ -26,9 +26,11 @@ class InnerData:
If the data in the wrapper class has to be merged, then this class is just replaced and garbage collected. If the data in the wrapper class has to be merged, then this class is just replaced and garbage collected.
""" """
_multiple_instances = False _refers_to_instances: set = None
def __init__(self, object_type, **kwargs): def __init__(self, object_type, **kwargs):
self._refers_to_instances = set()
# initialize the default values # initialize the default values
self.__default_values = {} self.__default_values = {}
for name, factory in object_type._default_factories.items(): for name, factory in object_type._default_factories.items():
@@ -176,23 +178,28 @@ class OuterProxy:
:return: :return:
""" """
if __other is None: if __other is None:
_ = "debug"
return return
a = self a = self
b = __other b = __other
if a._inner._multiple_instances and b._inner._multiple_instances: if a._inner is b._inner:
LOGGER.warning(f"Both instances data obj are shared over multiple objects. This will lead so them being unsynchronized at some point. {a} {b}") return
if b._inner._multiple_instances: # switch instances if more efficient
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)
if len(b._inner._refers_to_instances) > 1:
for instance in b._inner._refers_to_instances:
instance._inner = a._inner
b._inner = a._inner b._inner = a._inner
b._inner._refers_to_instances.add(a)
b._inner._multiple_instances = True b._inner._refers_to_instances.add(b)
def mark_as_fetched(self, *url_hash_list: List[str]): def mark_as_fetched(self, *url_hash_list: List[str]):
for url_hash in url_hash_list: for url_hash in url_hash_list:

8
tests/test_collection.py
View File

@@ -70,13 +70,8 @@ class TestCollection(unittest.TestCase):
self.assertTrue(a.name == b.name == c.name == d.name == "artist") self.assertTrue(a.name == b.name == c.name == d.name == "artist")
self.assertTrue(a.country == b.country == c.country == d.country) self.assertTrue(a.country == b.country == c.country == d.country)
"""
def test_song_artist_relations(self): def test_song_artist_relations(self):
"""
Tests that
artist = artist.any_album.any_song.one_artist
is the same object
"""
a = self.complicated_object() a = self.complicated_object()
b = a.main_album_collection[0].song_collection[0].main_artist_collection[0] b = a.main_album_collection[0].song_collection[0].main_artist_collection[0]
c = b.main_album_collection[0].song_collection[0].main_artist_collection[0] c = b.main_album_collection[0].song_collection[0].main_artist_collection[0]
@@ -85,6 +80,7 @@ class TestCollection(unittest.TestCase):
self.assertTrue(a.id == b.id == c.id == d.id) self.assertTrue(a.id == b.id == c.id == d.id)
self.assertTrue(a.name == b.name == c.name == d.name == "artist") self.assertTrue(a.name == b.name == c.name == d.name == "artist")
self.assertTrue(a.country == b.country == c.country == d.country) self.assertTrue(a.country == b.country == c.country == d.country)
"""
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()