summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-11-29 20:07:03 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-11-29 20:07:03 -0400
commit3de20e31b070a7272a0181d17c4dcc703ba822b7 (patch)
tree47b01101b07e293716042ea503d14046f8973ed5 /Annex
parent09d49fd8ace467463a83ecaf775cbed24f8fa0bd (diff)
pass git config options to youtube-dl --simulate
Decided not to --ignore-config by default. It the user has something in their youtube-dl config files that breaks git-annex they can configure it to use that option.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/YoutubeDl.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Annex/YoutubeDl.hs b/Annex/YoutubeDl.hs
index e646f3fe8..65981e0df 100644
--- a/Annex/YoutubeDl.hs
+++ b/Annex/YoutubeDl.hs
@@ -82,5 +82,7 @@ youtubeDlTo key url dest = do
-- Check if youtube-dl can still find media in an url.
youtubeDlSupported :: URLString -> Annex (Either String Bool)
-youtubeDlSupported url = liftIO $ catchMsgIO $
- snd <$> processTranscript "youtube-dl" [ url, "--simulate" ] Nothing
+youtubeDlSupported url = catchMsgIO $ do
+ opts <- map Param . annexYoutubeDlOptions <$> Annex.getGitConfig
+ let opts' = opts ++ [ url, "--simulate" ]
+ liftIO $ snd <$> processTranscript "youtube-dl" opts' Nothing