From f58685af58809fe8dd1409cfad395f6e7688cbe9 Mon Sep 17 00:00:00 2001 From: Hellow2 Date: Mon, 3 Apr 2023 16:23:30 +0200 Subject: [PATCH] fixed really disgusting bug --- src/music_kraken/objects/collection.py | 14 ++++++++++---- src/music_kraken/pages/abstract.py | 14 +++++++------- src/music_kraken/pages/musify.py | 5 +++-- src/musify_search.py | 6 +++++- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/music_kraken/objects/collection.py b/src/music_kraken/objects/collection.py index 3f30908..3a35e0a 100644 --- a/src/music_kraken/objects/collection.py +++ b/src/music_kraken/objects/collection.py @@ -9,6 +9,7 @@ from .parents import DatabaseObject class AppendResult: was_in_collection: bool current_element: DatabaseObject + was_the_same: bool class Collection: @@ -81,13 +82,18 @@ class Collection: # if the element type has been defined in the initializer it checks if the type matches if self.element_type is not None and not isinstance(element, self.element_type): raise TypeError(f"{type(element)} is not the set type {self.element_type}") + + # return if the same instance of the object is in the list + for existing in self._data: + if element is existing: + return AppendResult(True, element, True) for name, value in element.indexing_values: if value in self._attribute_to_object_map[name]: existing_object = self._attribute_to_object_map[name][value] if not merge_on_conflict: - return AppendResult(True, existing_object) + return AppendResult(True, existing_object, False) # if the object does already exist # thus merging and don't add it afterwards @@ -95,7 +101,7 @@ class Collection: existing_object.merge(element) # in case any relevant data has been added (e.g. it remaps the old object) self.map_element(existing_object) - return AppendResult(True, existing_object) + return AppendResult(True, existing_object, False) element.merge(existing_object) @@ -104,12 +110,12 @@ class Collection: self.unmap_element(existing_object) self.map_element(element) - return AppendResult(True, existing_object) + return AppendResult(True, existing_object, False) self._data.append(element) self.map_element(element) - return AppendResult(False, element) + return AppendResult(False, element, False) def extend(self, element_list: Iterable[DatabaseObject], merge_on_conflict: bool = True, merge_into_existing: bool = True): diff --git a/src/music_kraken/pages/abstract.py b/src/music_kraken/pages/abstract.py index fd908f9..176ac71 100644 --- a/src/music_kraken/pages/abstract.py +++ b/src/music_kraken/pages/abstract.py @@ -220,9 +220,11 @@ class Page: Album: Collection(element_type=Album), Song: Collection(element_type=Song) } - + cls._clean_music_object(new_music_object, collections) + print(collections[Album]) + music_object.merge(new_music_object) music_object.compile(merge_into=True) @@ -280,13 +282,11 @@ class Page: return for i, element in enumerate(collection): - r = collection_dict[collection.element_type].append(element) - if not r.was_in_collection: - cls._clean_music_object(r.current_element, collection_dict) - continue - + r = collection_dict[collection.element_type].append(element, merge_into_existing=True) collection[i] = r.current_element - cls._clean_music_object(r.current_element, collection_dict) + + if not r.was_the_same: + cls._clean_music_object(r.current_element, collection_dict) @classmethod def _clean_label(cls, label: Label, collections: Dict[Union[Type[Song], Type[Album], Type[Artist], Type[Label]], Collection]): diff --git a/src/music_kraken/pages/musify.py b/src/music_kraken/pages/musify.py index 84515e8..a820770 100644 --- a/src/music_kraken/pages/musify.py +++ b/src/music_kraken/pages/musify.py @@ -565,10 +565,11 @@ class Musify(Page): for card_soup in soup.find_all("div", {"class": "card"}): new_album: Album = cls.parse_album_card(card_soup, artist_name) album_source: Source + if stop_at_level > 1: for album_source in new_album.source_collection.get_sources_from_page(cls.SOURCE_TYPE): new_album.merge(cls._fetch_album_from_source(album_source, stop_at_level=stop_at_level-1)) - + discography.append(new_album) return discography @@ -726,7 +727,7 @@ class Musify(Page): discography: List[Album] = cls.get_discography(url, artist.name) artist.main_album_collection.extend(discography) - + return artist @classmethod diff --git a/src/musify_search.py b/src/musify_search.py index a90c209..51459dd 100644 --- a/src/musify_search.py +++ b/src/musify_search.py @@ -11,6 +11,10 @@ def fetch_artist(): artist = objects.Artist( source_list=[objects.Source(objects.SourcePages.MUSIFY, "https://musify.club/artist/psychonaut-4-83193")] ) + + artist = objects.Artist( + source_list=[objects.Source(objects.SourcePages.MUSIFY, "https://musify.club/artist/ghost-bath-280348/")] + ) artist = Musify.fetch_details(artist) print(artist.options) @@ -33,4 +37,4 @@ def fetch_album(): print(artist.id, artist.name) if __name__ == "__main__": - search() + fetch_artist()