Skip to content

Refactor SoundcloudDownloadable to fix async chunk dl problem. #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Refactor SoundcloudDownloadable to fix async chunk dl problem. #909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions streamrip/client/downloadable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,26 +341,29 @@ async def _download_mp3(self, path: str, callback):

parsed_m3u = m3u8.loads(content)
self._size = len(parsed_m3u.segments)
segment_count = len(parsed_m3u.segments)
tasks = [
asyncio.create_task(self._download_segment(segment.uri))
for segment in parsed_m3u.segments
asyncio.create_task(self._download_segment(i, segment.uri))
for i, segment in enumerate(parsed_m3u.segments)
]

segment_paths = []
segment_paths: dict[int, str] = {}
for coro in asyncio.as_completed(tasks):
segment_paths.append(await coro)
index, downloaded_path = await coro
segment_paths[index] = downloaded_path
callback(1)

await concat_audio_files(segment_paths, path, "mp3")
ordered_paths = [segment_paths[i] for i in range(segment_count)]
await concat_audio_files(ordered_paths, path, "mp3")

async def _download_segment(self, segment_uri: str) -> str:
async def _download_segment(self, index: int, segment_uri: str) -> tuple[int, str]:
tmp = generate_temp_path(segment_uri)
async with self.session.get(segment_uri) as resp:
resp.raise_for_status()
async with aiofiles.open(tmp, "wb") as file:
content = await resp.content.read()
await file.write(content)
return tmp
return index, tmp

async def size(self) -> int:
if self.file_type == "mp3":
Expand Down