From e01c56f9e12d7abb2e3b548818a689146092806e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Thu, 30 Apr 2015 21:06:51 +0600
Subject: [PATCH] [YoutubeDL] Generalize best/worst format match behavior
---
youtube_dl/YoutubeDL.py | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index eee9c01543..9d4a2dce88 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -914,22 +914,16 @@ class YoutubeDL(object):
if not available_formats:
return None
- if format_spec == 'best' or format_spec is None:
+ if format_spec in ['best', 'worst', None]:
+ format_idx = 0 if format_spec == 'worst' else -1
audiovideo_formats = [
f for f in available_formats
if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
if audiovideo_formats:
- return audiovideo_formats[-1]
- # for audio only urls, 'best' selects the best audio format
+ return audiovideo_formats[format_idx]
+ # for audio only urls, select the best/worst audio format
elif all(f.get('acodec') != 'none' for f in available_formats):
- return available_formats[-1]
- elif format_spec == 'worst':
- audiovideo_formats = [
- f for f in available_formats
- if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
- if audiovideo_formats:
- return audiovideo_formats[0]
- return available_formats[0]
+ return available_formats[format_idx]
elif format_spec == 'bestaudio':
audio_formats = [
f for f in available_formats