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

pass git config options to youtube-dl --simulate

Browse source 
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.
This commit is contained in:
Joey Hess 2017-11-29 20:07:03 -04:00
parent 24f27ec39d
commit 31b4d7c6d0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/YoutubeDl.hs
View file

@ -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

9
doc/git-annex.mdwn
View file

@ -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`