Merge pull request 'fix/metal_archives' (#10) from fix/metal_archives into experimental

Reviewed-on: #10

.gitignore

@@ -18,3 +18,6 @@ venv
 windows
 
 .env
+
+# setuptools_scm
+_version.py

.woodpecker.yml

@@ -0,0 +1,57 @@
+labels:
+  platform: linux/amd64
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      tags: true
+
+steps:    
+  build-stable:
+    image: python
+    commands:
+      - sed -i 's/name = "music-kraken"/name = "music-kraken-stable"/' pyproject.toml
+      - python -m pip install -r requirements-dev.txt
+      - python3 -m build
+    environment:
+      - SETUPTOOLS_SCM_PRETEND_VERSION=${CI_COMMIT_TAG}
+    when:
+      - event: tag
+
+  build-dev:
+    image: python
+    commands:
+      - python -m pip install -r requirements-dev.txt
+      - python3 -m build
+    when:
+      - event: manual
+      - event: push
+        branch: experimental
+
+  publish-gitea:
+    image: gitea.elara.ws/music-kraken/plugin-twine
+    settings:
+      repository_url: "https://gitea.elara.ws/api/packages/music-kraken/pypi"
+      username:
+        from_secret: gitea_username
+      password:
+        from_secret: gitea_password
+    when:
+      - event: manual
+      - event: tag
+      - event: push
+        branch: experimental
+
+  publish-pypi:
+    image: gitea.elara.ws/music-kraken/plugin-twine
+    settings:
+      username:
+        from_secret: pypi_username
+      password:
+        from_secret: pypi_password
+    when:
+      - event: manual
+      - event: tag
+      - event: push
+        branch: experimental

README.md

@@ -1,5 +1,7 @@
 # Music Kraken
 
+[![Woodpecker CI Status](https://ci.elara.ws/api/badges/59/status.svg)](https://ci.elara.ws/repos/59)
+
 <img src="assets/logo.svg" width=300  alt="music kraken logo"/>
 
 - [Music Kraken](#music-kraken)

build

@@ -45,4 +45,4 @@ then
     exit
 fi
 
-twine upload dist/music_kraken*
+twine upload dist/music_kraken* 

music_kraken/__init__.py

@@ -9,8 +9,6 @@ from rich.console import Console
 from .utils.shared import DEBUG, DEBUG_LOGGING
 from .utils.config import logging_settings, main_settings, read_config
 
-__version__ = "1.15.0"
-
 read_config()
 
 console: Console = Console()
@@ -46,7 +44,7 @@ init_logging()
 from . import cli
 
 if DEBUG:
-    sys.setrecursionlimit(500)
+    sys.setrecursionlimit(300)
 
 
 if main_settings['modify_gc']:

music_kraken/objects/collection.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import TypeVar, Generic, Dict, Optional, Iterable, List, Iterator, Tuple
+from typing import TypeVar, Generic, Dict, Optional, Iterable, List, Iterator, Tuple, Generator, Union
 from .parents import OuterProxy
 
 T = TypeVar('T', bound=OuterProxy)
@@ -35,56 +35,40 @@ class Collection(Generic[T]):
         # Key: collection attribute (str) of appended element
         # Value: main collection to sync to
         self.contain_given_in_attribute: Dict[str, Collection] = contain_given_in_attribute or {}
-        self.contain_attribute_in_given: Dict[str, Collection] = contain_attribute_in_given or {}
         self.append_object_to_attribute: Dict[str, T] = append_object_to_attribute or {}
+        self.sync_on_append: Dict[str, Collection] = sync_on_append or {}
 
-        self.contain_self_on_append: List[str] = []
+        self._id_to_index_values: Dict[int, set] = defaultdict(set)
-
+        self._indexed_values = defaultdict(lambda: None)
-        self._indexed_values = defaultdict(set)
+        self._indexed_to_objects = defaultdict(lambda: None)
-        self._indexed_to_objects = defaultdict(list)
 
         self.extend(data)
 
     def _map_element(self, __object: T, from_map: bool = False):
-        if __object.id in self._contains_ids:
-            return
-
         self._contains_ids.add(__object.id)
 
-        for name, value in __object.indexing_values:
+        for name, value in (*__object.indexing_values, ('id', __object.id)):
-            if value is None:
+            if value is None or value == __object._inner._default_values.get(name):
                 continue
 
-            self._indexed_values[name].add(value)
+            self._indexed_values[name] = value
-            self._indexed_to_objects[value].append(__object)
+            self._indexed_to_objects[value] = __object
 
-        if not from_map:
+            self._id_to_index_values[__object.id].add((name, value))
-            for attribute, new_object in self.contain_given_in_attribute.items():
-                __object.__getattribute__(attribute).contain_collection_inside(new_object)
 
-            for attribute, new_object in self.contain_attribute_in_given.items():
+    def _unmap_element(self, __object: Union[T, int]):
-                new_object.contain_collection_inside(__object.__getattribute__(attribute))
+        obj_id = __object.id if isinstance(__object, OuterProxy) else __object
 
-            for attribute, new_object in self.append_object_to_attribute.items():
+        if obj_id in self._contains_ids:
-                __object.__getattribute__(attribute).append(new_object)
+            self._contains_ids.remove(obj_id)
 
-    def _unmap_element(self, __object: T):
+        for name, value in self._id_to_index_values[obj_id]:
-        if __object.id in self._contains_ids:
+            if name in self._indexed_values:
-            self._contains_ids.remove(__object.id)
+                del self._indexed_values[name]
+            if value in self._indexed_to_objects:
+                del self._indexed_to_objects[value]
 
-        for name, value in __object.indexing_values:
+        del self._id_to_index_values[obj_id]
-            if value is None:
-                continue
-            if value not in self._indexed_values[name]:
-                continue
-
-            try:
-                self._indexed_to_objects[value].remove(__object)
-            except ValueError:
-                continue
-
-            if not len(self._indexed_to_objects[value]):
-                self._indexed_values[name].remove(value)
 
     def _contained_in_self(self, __object: T) -> bool:
         if __object.id in self._contains_ids:
@@ -93,7 +77,7 @@ class Collection(Generic[T]):
         for name, value in __object.indexing_values:
             if value is None:
                 continue
-            if value in self._indexed_values[name]:
+            if value == self._indexed_values[name]:
                 return True
         return False
 
@@ -165,8 +149,8 @@ class Collection(Generic[T]):
             if value is None:
                 continue
 
-            if value in self._indexed_values[name]:
+            if value == self._indexed_values[name]:
-                existing_object = self._indexed_to_objects[value][0]
+                existing_object = self._indexed_to_objects[value]
                 if existing_object.id == __object.id:
                     return None
 
@@ -186,17 +170,10 @@ class Collection(Generic[T]):
     def contains(self, __object: T) -> bool:
         return len(self._contained_in_sub(__object)) > 0
 
-    def _append(self, __object: T, from_map: bool = False):
-        print(self, __object)
-        self._map_element(__object, from_map=from_map)
-        self._data.append(__object)
-
     def _find_object_in_self(self, __object: T) -> Optional[T]:
         for name, value in __object.indexing_values:
-            if value is None or value == __object._default_factories.get(name, lambda: None)():
+            if value == self._indexed_values[name]:
-                continue
+                return self._indexed_to_objects[value]
-            if value in self._indexed_values[name]:
-                return self._indexed_to_objects[value][0]
 
     def _find_object(self, __object: T, no_sibling: bool = False) -> Tuple[Collection[T], Optional[T]]:
         other_object = self._find_object_in_self(__object)
@@ -211,6 +188,7 @@ class Collection(Generic[T]):
         if no_sibling:
             return self, None
 
+        """
         # find in siblings and all children of siblings
         for parent in self.parents:
             for sibling in parent.children:
@@ -220,6 +198,7 @@ class Collection(Generic[T]):
                 o, other_object = sibling._find_object(__object, no_sibling=True)
                 if other_object is not None:
                     return o, other_object
+        """
 
         return self, None
 
@@ -235,7 +214,7 @@ class Collection(Generic[T]):
         :return:
         """
 
-        if __object is None or __object.id in self._contains_ids:
+        if __object is None:
             return
 
         append_to, existing_object = self._find_object(__object)
@@ -243,54 +222,56 @@ class Collection(Generic[T]):
         if existing_object is None:
             # append
             append_to._data.append(__object)
-            append_to._map_element(__object, from_map=from_map)
+            append_to._map_element(__object)
+
+            # only modify collections if the object actually has been appended
+            for collection_attribute, child_collection in self.contain_given_in_attribute.items():
+                __object.__getattribute__(collection_attribute).contain_collection_inside(child_collection, __object)
+
+            for attribute, new_object in self.append_object_to_attribute.items():
+                __object.__getattribute__(attribute).append(new_object)
+            
+            for attribute, collection in self.sync_on_append.items():
+                collection.extend(__object.__getattribute__(attribute))
+                __object.__setattr__(attribute, collection)
+
         else:
-            # merge
+            # merge only if the two objects are not the same
-            append_to._unmap_element(existing_object)
+            if existing_object.id == __object.id:
+                return
+
+            old_id = existing_object.id
+
             existing_object.merge(__object)
-            append_to._map_element(existing_object, from_map=from_map)
 
+            if existing_object.id != old_id:
+                append_to._unmap_element(old_id)
 
-    def extend(self, __iterable: Optional[Iterable[T]], from_map: bool = False):
+            append_to._map_element(existing_object)
+
+    def extend(self, __iterable: Optional[Generator[T, None, None]]):
         if __iterable is None:
             return
 
         for __object in __iterable:
-            self.append(__object, from_map=from_map)
+            self.append(__object)
 
-    def sync_with_other_collection(self, equal_collection: Collection):
+    def contain_collection_inside(self, sub_collection: Collection, _object: T):
-        """
-        If two collections always need to have the same values, this can be used.
-
-        Internally:
-        1. import the data from other to self
-            - _data
-            - contained_collections
-        2. replace all refs from the other object, with refs from this object
-        """
-        if equal_collection is self:
-            return
-
-        # don't add the elements from the subelements from the other collection.
-        # this will be done in the next step.
-        self.extend(equal_collection._data)
-        # add all submodules
-        for equal_sub_collection in equal_collection.children:
-            self.contain_collection_inside(equal_sub_collection)
-
-    def contain_collection_inside(self, sub_collection: Collection):
         """
         This collection will ALWAYS contain everything from the passed in collection
         """
         if self is sub_collection or sub_collection in self.children:
             return
 
+        _object._inner._is_collection_child[self] = sub_collection
+        _object._inner._is_collection_parent[sub_collection] = self
+
         self.children.append(sub_collection)
         sub_collection.parents.append(self)
 
     @property
     def data(self) -> List[T]:
-        return list(i for i in self.__iter__())
+        return list(self.__iter__())
 
     def __len__(self) -> int:
         return len(self._data) + sum(len(collection) for collection in self.children)
@@ -312,7 +293,7 @@ class Collection(Generic[T]):
             yield from c.__iter__(finished_ids=finished_ids)
 
     def __merge__(self, __other: Collection, override: bool = False):
-        self.extend(__other._data, from_map=True)
+        self.extend(__other)
 
     def __getitem__(self, item: int):
         if item < len(self._data):

music_kraken/objects/parents.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 import random
 from collections import defaultdict
 from functools import lru_cache
-
 from typing import Optional, Dict, Tuple, List, Type, Generic, Any, TypeVar, Set
 
+from pathlib import Path
+import inspect
+
 from .metadata import Metadata
 from ..utils import get_unix_time, object_trace
 from ..utils.config import logging_settings, main_settings
@@ -29,12 +31,16 @@ class InnerData:
     _refers_to_instances: set = None
 
     def __init__(self, object_type, **kwargs):
-        self._refers_to_instances =set()
+        self._refers_to_instances = set()
+
+        # collection : collection that is a collection of self
+        self._is_collection_child: Dict[Collection, Collection] = {}
+        self._is_collection_parent: Dict[Collection, Collection] = {}
         
         # initialize the default values
-        self.__default_values = {}
+        self._default_values = {}
         for name, factory in object_type._default_factories.items():
-            self.__default_values[name] = factory()
+            self._default_values[name] = factory()
 
         for key, value in kwargs.items():
             self.__setattr__(key, value)
@@ -48,7 +54,7 @@ class InnerData:
 
         for key, value in __other.__dict__.copy().items():
             # just set the other value if self doesn't already have it
-            if key not in self.__dict__ or (key in self.__dict__ and self.__dict__[key] == self.__default_values.get(key)):
+            if key not in self.__dict__ or (key in self.__dict__ and self.__dict__[key] == self._default_values.get(key)):
                 self.__setattr__(key, value)
                 continue
 
@@ -158,15 +164,7 @@ class OuterProxy:
             self._add_other_db_objects(key, value)
 
     def __hash__(self):
-        """
+        return id(self)
-        :raise: IsDynamicException
-        :return:
-        """
-
-        if self.dynamic:
-            return id(self._inner)
-
-        return self.id
 
     def __eq__(self, other: Any):
         return self.__hash__() == other.__hash__()
@@ -183,23 +181,42 @@ class OuterProxy:
         if __other is None:
             return
 
-        object_trace(f"merging {type(self).__name__} [{self.title_string}] with {type(__other).__name__} [{__other.title_string}]")
 
         a = self
         b = __other
 
-        if a._inner is b._inner:
+        if a.id == b.id:
             return
-
+        
         # switch instances if more efficient
         if len(b._inner._refers_to_instances) > len(a._inner._refers_to_instances):
             a, b = b, a
 
-        a._inner.__merge__(b._inner, override=override)
+        object_trace(f"merging {type(a).__name__} [{a.title_string} | {a.id}] with {type(b).__name__} [{b.title_string} | {b.id}] called by [{' | '.join(f'{s.function} {Path(s.filename).name}:{str(s.lineno)}' for s in inspect.stack()[1:5])}]")
-        a._inner._refers_to_instances.update(b._inner._refers_to_instances)
+        
+        for collection, child_collection in b._inner._is_collection_child.items():
+            try:
+                collection.children.remove(child_collection)
+            except ValueError:
+                pass
+            
+        for collection, parent_collection in b._inner._is_collection_parent.items():
+            try:
+                collection.parents.remove(parent_collection)
+            except ValueError:
+                pass
 
-        for instance in b._inner._refers_to_instances:
+        old_inner = b._inner
+
+        for instance in b._inner._refers_to_instances.copy():
             instance._inner = a._inner
+            a._inner._refers_to_instances.add(instance)
+
+        a._inner.__merge__(old_inner, override=override)
+        del old_inner
+
+    def __merge__(self, __other: Optional[OuterProxy], override: bool = False):
+        self.merge(__other, override)
 
     def mark_as_fetched(self, *url_hash_list: List[str]):
         for url_hash in url_hash_list:

music_kraken/objects/song.py

@@ -49,6 +49,7 @@ class Song(Base):
     source_collection: SourceCollection
     target_collection: Collection[Target]
     lyrics_collection: Collection[Lyrics]
+
     main_artist_collection: Collection[Artist]
     feature_artist_collection: Collection[Artist]
     album_collection: Collection[Album]
@@ -85,9 +86,15 @@ class Song(Base):
     TITEL = "title"
 
     def __init_collections__(self) -> None:
+        """
         self.album_collection.contain_given_in_attribute = {
             "artist_collection": self.main_artist_collection,
         }
+        """
+        self.album_collection.sync_on_append = {
+            "artist_collection": self.main_artist_collection,
+        }
+
         self.album_collection.append_object_to_attribute = {
             "song_collection": self,
         }
@@ -241,12 +248,19 @@ class Album(Base):
     UPWARDS_COLLECTION_STRING_ATTRIBUTES = ("artist_collection", "label_collection")
 
     def __init_collections__(self):
-        self.song_collection.contain_attribute_in_given = {
-            "main_artist_collection": self.artist_collection
-        }
         self.song_collection.append_object_to_attribute = {
             "album_collection": self
         }
+        self.song_collection.sync_on_append = {
+            "main_artist_collection": self.artist_collection
+        }
+
+        self.artist_collection.append_object_to_attribute = {
+            "main_album_collection": self
+        }
+        self.artist_collection.contain_given_in_attribute = {
+            "label_collection": self.label_collection
+        }
 
     def _add_other_db_objects(self, object_type: Type[OuterProxy], object_list: List[OuterProxy]):
         if object_type is Song:
@@ -642,6 +656,15 @@ class Label(Base):
                          contact_list=contact_list, album_list=album_list, current_artist_list=current_artist_list,
                          **kwargs)
 
+    def __init_collections__(self):
+        self.album_collection.append_object_to_attribute = {
+            "label_collection": self
+        }
+
+        self.current_artist_collection.append_object_to_attribute = {
+            "label_collection": self
+        }
+
     @property
     def indexing_values(self) -> List[Tuple[str, object]]:
         return [

music_kraken/objects/source.py

@@ -104,14 +104,7 @@ class Source(OuterProxy):
             ('url', self.url),
             ('audio_url', self.audio_url),
         ]
-
+        
-    def __merge__(self, __other: Source, override: bool = False):
-        if override:
-            self.audio_url = __other.audio_url
-
-        if self.audio_url is None or (override and __other.audio_url is not None):
-            self.audio_url = __other.audio_url
-
     def __str__(self):
         return self.__repr__()
 

music_kraken/pages/musify.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
-from typing import List, Optional, Type, Union
+from typing import List, Optional, Type, Union, Generator
 from urllib.parse import urlparse
 
 import pycountry
@@ -1056,7 +1056,7 @@ class Musify(Page):
             date=date
         )
 
-    def _get_discography(self, url: MusifyUrl, artist_name: str = None, stop_at_level: int = 1) -> List[Album]:
+    def _get_discography(self, url: MusifyUrl, artist_name: str = None, stop_at_level: int = 1) -> Generator[Album, None, None]:
         """
         POST https://musify.club/artist/filteralbums
         ArtistID: 280348
@@ -1077,18 +1077,8 @@ class Musify(Page):
             return []
         soup: BeautifulSoup = BeautifulSoup(r.content, features="html.parser")
 
-        discography: List[Album] = []
         for card_soup in soup.find_all("div", {"class": "card"}):
-            new_album: Album = self._parse_album_card(card_soup, artist_name)
+            yield self._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(self.SOURCE_TYPE):
-                    new_album.merge(self.fetch_album(album_source, stop_at_level=stop_at_level-1))
-            
-            discography.append(new_album)
-
-        return discography
 
     def fetch_artist(self, source: Source, stop_at_level: int = 1) -> Artist:
         """
@@ -1110,8 +1100,7 @@ class Musify(Page):
 
         artist = self._get_artist_attributes(url)
 
-        discography: List[Album] = self._get_discography(url, artist.name)
+        artist.main_album_collection.extend(self._get_discography(url, artist.name))
-        artist.main_album_collection.extend(discography)
         
         return artist
 

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling", "hatch-requirements-txt" ]
+requires = ["hatchling", "hatch-requirements-txt", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build]
@@ -15,7 +15,15 @@ packages = ["music_kraken"]
 music-kraken = "music_kraken.__main__:cli" 
 
 [tool.hatch.version]
-path = "music_kraken/__init__.py"
+source = "vcs"
+path = "music_kraken/_version.py"
+fallback-version = "0.0.0"
+
+[tool.hatch.version.raw-options]
+local_scheme = "no-local-version"
+
+[tool.hatch.build.hooks.vcs]
+version-file = "music_kraken/_version.py"
 
 [project]
 name = "music-kraken"