bugfix: fallback to other file formats (spotDL#1426)

Author: xnetcat

spotdl/download/downloader.py

@@ -177,9 +177,9 @@ async def download_song(self, song_object: SongObject) -> None:
                 return None
 
             if self.arguments["output_format"] == "m4a":
-                ytdl_format = "bestaudio[ext=m4a]"
+                ytdl_format = "bestaudio[ext=m4a]/bestaudio/best"
             elif self.arguments["output_format"] == "opus":
-                ytdl_format = "bestaudio[ext=webm]"
+                ytdl_format = "bestaudio[ext=webm]/bestaudio/best"
             else:
                 ytdl_format = "bestaudio"
 
@@ -220,7 +220,7 @@ async def download_song(self, song_object: SongObject) -> None:
 
             downloaded_file_path = Path(downloaded_file_path_string)
 
-            if self.arguments["output_format"] != "m4a":
+            if downloaded_file_path.suffix == ".m4a" and self.arguments["output_format"] != "m4a":
                 ffmpeg_success = await ffmpeg.convert(
                     downloaded_file_path=downloaded_file_path,
                     converted_file_path=converted_file_path,

spotdl/download/ffmpeg.py

@@ -68,7 +68,11 @@ async def convert(
         "mp3": ["-codec:a", "libmp3lame"],
         "flac": ["-codec:a", "flac"],
         "ogg": ["-codec:a", "libvorbis"],
-        "opus": ["-vn", "-c:a", "copy"],
+        "opus": [
+            "-vn", "-c:a", "copy"
+        ] if downloaded_file_path.endswith(".opus") else [
+            "-c:a", "libopus"
+        ],
         "m4a": ["-codec:a", "aac", "-vn"],
         "wav": [],
     }

spotdl/providers/provider_utils.py

@@ -1,5 +1,3 @@
-import re
-
 from pathlib import Path
 from typing import List