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

dsf

Browse Source
This commit is contained in:
Hellow2 2023-05-03 15:16:01 +02:00
parent c4e1095dfc
commit fa7efbe2c8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/music_kraken/connection/connection.py
View File

@ -81,6 +81,7 @@ class Connection:
timeout: float, timeout: float,
headers: dict, headers: dict,
refer_from_origin: bool = True, refer_from_origin: bool = True,
raw_url: bool = False,
**kwargs **kwargs
) -> Optional[requests.Response]: ) -> Optional[requests.Response]:
if try_count >= self.TRIES: if try_count >= self.TRIES:
@ -100,19 +101,21 @@ class Connection:
url=parsed_url url=parsed_url
) )
request_url = parsed_url.geturl() if not raw_url else url
retry = False retry = False
try: try:
r: requests.Response = request(url=parsed_url.geturl(), timeout=timeout, headers=headers, **kwargs) r: requests.Response = request(url=request_url, timeout=timeout, headers=headers, **kwargs)
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
self.LOGGER.warning(f"Request timed out at \"{url}\": ({try_count}-{self.TRIES})") self.LOGGER.warning(f"Request timed out at \"{request_url}\": ({try_count}-{self.TRIES})")
retry = True retry = True
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
self.LOGGER.warning(f"Couldn't connect to \"{url}\": ({try_count}-{self.TRIES})") self.LOGGER.warning(f"Couldn't connect to \"{request_url}\": ({try_count}-{self.TRIES})")
retry = True retry = True
if not retry: if not retry:
if self.SEMANTIC_NOT_FOUND and r.status_code == 404: if self.SEMANTIC_NOT_FOUND and r.status_code == 404:
self.LOGGER.warning(f"Couldn't find url (404): {url}") self.LOGGER.warning(f"Couldn't find url (404): {request_url}")
print(r.headers) print(r.headers)
print(r.request.headers) print(r.request.headers)
return return
@ -144,6 +147,7 @@ class Connection:
accepted_response_codes: set = None, accepted_response_codes: set = None,
timeout: float = None, timeout: float = None,
headers: dict = None, headers: dict = None,
raw_url: bool = False,
**kwargs **kwargs
) -> Optional[requests.Response]: ) -> Optional[requests.Response]:
r = self._request( r = self._request(
@ -155,6 +159,7 @@ class Connection:
timeout=timeout, timeout=timeout,
headers=headers, headers=headers,
refer_from_origin=refer_from_origin, refer_from_origin=refer_from_origin,
raw_url=raw_url,
**kwargs **kwargs
) )
if r is None: if r is None:
@ -170,6 +175,7 @@ class Connection:
accepted_response_codes: set = None, accepted_response_codes: set = None,
timeout: float = None, timeout: float = None,
headers: dict = None, headers: dict = None,
raw_url: bool = False,
**kwargs **kwargs
) -> Optional[requests.Response]: ) -> Optional[requests.Response]:
r = self._request( r = self._request(
@ -182,6 +188,7 @@ class Connection:
refer_from_origin=refer_from_origin, refer_from_origin=refer_from_origin,
json=json, json=json,
stream=stream, stream=stream,
raw_url=raw_url,
**kwargs **kwargs
) )
if r is None: if r is None:

2
src/music_kraken/pages/musify.py
View File

@ -1039,7 +1039,7 @@ class Musify(Page):
cls.LOGGER.warning(f"The source has no audio link. Falling back to {endpoint}.") 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/"}) r = cls.CONNECTION.get(endpoint, stream=True, allow_redirects=True, headers={"Connection": "https://musify.club/"}, raw_url=True)
if r is None: if r is None:
return DownloadResult(error_message=f"couldn't connect to {endpoint}") return DownloadResult(error_message=f"couldn't connect to {endpoint}")