Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
nathom committed Feb 15, 2022
2 parents 00e056d + c781e00 commit 8c1a1fe
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "streamrip"
version = "1.9.3"
version = "1.9.4"
description = "A fast, all-in-one music ripper for Qobuz, Deezer, Tidal, and SoundCloud"
authors = ["nathom <nathanthomas707@gmail.com>"]
license = "GPL-3.0-only"
Expand Down
2 changes: 1 addition & 1 deletion streamrip/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""streamrip: the all in one music downloader."""

__version__ = "1.9.3"
__version__ = "1.9.4"

from . import clients, constants, converter, downloadtools, media
4 changes: 2 additions & 2 deletions streamrip/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@
COVER_SIZES = ("thumbnail", "small", "large", "original")

TIDAL_CLIENT_INFO = {
"id": base64.b64decode("OFNFWldhNEoxTlZDNVU1WQ==").decode("iso-8859-1"),
"id": base64.b64decode("elU0WEhWVmtjMnREUG80dA==").decode("iso-8859-1"),
"secret": base64.b64decode(
"b3dVWURreGRkeis5RnB2R1gyNERseEVDTnRGRU1CeGlwVTBsQmZyYnE2MD0="
"VkpLaERGcUpQcXZzUFZOQlY2dWtYVEptd2x2YnR0UDd3bE1scmM3MnNlND0="
).decode("iso-8859-1"),
}

Expand Down
4 changes: 1 addition & 3 deletions streamrip/downloadtools.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,7 @@ async def _download_url(self, session, url):
async with session.get(url) as response, aiofiles.open(filename, "wb") as f:
# without aiofiles 3.6632679780000004s
# with aiofiles 2.504482839s
content = await response.content.read()
print(content)
await f.write(content)
await f.write(await response.content.read())

if self.callback:
self.callback()
Expand Down
4 changes: 3 additions & 1 deletion streamrip/media.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,9 @@ def _soundcloud_download(self, dl_info: dict):
import m3u8
import requests

parsed_m3u = m3u8.loads(requests.get(dl_info["url"]).text)
parsed_m3u = m3u8.loads(
requests.get(dl_info["url"]).content.decode("utf-8")
)
self.path += ".mp3"

with DownloadPool(segment.uri for segment in parsed_m3u.segments) as pool:
Expand Down

0 comments on commit 8c1a1fe

Please sign in to comment.