Skip to content

Bulk asynchronous downloader for multiple file hosts

fix: ignore `subfolders.create` on HLS segments

NTFSvolume667cd32ce15d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35816c462..0525f9481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+- Corrupted/mixed up video segments when downloading multiple concurrent HLS streams and `--subfolders.create` is `False`
- URL matching (Anysex)
## [10.7.0] - 2026-08-29
diff --git a/cyberdrop_dl/clients/downloads.py b/cyberdrop_dl/clients/downloads.py
index bddce6874..6a6bd3110 100644
--- a/cyberdrop_dl/clients/downloads.py
+++ b/cyberdrop_dl/clients/downloads.py
@@ -67,12 +67,14 @@ class DownloadClient:
async def _download(self, domain: str, media_item: MediaItem) -> bool:
"""Downloads a file."""
- downloaded_filename = await self.manager.database.history.get_downloaded_filename(domain, media_item)
- media_item.download_folder = _resolve_download_dir(media_item.download_folder, self.config)
if media_item.is_segment:
media_item.partial_file = media_item.path = media_item.download_folder / media_item.filename
else:
- media_item.partial_file = media_item.download_folder / f"{downloaded_filename}{constants.TempExt.PART}"
+ name = (
+ await self.manager.database.history.get_downloaded_filename(domain, media_item) or media_item.filename
+ )
+ media_item.download_folder = resolve_download_dir(media_item.download_folder, self.config)
+ media_item.partial_file = media_item.download_folder / f"{name}{constants.TempExt.PART}"
resume_point = 0
if self._supports_ranges and media_item.partial_file and (size := await aio.get_size(media_item.partial_file)):
@@ -493,7 +495,7 @@ async def _check_response(media_item: MediaItem, resp: AbstractResponse[Any], re
await aio.unlink(media_item.partial_file)
-def _resolve_download_dir(download_folder: Path, config: Config) -> Path:
+def resolve_download_dir(download_folder: Path, config: Config) -> Path:
if config.subfolders.create:
return download_folder
diff --git a/cyberdrop_dl/downloader/http.py b/cyberdrop_dl/downloader/http.py
index 05b65ed09..26a39c2b4 100644
--- a/cyberdrop_dl/downloader/http.py
+++ b/cyberdrop_dl/downloader/http.py
@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, ClassVar
from aiohttp import ClientConnectorError, ClientError, ClientResponseError
from cyberdrop_dl import aio, constants, ffmpeg, storage
-from cyberdrop_dl.clients.downloads import filter_by_duration
+from cyberdrop_dl.clients.downloads import filter_by_duration, resolve_download_dir
from cyberdrop_dl.downloader import hls
from cyberdrop_dl.exceptions import (
DownloadError,
@@ -287,6 +287,7 @@ class Downloader:
await self.__hls_download(media_item, m3u8_group)
async def __hls_download(self, media_item: MediaItem, rendition: Rendition) -> None:
+ media_item.download_folder = resolve_download_dir(media_item.download_folder, self.config)
media_item.path = media_item.download_folder / media_item.filename
media_item.download_filename = media_item.path.name
await self.manager.database.history.add_download_filename(media_item.domain, media_item)