Merge pull request #230 from georgekav2/feature/add_vorbis_opus_wav

Add support for opus and wav

2 files changed, 12 insertions, 8 deletions

diff --git a/app/dl_formats.py b/app/dl_formats.py
index e2f6591..8de79e9 100644
--- a/app/dl_formats.py
+++ b/app/dl_formats.py
@@ -1,5 +1,7 @@
 import copy
 
+AUDIO_FORMATS = ("m4a", "mp3", "opus", "wav")
+
 def get_format(format: str, quality: str) -> str:
     """
     Returns format for download
@@ -23,7 +25,7 @@ def get_format(format: str, quality: str) -> str:
         # Quality is irrelevant in this case since we skip the download
         return "bestaudio/best"
 
-    if format in ("m4a", "mp3"):
+    if format in AUDIO_FORMATS:
         # Audio quality needs to be set post-download, set in opts
         return "bestaudio/best"
 
@@ -59,17 +61,19 @@ def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict:
     if "postprocessors" not in opts:
         opts["postprocessors"] = []
 
-    if format in ("m4a", "mp3"):
+    if format in AUDIO_FORMATS:
         opts["postprocessors"].append({
             "key": "FFmpegExtractAudio",
             "preferredcodec": format,
             "preferredquality": 0 if quality == "best" else quality,
         })
 
-        opts["writethumbnail"] = True
-        opts["postprocessors"].append({"key": "FFmpegThumbnailsConvertor", "format": "jpg", "when": "before_dl"})
-        opts["postprocessors"].append({"key": "FFmpegMetadata"})
-        opts["postprocessors"].append({"key": "EmbedThumbnail"})
+        #Audio formats without thumbnail
+        if format not in ("wav"):
+            opts["writethumbnail"] = True
+            opts["postprocessors"].append({"key": "FFmpegThumbnailsConvertor", "format": "jpg", "when": "before_dl"})
+            opts["postprocessors"].append({"key": "FFmpegMetadata"})
+            opts["postprocessors"].append({"key": "EmbedThumbnail"})
     
     if format == "thumbnail":
         opts["skip_download"] = True
diff --git a/app/ytdl.py b/app/ytdl.py
index 3c21e0e..c001a16 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -7,7 +7,7 @@ import asyncio
 import multiprocessing

 import logging

 import re

-from dl_formats import get_format, get_opts

+from dl_formats import get_format, get_opts, AUDIO_FORMATS

 

 log = logging.getLogger('ytdl')

 

@@ -234,7 +234,7 @@ class DownloadQueue:
             if not self.queue.exists(entry['id']):

                 dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format, folder)

                 # Keep consistent with frontend

-                base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format  not in ("m4a", "mp3")) else self.config.AUDIO_DOWNLOAD_DIR

+                base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format not in AUDIO_FORMATS) else self.config.AUDIO_DOWNLOAD_DIR

                 if folder:

                     if not self.config.CUSTOM_DIRS:

                         return {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIRS is not true in the configuration.'}