From 353f4ff85afc83b519ea51aaa5f28a9053c81d9b Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 19 May 2019 20:52:40 +1000 Subject: [PATCH] Deprecate livestreamer and libav-tools --- common.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/common.py b/common.py index 0fe6583..e90bbf7 100644 --- a/common.py +++ b/common.py @@ -149,23 +149,32 @@ def check_command_exists(cmd): return False def find_ffmpeg(): - for ffmpeg in ["ffmpeg", "avconv"]: - if check_command_exists([ffmpeg, "--help"]): - return ffmpeg + if check_command_exists(["ffmpeg", "--help"]): + return "ffmpeg" + + if check_command_exists(["avconv", "--help"]): + logging.warn("Detected libav-tools! ffmpeg is recommended") + return "avconv" raise Exception("You must install ffmpeg or libav-tools") def find_ffprobe(): - for ffprobe in ["ffprobe", "avprobe"]: - if check_command_exists([ffprobe, "--help"]): - return ffprobe + if check_command_exists(["ffprobe", "--help"]): + return "ffprobe" + + if check_command_exists(["avprobe", "--help"]): + logging.warn("Detected libav-tools! ffmpeg is recommended") + return "avprobe" raise Exception("You must install ffmpeg or libav-tools") def find_streamlink(): - for streamlink in ["streamlink", "livestreamer"]: - if check_command_exists([streamlink, "--help"]): - return streamlink + if check_command_exists(["streamlink", "--help"]): + return "streamlink" + + if check_command_exists(["livestreamer", "--help"]): + logging.warn("Detected livestreamer! streamlink is recommended") + return "livestreamer" raise Exception("You must install streamlink or livestreamer") -- 2.39.2