From eb8124b39177ec3a07ca8b224eeb7f50b87c0dcd Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sat, 13 Sep 2025 17:56:20 -0600
Subject: [PATCH] Moving bestvideo/bestaudio to end of format selection so the
 preferred formats are downloaded first.

---
 modules/videos/downloader.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/videos/downloader.py b/modules/videos/downloader.py
index 4ddd1e73..d81f3b61 100755
--- a/modules/videos/downloader.py
+++ b/modules/videos/downloader.py
@@ -42,44 +42,46 @@ logger = logger.getChild(__name__)
 
 VIDEO_RESOLUTION_MAP = {
     '360p': [
-        'bestvideo[height=360]+bestaudio/best[height=360]',
         '134+bestaudio', '230+bestaudio', 'mp4-360p', 'res:360',
         'hls-175+bestaudio',  # 360p avc1 + best audio
         '396+bestaudio', '243+bestaudio',  # Vertical
         'hls-655+bestaudio', 'hls-655',
+        'bestvideo[height=360]+bestaudio/best[height=360]',
     ],
     '480p': [
-        'bestvideo[height=480]+bestaudio/best[height=480]',
         '135+bestaudio', '231+bestaudio', '135+139', 'mp4-480p', 'res:480',
         'hls-312+bestaudio',  # 480p avc1 + best audio
         '788+bestaudio', '780+bestaudio', '397+bestaudio',  # Vertical
+        'bestvideo[height=480]+bestaudio/best[height=480]',
     ],
     '720p': [
-        'bestvideo[height=720]+bestaudio/best[height=720]',
-        '298+bestaudio', '232+bestaudio',  # 720@60 avc1 + best audio
         '136+bestaudio', '22', '311+bestaudio', 'res:720',
+        '298+bestaudio', '232+bestaudio',  # 720@60 avc1 + best audio
         'hls-517+bestaudio', 'hls-637+bestaudio',  # 720p avc1 + best audio
         '398+bestaudio', '247+bestaudio',  # Vertical
         'hls-2890+bestaudio', 'hls-2890',
+        'bestvideo[height=720]+bestaudio/best[height=720]',
     ],
     '1080p': [
-        'bestvideo[height=1080]+bestaudio/best[height=1080]',
-        '299+bestaudio', '312+bestaudio', '270+bestaudio',  # 1080@60 avc1 + best audio
         '137+bestaudio', '614+bestaudio', 'res:1080',
+        '299+bestaudio', '312+bestaudio', '270+bestaudio',  # 1080@60 avc1 + best audio
         'hls-899+bestaudio', 'hls-1271+bestaudio',  # 1080p avc1 + best audio
         '399+bestaudio', '616+bestaudio',  # Vertical
         'hls-4026+bestaudio', 'hls-4026',
+        'bestvideo[height=1080]+bestaudio/best[height=1080]',
     ],
     '1440p': [
-        'bestvideo[height=1440]+bestaudio/best[height=1440]',
         '639+bestaudio',  # vp9, best audio, hdr
         '623+bestaudio',  # vp9, best audio, no hdr
-        '620+bestaudio', 'res:1440'],
+        '620+bestaudio', 'res:1440',
+        'bestvideo[height=1440]+bestaudio/best[height=1440]',
+    ],
     '2160p': [
-        'bestvideo[height=2160]+bestaudio/best[height=2160]',
         '642+bestaudio',  # vp9, best audio, hdr
         '628+bestaudio',  # vp9, best audio, no hdr
-        '625+bestaudio', 'res:2160'],
+        '625+bestaudio', 'res:2160',
+        'bestvideo[height=2160]+bestaudio/best[height=2160]',
+    ],
     'maximum': ['bestvideo*+bestaudio/best'],
 }