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

fix: some bug
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Hazel 2024-05-06 10:31:21 +02:00
parent a7711761f9
commit d9105fb55a
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/objects_collection.py
View File

@ -4,9 +4,6 @@ from music_kraken.objects import Song, Album, Artist, Collection
if __name__ == "__main__": if __name__ == "__main__":
song_1 = Song( song_1 = Song(
title="song", title="song",
main_artist_list=[Artist(
name="main_artist"
)],
feature_artist_list=[Artist( feature_artist_list=[Artist(
name="main_artist" name="main_artist"
)] )]

29
music_kraken/objects/collection.py
View File

@ -166,41 +166,30 @@ class Collection(Generic[T]):
object_trace(f"Appending {other.option_string} to {self}") object_trace(f"Appending {other.option_string} to {self}")
push_to: Optional[Tuple[Collection, T]] = None
for c in self.push_to: for c in self.push_to:
r = c._find_object(other) r = c._find_object(other)
if r is not None: if r is not None:
push_to_collection = (c, r) output("found push to", r, other, self, color=BColors.RED, sep="\t")
output("found push to", found, other, self, color=BColors.RED, sep="\t") return c.append(other, **kwargs)
break
pull_from: Optional[Tuple[Collection, T]] = None pull_from: Optional[Tuple[Collection, T]] = None
for c in self.pull_from: for c in self.pull_from:
r = c._find_object(other) r = c._find_object(other)
if r is not None: if r is not None:
pull_from_collection = (c, r) output("found pull from", r, other, self, color=BColors.RED, sep="\t")
output("found pull from", found, other, self, color=BColors.RED, sep="\t") other.merge(r, **kwargs)
c.remove(r, **kwargs)
break break
if pull_from is not None:
pull_from[0].remove(pull_from[1])
existing_object = self._find_object(other, no_push_to=kwargs.get("no_push_to", False)) existing_object = self._find_object(other, no_push_to=kwargs.get("no_push_to", False))
if existing_object is None: if existing_object is None:
if push_to is None:
self._append_new_object(other, **kwargs) self._append_new_object(other, **kwargs)
else: else:
push_to[0]._merge_into_contained_object(push_to[1], other, **kwargs) existing_object.merge(other, **kwargs)
if pull_from is not None: def remove(self, *other_list: List[T], silent: bool = False, **kwargs):
self._merge_into_contained_object(other if push_to is None else push_to[1], pull_from[1], **kwargs)
else:
self._merge_into_contained_object(existing_object, other, **kwargs)
if pull_from is not None:
self._merge_into_contained_object(existing_object, pull_from[1], **kwargs)
def remove(self, *other_list: List[T], silent: bool = False):
for other in other_list: for other in other_list:
existing: Optional[T] = self._indexed_values["id"].get(other.id, None) existing: Optional[T] = self._indexed_values["id"].get(other.id, None)
if existing is None: if existing is None:
@ -208,11 +197,13 @@ class Collection(Generic[T]):
raise ValueError(f"Object {other} not found in {self}") raise ValueError(f"Object {other} not found in {self}")
return other return other
"""
for collection_attribute, generator in self.extend_object_to_attribute.items(): for collection_attribute, generator in self.extend_object_to_attribute.items():
other.__getattribute__(collection_attribute).remove(*generator, silent=silent, **kwargs) other.__getattribute__(collection_attribute).remove(*generator, silent=silent, **kwargs)
for attribute, new_object in self.append_object_to_attribute.items(): for attribute, new_object in self.append_object_to_attribute.items():
other.__getattribute__(attribute).remove(new_object, silent=silent, **kwargs) other.__getattribute__(attribute).remove(new_object, silent=silent, **kwargs)
"""
self._data.remove(existing) self._data.remove(existing)
self._unmap_element(existing) self._unmap_element(existing)

2
music_kraken/utils/shared.py
View File

@ -15,7 +15,7 @@ __stage__ = os.getenv("STAGE", "prod")
DEBUG = (__stage__ == "dev") and True DEBUG = (__stage__ == "dev") and True
DEBUG_LOGGING = DEBUG and False DEBUG_LOGGING = DEBUG and False
DEBUG_TRACE = DEBUG and True DEBUG_TRACE = DEBUG and True
DEBUG_OBJECT_TRACE = DEBUG and True DEBUG_OBJECT_TRACE = DEBUG and False
DEBUG_OBJECT_TRACE_CALLSTACK = DEBUG_OBJECT_TRACE and False DEBUG_OBJECT_TRACE_CALLSTACK = DEBUG_OBJECT_TRACE and False
DEBUG_YOUTUBE_INITIALIZING = DEBUG and False DEBUG_YOUTUBE_INITIALIZING = DEBUG and False
DEBUG_PAGES = DEBUG and False DEBUG_PAGES = DEBUG and False