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

addurl: Make --preserve-filename also apply when eg a torrent contains multiple files

Browse source 
Forgot to remove sanitizeFilePath after adding sanitizeOrPreserveFilePath
here.
This commit is contained in:
Joey Hess 2020-05-26 10:45:57 -04:00
parent fc9833f68d
commit 5b8524e1e6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,6 +1,8 @@
git-annex (8.20200523) UNRELEASED; urgency=medium git-annex (8.20200523) UNRELEASED; urgency=medium
* export: Added options for json output. * export: Added options for json output.
* addurl: Make --preserve-filename also apply when eg a torrent contains
multiple files.
-- Joey Hess <id@joeyh.name> Tue, 26 May 2020 10:20:52 -0400 -- Joey Hess <id@joeyh.name> Tue, 26 May 2020 10:20:52 -0400

2
Command/AddUrl.hs
View file

@ -144,7 +144,7 @@ checkUrl addunlockedmatcher r o u = do
Nothing -> Nothing ->
forM_ l $ \(u', sz, f) -> do forM_ l $ \(u', sz, f) -> do
f' <- sanitizeOrPreserveFilePath o f f' <- sanitizeOrPreserveFilePath o f
let f'' = adjustFile o (deffile </> sanitizeFilePath f') let f'' = adjustFile o (deffile </> f')
void $ commandAction $ startRemote addunlockedmatcher r o f'' u' sz void $ commandAction $ startRemote addunlockedmatcher r o f'' u' sz
Just f -> case l of Just f -> case l of
[] -> noop [] -> noop