Houmeres/SageTube
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Improve format selection for audio/video downloads

Browse Source 
Refactored format selection logic to explicitly handle audio-only and progressive formats using new flags. Updated GUI to pass format metadata, ensuring correct yt-dlp command construction and more reliable downloads for different format types.
This commit is contained in:
oop7
2025-11-01 12:28:32 +02:00
parent 60a6eecc75
commit 73479a46bd
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ytsage_downloader.py
+11 -14
View File
@@ -40,6 +40,8 @@ class DownloadThread(QThread):
url,
path,
format_id,
is_audio_only=False,
format_has_audio=False,
subtitle_langs=None,
is_playlist=False,
merge_subs=False,
@@ -61,6 +63,8 @@ class DownloadThread(QThread):
self.url = url
self.path = Path(path)
self.format_id = format_id
self.is_audio_only = is_audio_only
self.format_has_audio = format_has_audio
self.subtitle_langs = subtitle_langs if subtitle_langs else []
self.is_playlist = is_playlist
self.merge_subs = merge_subs
@@ -167,26 +171,19 @@ class DownloadThread(QThread):
# Format selection strategy - use format ID if provided or fallback to resolution
if self.format_id:
# Strip the -drc suffix if present to fix issues with certain audio formats
clean_format_id = self.format_id.split("-drc")[0] if "-drc" in self.format_id else self.format_id
# Use a simple heuristic: if format_id contains 'audio' or ends with 'a', treat as audio-only
# This avoids the need for Python API metadata extraction
is_audio_format = "audio" in clean_format_id.lower() or clean_format_id.endswith("a")
# For audio-only formats, don't try to merge with video
if is_audio_format:
# If the selected format is audio-only, pass it directly.
if self.is_audio_only:
cmd.extend(["-f", clean_format_id])
logger.debug(f"Using audio-only format selection: {clean_format_id}")
# If the selected format already includes an audio track (progressive), no merge needed.
elif self.format_has_audio:
cmd.extend(["-f", clean_format_id])
logger.debug(f"Using progressive format with bundled audio: {clean_format_id}")
else:
cmd.extend(["-f", f"{clean_format_id}+bestaudio/best"])
logger.debug(f"Using video format selection with audio: {clean_format_id}+bestaudio/best")
# Determine output format based on the selected format ID - only for video formats
# Note: This is a best-effort approach without Python API metadata
if not is_audio_format:
# Let yt-dlp handle format detection automatically via CLI
logger.debug("Letting yt-dlp CLI determine output format automatically")
logger.debug(f"Using video-only format merged with best audio: {clean_format_id}+bestaudio/best")
else:
# If no specific format ID, use resolution-based sorting (-S)
res_value = self.resolution if self.resolution else "720" # Default to 720p if no resolution specified