From 82ddc4f5d6bccea26b3606b2968b5c9172639d93 Mon Sep 17 00:00:00 2001
From: Hellow <Lars.Noack@outlook.de>
Date: Wed, 3 May 2023 16:14:03 +0200
Subject: [PATCH] fixed nasty bug, where musify just returned 404 al lthe time

---
 src/actual_donwload.py                    |  4 +--
 src/music_kraken/connection/connection.py | 41 ++++++++++-------------
 src/music_kraken/pages/musify.py          |  2 +-
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/actual_donwload.py b/src/actual_donwload.py
index 5341779..5c3cb71 100644
--- a/src/actual_donwload.py
+++ b/src/actual_donwload.py
@@ -53,7 +53,7 @@ def real_download():
 
 if __name__ == "__main__":
     music_kraken.cli(genre="test", command_list=[
-        # "https://musify.club/release/molchat-doma-etazhi-2018-1092949",
-        "https://musify.club/release/ghost-bath-self-loather-2021-1554266",
+        "https://musify.club/release/molchat-doma-etazhi-2018-1092949",
+        # "https://musify.club/release/ghost-bath-self-loather-2021-1554266",
         "ok"
     ])
diff --git a/src/music_kraken/connection/connection.py b/src/music_kraken/connection/connection.py
index d5e1a28..70c77ea 100644
--- a/src/music_kraken/connection/connection.py
+++ b/src/music_kraken/connection/connection.py
@@ -50,7 +50,7 @@ class Connection:
         return {
             "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36",
             "Connection": "keep-alive",
-            "Host": self.HOST.netloc,
+            # "Host": self.HOST.netloc,
             "Referer": self.base_url(),
             **header_values
         }
@@ -92,9 +92,6 @@ class Connection:
 
         parsed_url = urlparse(url)
 
-        print(url)
-        print(parsed_url)
-
         headers = self._update_headers(
             headers=headers,
             refer_from_origin=refer_from_origin,
@@ -103,32 +100,30 @@ class Connection:
 
         request_url = parsed_url.geturl() if not raw_url else url
 
-        retry = False
+        connection_failed = False
         try:
-            r: requests.Response = request(url=request_url, timeout=timeout, headers=headers, **kwargs)
-        except requests.exceptions.Timeout:
-            self.LOGGER.warning(f"Request timed out at \"{request_url}\": ({try_count}-{self.TRIES})")
-            retry = True
-        except requests.exceptions.ConnectionError:
-            self.LOGGER.warning(f"Couldn't connect to \"{request_url}\": ({try_count}-{self.TRIES})")
-            retry = True
+            r: requests.Response = request(request_url, timeout=timeout, headers=headers, **kwargs)
 
-        if not retry:
-            if self.SEMANTIC_NOT_FOUND and r.status_code == 404:
-                self.LOGGER.warning(f"Couldn't find url (404): {request_url}")
-                print(r.headers)
-                print(r.request.headers)
-                return
             if r.status_code in accepted_response_code:
                 return r
 
-        if not retry:
+            if self.SEMANTIC_NOT_FOUND and r.status_code == 404:
+                self.LOGGER.warning(f"Couldn't find url (404): {request_url}")
+                return None
+
+        except requests.exceptions.Timeout:
+            self.LOGGER.warning(f"Request timed out at \"{request_url}\": ({try_count}-{self.TRIES})")
+            connection_failed = True
+        except requests.exceptions.ConnectionError:
+            self.LOGGER.warning(f"Couldn't connect to \"{request_url}\": ({try_count}-{self.TRIES})")
+            connection_failed = True
+
+        if not connection_failed:
             self.LOGGER.warning(f"{self.HOST.netloc} responded wit {r.status_code} "
                                 f"at {url}. ({try_count}-{self.TRIES})")
             self.LOGGER.debug(r.content)
 
         self.rotate()
-        print(r.headers)
 
         return self._request(
             request=request,
@@ -155,11 +150,11 @@ class Connection:
             try_count=0,
             accepted_response_code=accepted_response_codes or self.ACCEPTED_RESPONSE_CODES,
             url=url,
-            stream=stream,
             timeout=timeout,
             headers=headers,
-            refer_from_origin=refer_from_origin,
             raw_url=raw_url,
+            refer_from_origin=refer_from_origin,
+            stream=stream,
             **kwargs
         )
         if r is None:
@@ -186,9 +181,9 @@ class Connection:
             timeout=timeout,
             headers=headers,
             refer_from_origin=refer_from_origin,
+            raw_url=raw_url,
             json=json,
             stream=stream,
-            raw_url=raw_url,
             **kwargs
         )
         if r is None:
diff --git a/src/music_kraken/pages/musify.py b/src/music_kraken/pages/musify.py
index d73e3b9..4c1ce04 100644
--- a/src/music_kraken/pages/musify.py
+++ b/src/music_kraken/pages/musify.py
@@ -1039,7 +1039,7 @@ class Musify(Page):
 
             cls.LOGGER.warning(f"The source has no audio link. Falling back to {endpoint}.")
 
-        r = cls.CONNECTION.get(endpoint, stream=True, allow_redirects=True, headers={"Connection": "https://musify.club/"}, raw_url=True)
+        r = cls.CONNECTION.get(endpoint, stream=True, raw_url=True)
         if r is None:
             return DownloadResult(error_message=f"couldn't connect to {endpoint}")