From 45b5f0875a8fa35a7689a50a2ee1b6c79e033bad Mon Sep 17 00:00:00 2001
From: Hellow2 <lars.noack@outlook.de>
Date: Mon, 3 Apr 2023 11:47:30 +0200
Subject: [PATCH] fixed the download directory

---
 src/music_kraken/pages/abstract.py             | 18 ++++++++++++++++--
 .../pages/download_center/search.py            |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/music_kraken/pages/abstract.py b/src/music_kraken/pages/abstract.py
index ebb2f17..028c195 100644
--- a/src/music_kraken/pages/abstract.py
+++ b/src/music_kraken/pages/abstract.py
@@ -85,7 +85,7 @@ class Page:
             LOGGER.warning("to many tries. Aborting.")
             return None
 
-        return cls.get_request(url, accepted_response_codes, trie + 1)
+        return cls.get_request(url=url, stream=stream, accepted_response_codes=accepted_response_codes, trie=trie + 1)
 
     @classmethod
     def post_request(cls, url: str, json: dict, accepted_response_codes: set = set((200,)), trie: int = 0) -> Optional[
@@ -109,7 +109,7 @@ class Page:
             LOGGER.warning("to many tries. Aborting.")
             return None
 
-        return cls.post_request(url, json, accepted_response_codes, trie + 1)
+        return cls.post_request(url=url, json=json, accepted_response_codes=accepted_response_codes, trie=trie + 1)
 
     @classmethod
     def get_soup_from_response(cls, r: requests.Response) -> BeautifulSoup:
@@ -351,6 +351,8 @@ class Page:
         else:
             default_target = copy(default_target)
         default_target.artist = artist.name
+        if not artist.label_collection.empty:
+            default_target.label = artist.label_collection[0].name
         
         cls.fetch_details(artist)
         for album in artist.main_album_collection:
@@ -367,6 +369,10 @@ class Page:
         else:
             default_target = copy(default_target)
         default_target.album = album.title
+        if not album.artist_collection.empty:
+            default_target.artist = album.artist_collection[0].name
+        if not album.label_collection.empty:
+            default_target.label = album.label_collection[0].name
         
         cls.fetch_details(album)
         for song in album.song_collection:
@@ -379,6 +385,14 @@ class Page:
         else:
             default_target = copy(default_target)
         default_target.song = song.title
+        if not song.album_collection.empty:
+            default_target.album = song.album_collection[0].title
+        if not song.main_artist_collection.empty:
+            artist: Artist = song.main_artist_collection[0]
+            default_target.artist = artist.name
+            
+            if not artist.label_collection.empty:
+                default_target.label = artist.label_collection[0].name
         
         cls.fetch_details(song)
         
diff --git a/src/music_kraken/pages/download_center/search.py b/src/music_kraken/pages/download_center/search.py
index 5a84a77..65835a4 100644
--- a/src/music_kraken/pages/download_center/search.py
+++ b/src/music_kraken/pages/download_center/search.py
@@ -101,7 +101,7 @@ class Search(Download):
         db_object, page = self._current_option.choose_from_all_pages(index=index)
         
         music_object = self.fetch_details(db_object)
-        mpo = self.next_options_from_music_obj(music_object, page)
+        mpo = self.next_options(derive_from=music_object)
         
         mpo[page] = music_object.options