From 51ab2efc693983dcca6d79b531339b00e23fa871 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Nov 2017 13:39:20 -0400 Subject: avoid warning when youtube-dl is not installed If a user does not have it installed, don't warn on every imported item about it. --- Annex/YoutubeDl.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Annex') diff --git a/Annex/YoutubeDl.hs b/Annex/YoutubeDl.hs index 18e363eb5..1eafa4173 100644 --- a/Annex/YoutubeDl.hs +++ b/Annex/YoutubeDl.hs @@ -80,9 +80,12 @@ youtubeDlTo key url dest = do return False Right r -> return r +youtubeDlSupported :: URLString -> Annex Bool +youtubeDlSupported url = either (const False) id <$> youtubeDlCheck url + -- Check if youtube-dl can still find media in an url. -youtubeDlSupported :: URLString -> Annex (Either String Bool) -youtubeDlSupported url = catchMsgIO $ do +youtubeDlCheck :: URLString -> Annex (Either String Bool) +youtubeDlCheck url = catchMsgIO $ do opts <- map Param . annexYoutubeDlOptions <$> Annex.getGitConfig let opts' = opts ++ [ Param url, Param "--simulate" ] liftIO $ snd <$> processTranscript "youtube-dl" (toCommand opts') Nothing -- cgit v1.2.3