completed new cli

src/music_kraken/pages/abstract.py

@@ -104,7 +104,7 @@ def merge_together(old_object: DatabaseObject, new_object: DatabaseObject) -> Da
     return old_object
 
 
-class Page():
+class Page:
     """
     This is an abstract class, laying out the 
     functionality for every other class fetching something
@@ -270,7 +270,7 @@ class Page():
             for collection_name in naming_music_object.UPWARDS_COLLECTION_ATTRIBUTES:
                 collection: Collection = getattr(naming_music_object, collection_name)
                 
-                if collection.empty():
+                if collection.empty:
                     continue
                 if collection.element_type in naming_objects:
                     continue
@@ -280,10 +280,10 @@ class Page():
           
         fill_naming_objects(music_object)
           
-        return self._download(music_object, {}, genre, download_all)
+        return self._download(music_object, naming_objects, download_all)
 
 
-    def _download(self, music_object: DatabaseObject, naming_objects: Dict[Type[DatabaseObject], DatabaseObject], download_all: bool = False) -> list:
+    def _download(self, music_object: DatabaseObject, naming_objects: Dict[Union[Type[DatabaseObject], str], DatabaseObject], download_all: bool = False) -> DownloadResult:
         # Skips all releases, that are defined in shared.ALBUM_TYPE_BLACKLIST, if download_all is False
         if isinstance(music_object, Album):
             if not download_all and music_object.album_type in shared.ALBUM_TYPE_BLACKLIST:
@@ -298,7 +298,7 @@ class Page():
         download_result: DownloadResult = DownloadResult()
 
         for collection_name in music_object.DOWNWARDS_COLLECTION_ATTRIBUTES:
-            collection: Collection = getattr(self, collection_name)
+            collection: Collection = getattr(music_object, collection_name)
 
             sub_ordered_music_object: DatabaseObject
             for sub_ordered_music_object in collection:
@@ -306,11 +306,12 @@ class Page():
 
         return download_result
 
-    def _download_song(self, song: Song, naming_objects: Dict[Type[DatabaseObject], DatabaseObject]):
+    def _download_song(self, song: Song, naming_objects: Dict[Type[DatabaseObject], Union[DatabaseObject, str]]):
         name_attribute = DEFAULT_VALUES.copy()
         
         # song
-        name_attribute["genre"] = naming_objects["genre"]
+        if "genre" in naming_objects:
+            name_attribute["genre"] = naming_objects["genre"]
         name_attribute["song"] = song.title
         
         if Album in naming_objects:
@@ -344,7 +345,7 @@ class Page():
             file=str(random.randint(0, 999999))
         )
         
-        r = self._download_song_to_targets(source=sources[0], target=temp_target, desc=song.title)
+        r = self.download_song_to_target(source=sources[0], target=temp_target, desc=song.title)
 
         if not r.is_fatal_error:
             r.merge(self._post_process_targets(song, temp_target))

src/music_kraken/pages/musify.py

@@ -164,7 +164,6 @@ class Musify(Page):
             artist_thumbnail = image_soup.get("src")
 
         return Artist(
-            _id=_id,
             name=name,
             source_list=source_list
         )
@@ -269,7 +268,6 @@ class Musify(Page):
                 self.LOGGER.warning("got an unequal ammount than 3 small elements")
 
         return Album(
-            _id=_id,
             title=title,
             source_list=source_list,
             date=ID3Timestamp(year=year),
@@ -316,7 +314,6 @@ class Musify(Page):
                         _id = href.split("-")[-1]
 
                     artist_list.append(Artist(
-                        _id=_id,
                         name=artist_anchor.get_text(strip=True),
                         source_list=[artist_source]
                     ))
@@ -352,7 +349,6 @@ class Musify(Page):
                 _id = raw_id
 
         return Song(
-            _id=_id,
             title=song_title,
             main_artist_list=artist_list,
             source_list=source_list
@@ -838,7 +834,6 @@ class Musify(Page):
             self.LOGGER.debug("there is not even 1 footer in the album card")
 
         return Album(
-            _id=_id,
             title=name,
             source_list=source_list,
             date=timestamp,
@@ -998,7 +993,7 @@ class Musify(Page):
     def fetch_label(self, source: Source, stop_at_level: int = 1) -> Label:
         return Label()
     
-    def download_song_to_targets(self, source: Source, target: Target, desc: str = None) -> DownloadResult:
+    def download_song_to_target(self, source: Source, target: Target, desc: str = None) -> DownloadResult:
         """
         https://musify.club/track/im-in-a-coffin-life-never-was-waste-of-skin-16360302
         https://musify.club/track/dl/16360302/im-in-a-coffin-life-never-was-waste-of-skin.mp3