fixed mutable argument bug in the source dict of SourceAttribute

This commit is contained in:
Hellow2 2023-01-31 13:18:52 +01:00
parent ae9a70fb04
commit 2e6c58255c
7 changed files with 125 additions and 3 deletions

View File

@ -1,6 +1,7 @@
from music_kraken import ( from music_kraken import (
Song, Song,
Database Database,
Artist
) )
from music_kraken.pages import ( from music_kraken.pages import (
@ -20,8 +21,17 @@ def print_song(song_: Song):
print(song_.source_list) print(song_.source_list)
print("album:") print("album:")
print(song_.album.source_list) print(song_.album.source_list)
print("artist:")
print([a.source_list for a in song_.main_artist_list])
print([a.source_list for a in song_.feature_artist_list])
print("\n") print("\n")
def print_artist(artist: Artist):
print(artist)
print("---discography---")
for album in artist.discography:
print(album)
# only_smile = EncyclopaediaMetallum.search_by_query("only smile") # only_smile = EncyclopaediaMetallum.search_by_query("only smile")
# print(EncyclopaediaMetallum.search_by_query("#a Ghost Bath")) # print(EncyclopaediaMetallum.search_by_query("#a Ghost Bath"))
@ -43,4 +53,6 @@ print_song(song)
artist = song.main_artist_list[0] artist = song.main_artist_list[0]
artist = EncyclopaediaMetallum.fetch_artist_details(artist) artist = EncyclopaediaMetallum.fetch_artist_details(artist)
print_artist(artist)
# print(only_smile) # print(only_smile)

View File

@ -329,6 +329,7 @@ class Database:
for source in artist.source_list: for source in artist.source_list:
source.type_enum = SourceTypes.ARTIST source.type_enum = SourceTypes.ARTIST
source.add_song(artist)
self.push_source(source) self.push_source(source)
def pull_lyrics(self, song_ref: Reference = None, lyrics_ref: Reference = None) -> List[Lyrics]: def pull_lyrics(self, song_ref: Reference = None, lyrics_ref: Reference = None) -> List[Lyrics]:

View File

@ -362,10 +362,15 @@ class Artist(DatabaseObject, SourceAttribute, MetadataAttribute):
main_songs: List[Song] = None, main_songs: List[Song] = None,
feature_songs: List[Song] = None, feature_songs: List[Song] = None,
main_albums: List[Album] = None, main_albums: List[Album] = None,
album_type: str = None,
notes: str = None notes: str = None
): ):
DatabaseObject.__init__(self, id_=id_) DatabaseObject.__init__(self, id_=id_)
"""
TODO implement album type and notes
"""
self.album_type = album_type
self.notes = notes self.notes = notes
if main_albums is None: if main_albums is None:
@ -391,6 +396,9 @@ class Artist(DatabaseObject, SourceAttribute, MetadataAttribute):
def __repr__(self): def __repr__(self):
return self.__str__() return self.__str__()
def __eq__(self, __o: object) -> bool:
return self.id_ == __o.id_
def get_features(self) -> Album: def get_features(self) -> Album:
feature_release = Album( feature_release = Album(
title="features", title="features",

View File

@ -88,7 +88,12 @@ class SourceAttribute:
This is a class that is meant to be inherited from. This is a class that is meant to be inherited from.
it adds the source_list attribute to a class it adds the source_list attribute to a class
""" """
_source_dict: Dict[object, List[Source]] = {page_enum: list() for page_enum in SourcePages} _source_dict: Dict[object, List[Source]]
def __new__(cls, **_):
new = object.__new__(cls)
new._source_dict = {page_enum: list() for page_enum in SourcePages}
return new
def add_source(self, source: Source): def add_source(self, source: Source):
""" """

View File

@ -13,7 +13,11 @@ from ..database import (
Source, Source,
SourcePages, SourcePages,
Song, Song,
Album Album,
ID3Timestamp
)
from ..utils import (
string_processing
) )
@ -195,6 +199,71 @@ class EncyclopaediaMetallum(Page):
] ]
) )
@classmethod
def add_dicography(cls, artist: Artist, ma_artist_id: str) -> Artist:
discography_url = "https://www.metal-archives.com/band/discography/id/{}/tab/all"
# prepare tracklist
album_by_url = dict()
album_by_name = dict()
for album in artist.main_albums:
album_by_name[string_processing.unify(album.title)] = album
for source in album.get_sources_from_page(cls.SOURCE_TYPE):
album_by_url[source.url] = Album
old_discography = artist.main_albums.copy()
# save the ids of the albums, that are added to this set, so I can
# efficiently add all leftover albums from the discograpy to the new one
used_ids = set()
new_discography: List[Album] = []
r = cls.API_SESSION.get(discography_url.format(ma_artist_id))
if r.status_code != 200:
LOGGER.warning(f"code {r.status_code} at {discography_url.format(ma_artist_id)}")
return artist
soup = BeautifulSoup(r.text, 'html.parser')
tbody_soup = soup.find('tbody')
for tr_soup in tbody_soup.find_all('tr'):
td_list = tr_soup.findChildren(recursive=False)
album_soup = td_list[0]
album_name = album_soup.text
album_url = album_soup.find('a').get('href')
album_id = album_url.split('/')[-1]
album_type = td_list[1].text
album_year = td_list[2].text
unified_name = string_processing.unify(album_name)
album_obj: Album = Album(id_=album_id)
if album_url in album_by_url:
album_obj = album_by_url[album_url]
used_ids.add(album_obj.id)
elif unified_name in album_by_name:
album_obj = album_by_name[unified_name]
album_obj.add_source(Source(SourcePages.ENCYCLOPAEDIA_METALLUM, album_url))
used_ids.add(album_obj.id)
else:
album_obj.add_source(Source(SourcePages.ENCYCLOPAEDIA_METALLUM, album_url))
album_obj.title = album_name
album_obj.album_type = album_type
try:
album_obj.date = ID3Timestamp(year=int(album_year))
except ValueError():
pass
new_discography.append(album_obj)
for old_object in old_discography:
if old_object.id not in used_ids:
new_discography.append(old_object)
artist.main_albums = new_discography
return artist
@classmethod @classmethod
def fetch_artist_details(cls, artist: Artist) -> Artist: def fetch_artist_details(cls, artist: Artist) -> Artist:
source_list = artist.get_sources_from_page(cls.SOURCE_TYPE) source_list = artist.get_sources_from_page(cls.SOURCE_TYPE)
@ -203,6 +272,24 @@ class EncyclopaediaMetallum(Page):
# taking the fist source, cuz I only need one and multiple sources don't make that much sense # taking the fist source, cuz I only need one and multiple sources don't make that much sense
source = source_list[0] source = source_list[0]
artist_id = source.url.split("/")[-1]
print(source) print(source)
print("id", artist_id)
"""
https://www.metal-archives.com/bands/Ghost_Bath/3540372489
https://www.metal-archives.com/band/discography/id/3540372489/tab/all
---review---
https://www.metal-archives.com/review/ajax-list-band/id/3540372489/json/1?sEcho=1&iColumns=4&sColumns=&iDisplayStart=0&iDisplayLength=200&mDataProp_0=0&mDataProp_1=1&mDataProp_2=2&mDataProp_3=3&iSortCol_0=3&sSortDir_0=desc&iSortingCols=1&bSortable_0=true&bSortable_1=true&bSortable_2=true&bSortable_3=true&_=1675155257133
---simmilar-bands---
https://www.metal-archives.com/band/ajax-recommendations/id/3540372489
---external-sources---
https://www.metal-archives.com/link/ajax-list/type/band/id/3540372489
"""
# SIMPLE METADATA
# DISCOGRAPHY
artist = cls.add_dicography(artist, artist_id)
return artist return artist

View File

@ -0,0 +1,9 @@
def unify(string: str) -> str:
"""
returns an unified str, to make comparosons easy.
an unified string has following attributes:
- is lowercase
"""
return string.lower()

BIN
test.db

Binary file not shown.