From b3a589f1a9d4f84e180623cb32cb826579f52553 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Mon, 25 Oct 2021 17:15:09 +0100
Subject: Added simple MP3 support

---
 app/ytdl.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/ytdl.py')

diff --git a/app/ytdl.py b/app/ytdl.py
index f9084e3..0400877 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -39,6 +39,14 @@ class Download:
         vfmt, afmt = '', ''
         if format == 'mp4':
             vfmt, afmt = '[ext=mp4]', '[ext=m4a]'
+        elif format == 'mp3':
+            afmt = '/best'
+            ytdl_opts["writethumbnail"] = True
+            ytdl_opts["postprocessors"] = [
+                {"key": "FFmpegExtractAudio", "preferredcodec": "mp3"},
+                {"key": "EmbedThumbnail"},
+            ]
+
         if quality == 'best':
             self.format = f'bestvideo{vfmt}+bestaudio{afmt}/best{vfmt}'
         elif quality in ('1440p', '1080p', '720p', '480p'):
-- 
cgit 


From d0518142599d326bac12a66e0173eb0e2da2c66d Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:19:17 +0100
Subject: Added quality choice based on format

---
 app/ytdl.py | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'app/ytdl.py')

diff --git a/app/ytdl.py b/app/ytdl.py
index 0400877..63c3786 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -4,6 +4,7 @@ from collections import OrderedDict
 import asyncio
 import multiprocessing
 import logging
+from dl_formats import get_format, get_opts
 
 log = logging.getLogger('ytdl')
 
@@ -36,29 +37,8 @@ class Download:
     def __init__(self, download_dir, output_template, quality, format, ytdl_opts, info):
         self.download_dir = download_dir
         self.output_template = output_template
-        vfmt, afmt = '', ''
-        if format == 'mp4':
-            vfmt, afmt = '[ext=mp4]', '[ext=m4a]'
-        elif format == 'mp3':
-            afmt = '/best'
-            ytdl_opts["writethumbnail"] = True
-            ytdl_opts["postprocessors"] = [
-                {"key": "FFmpegExtractAudio", "preferredcodec": "mp3"},
-                {"key": "EmbedThumbnail"},
-            ]
-
-        if quality == 'best':
-            self.format = f'bestvideo{vfmt}+bestaudio{afmt}/best{vfmt}'
-        elif quality in ('1440p', '1080p', '720p', '480p'):
-            res = quality[:-1]
-            self.format = f'bestvideo[height<={res}]{vfmt}+bestaudio{afmt}/best[height<={res}]{vfmt}'
-        elif quality == 'audio':
-            self.format = f'bestaudio{afmt}'
-        elif quality.startswith('custom:'):
-            self.format = quality[7:]
-        else:
-            raise Exception(f'unknown quality {quality}')
-        self.ytdl_opts = ytdl_opts
+        self.format = get_format(format, quality)
+        self.ytdl_opts = get_opts(format, quality, ytdl_opts)
         self.info = info
         self.canceled = False
         self.tmpfilename = None
-- 
cgit 


From f52bea74d335cc84b9d08ebe485e620a8309b2a3 Mon Sep 17 00:00:00 2001
From: Alex Shnitman <alexta69@gmail.com>
Date: Sat, 20 Nov 2021 10:12:08 +0200
Subject: simplified format handling

---
 app/ytdl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/ytdl.py')

diff --git a/app/ytdl.py b/app/ytdl.py
index 688744b..e0267d7 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -159,7 +159,7 @@ class DownloadQueue:
         elif etype == 'video' or etype.startswith('url') and 'id' in entry and 'title' in entry:
             if entry['id'] not in self.queue:
                 dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format)
-                dldirectory = self.config.DOWNLOAD_DIR if quality != 'audio' else self.config.AUDIO_DOWNLOAD_DIR
+                dldirectory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format != 'mp3') else self.config.AUDIO_DOWNLOAD_DIR
                 self.queue[entry['id']] = Download(dldirectory, self.config.OUTPUT_TEMPLATE, quality, format, self.config.YTDL_OPTIONS, dl)
                 self.event.set()
                 await self.notifier.added(dl)
-- 
cgit