mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid warning when youtube-dl is not installed

Browse source 
If a user does not have it installed, don't warn on every imported item
about it.
This commit is contained in:
Joey Hess 2017-11-30 13:39:20 -04:00
parent a7b4358c05
commit 8a0038ec23
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Command/ImportFeed.hs
View file

@ -286,18 +286,13 @@ performDownload opts cache todownload = case location todownload of
return False
Right b -> return b
addmediafast linkurl mediaurl mediakey =
youtubeDlSupported linkurl >>= \case
Right True ->
rundownload linkurl ".m" $ \f -> do
addWorkTree webUUID mediaurl f mediakey Nothing
return [mediakey]
Right False ->
performDownload opts cache todownload
{ location = Enclosure linkurl }
Left msg -> do
warning msg
return False
addmediafast linkurl mediaurl mediakey = ifM (youtubeDlSupported linkurl)
( rundownload linkurl ".m" $ \f -> do
addWorkTree webUUID mediaurl f mediakey Nothing
return [mediakey]
, performDownload opts cache todownload
{ location = Enclosure linkurl }
)
defaultTemplate :: String
defaultTemplate = "${feedtitle}/${itemtitle}${extension}"