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

feature/artwork_gallery #41

Merged
Hazel merged 25 commits from feature/artwork_gallery into experimental 2024-07-15 09:36:22 +00:00
Conversation 34 Commits 25 Files Changed 20 +22 -5
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ee6fd2137 - Show all commits

5
music_kraken/download/page_attributes.py
View File

@ -198,7 +198,12 @@ class Pages:
img.save(target.file_path, main_settings["image_format"]) img.save(target.file_path, main_settings["image_format"])
def remove_artwork_duplicates(self) -> None:
"""
This will eliminate duplicates within the given threshold
"""
pass
def _fetch_artist_artwork(self, artist: Artist, naming: dict): def _fetch_artist_artwork(self, artist: Artist, naming: dict):
naming: Dict[str, List[str]] = defaultdict(list, naming) naming: Dict[str, List[str]] = defaultdict(list, naming)

20
music_kraken/objects/artwork.py
View File

@ -80,9 +80,9 @@ class ArtworkCollection:
def __init__( def __init__(
self, self,
*data: List[Union[Artwork, ArtworkVariant, dict]], *data: List[Artwork],
parent_artworks: Set[ArtworkCollection] = None, parent_artworks: Set[ArtworkCollection] = None,
crop_images: bool = True crop_images: bool = True,
) -> None: ) -> None:
# this is used for the song artwork, to fall back to the song artwork # this is used for the song artwork, to fall back to the song artwork
self.parent_artworks: Set[ArtworkCollection] = parent_artworks or set() self.parent_artworks: Set[ArtworkCollection] = parent_artworks or set()
@ -91,6 +91,8 @@ class ArtworkCollection:
self._data = [] self._data = []
self.extend(data) self.extend(data)
def search_artwork(self, url: str) -> Optional[ArtworkVariant]: def search_artwork(self, url: str) -> Optional[ArtworkVariant]:
for artwork in self._data: for artwork in self._data:
if url in artwork: if url in artwork:
@ -104,7 +106,7 @@ class ArtworkCollection:
def _create_new_artwork(self, **kwargs) -> Tuple[Artwork, dict]: def _create_new_artwork(self, **kwargs) -> Tuple[Artwork, dict]:
kwargs["artwork_type"] = kwargs.get("artwork_type", self.artwork_type) kwargs["artwork_type"] = kwargs.get("artwork_type", self.artwork_type)
return create_dataclass_instance(Artwork, **kwargs) return create_dataclass_instance(ArtworkVariant, dict(**kwargs))
def add_data(self, url: str, **kwargs) -> None: def add_data(self, url: str, **kwargs) -> None:
kwargs["url"] = url kwargs["url"] = url
@ -112,12 +114,16 @@ class ArtworkCollection:
artwork = self.search_artwork(url) artwork = self.search_artwork(url)
if artwork is None: if artwork is None:
artwork, kwargs = self._create_new_artwork(url=url, **kwargs) artwork, kwargs = self._create_new_artwork(url=url)
self._data.append(artwork) self._data.append(artwork)
artwork.add_data(url, **kwargs) artwork.add_data(url, **kwargs)
def append(self, value: Union[Artwork, ArtworkVariant, dict], **kwargs): def append(self, value: Union[Artwork, ArtworkVariant, dict], **kwargs):
"""
You can append the types Artwork, ArtworkVariant or dict
the best option would be to use Artwork and avoid the other options.
"""
if isinstance(value, dict): if isinstance(value, dict):
kwargs.update(value) kwargs.update(value)
value, kwargs = create_dataclass_instance(ArtworkVariant, kwargs) value, kwargs = create_dataclass_instance(ArtworkVariant, kwargs)
@ -135,6 +141,12 @@ class ArtworkCollection:
self.append(value, **kwargs) self.append(value, **kwargs)
def compile(self) -> None: def compile(self) -> None:
"""
This will make the artworks ready for download
"""
for artwork in self._data:
for variants in artwork.variants:
pass
pass pass
def __merge__(self, other: ArtworkCollection, **kwargs) -> None: def __merge__(self, other: ArtworkCollection, **kwargs) -> None: