diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-29 20:07:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-29 20:07:03 -0400 |
| commit | 3de20e31b070a7272a0181d17c4dcc703ba822b7 (patch) | |
| tree | 47b01101b07e293716042ea503d14046f8973ed5 | |
| parent | 09d49fd8ace467463a83ecaf775cbed24f8fa0bd (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.
| -rw-r--r-- | Annex/YoutubeDl.hs | 6 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 9 |
2 files changed, 7 insertions, 8 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 diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 6dc06557c..8f84f1d9e 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1322,12 +1322,9 @@ Here are all the supported configuration settings. Some options may break git-annex's integration with youtube-dl. For example, the --output option could cause it to store files somewhere - git-annex won't find them. Avoid any options that cause youtube-dl - to download more than one file, or to store the file anywhere - other than the current working directory. - - Note that git-annex runs youtube-dl with --ignore-config, to avoid - any configuration file settings that break its integration. + git-annex won't find them. Avoid setting here or in the youtube-dl config + file any options that cause youtube-dl to download more than one file, + or to store the file anywhere other than the current working directory. * `annex.aria-torrent-options` |