fromkey: Add stdin mode.
This commit is contained in:
parent
fa180c1ba1
commit
b24bb6b435
3 changed files with 27 additions and 5 deletions
|
@ -5,6 +5,8 @@
|
||||||
- Licensed under the GNU GPL version 3 or higher.
|
- Licensed under the GNU GPL version 3 or higher.
|
||||||
-}
|
-}
|
||||||
|
|
||||||
|
{-# LANGUAGE BangPatterns #-}
|
||||||
|
|
||||||
module Command.FromKey where
|
module Command.FromKey where
|
||||||
|
|
||||||
import Common.Annex
|
import Common.Annex
|
||||||
|
@ -33,16 +35,31 @@ start force (keyname:file:[]) = do
|
||||||
"key ("++ keyname ++") is not present in backend (use --force to override this sanity check)"
|
"key ("++ keyname ++") is not present in backend (use --force to override this sanity check)"
|
||||||
showStart "fromkey" file
|
showStart "fromkey" file
|
||||||
next $ perform key file
|
next $ perform key file
|
||||||
|
start _ [] = do
|
||||||
|
showStart "fromkey" "stdin"
|
||||||
|
next massAdd
|
||||||
start _ _ = error "specify a key and a dest file"
|
start _ _ = error "specify a key and a dest file"
|
||||||
|
|
||||||
|
massAdd :: CommandPerform
|
||||||
|
massAdd = go True =<< map words . lines <$> liftIO getContents
|
||||||
|
where
|
||||||
|
go status [] = next $ return status
|
||||||
|
go status ([keyname,f]:rest) = do
|
||||||
|
let key = fromMaybe (error $ "bad key " ++ keyname) $ file2key keyname
|
||||||
|
ok <- perform' key f
|
||||||
|
let !status' = status && ok
|
||||||
|
go status' rest
|
||||||
|
go status (_:rest) = error "Expected pairs of key and file on stdin, but got something else."
|
||||||
|
|
||||||
perform :: Key -> FilePath -> CommandPerform
|
perform :: Key -> FilePath -> CommandPerform
|
||||||
perform key file = do
|
perform key file = do
|
||||||
|
ok <- perform' key file
|
||||||
|
next $ return ok
|
||||||
|
|
||||||
|
perform' :: Key -> FilePath -> Annex Bool
|
||||||
|
perform' key file = do
|
||||||
link <- calcRepo $ gitAnnexLink file key
|
link <- calcRepo $ gitAnnexLink file key
|
||||||
liftIO $ createDirectoryIfMissing True (parentDir file)
|
liftIO $ createDirectoryIfMissing True (parentDir file)
|
||||||
liftIO $ createSymbolicLink link file
|
liftIO $ createSymbolicLink link file
|
||||||
next $ cleanup file
|
|
||||||
|
|
||||||
cleanup :: FilePath -> CommandCleanup
|
|
||||||
cleanup file = do
|
|
||||||
Annex.Queue.addCommand "add" [Param "--"] [file]
|
Annex.Queue.addCommand "add" [Param "--"] [file]
|
||||||
return True
|
return True
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -36,6 +36,7 @@ git-annex (5.2015022) UNRELEASED; urgency=medium
|
||||||
* git-annex-shell: Improve error message when the specified repository
|
* git-annex-shell: Improve error message when the specified repository
|
||||||
doesn't exist or git config fails for some reason.
|
doesn't exist or git config fails for some reason.
|
||||||
* fromkey --force: Skip test that the key has its content in the annex.
|
* fromkey --force: Skip test that the key has its content in the annex.
|
||||||
|
* fromkey: Add stdin mode.
|
||||||
|
|
||||||
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400
|
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400
|
||||||
|
|
||||||
|
|
|
@ -952,7 +952,7 @@ subdirectories).
|
||||||
|
|
||||||
git annex examinekey --format='.git/annex/objects/${hashdirmixed}${key}/${key}'
|
git annex examinekey --format='.git/annex/objects/${hashdirmixed}${key}/${key}'
|
||||||
|
|
||||||
* `fromkey key file`
|
* `fromkey [key file]`
|
||||||
|
|
||||||
This plumbing-level command can be used to manually set up a file
|
This plumbing-level command can be used to manually set up a file
|
||||||
in the git repository to link to a specified key.
|
in the git repository to link to a specified key.
|
||||||
|
@ -960,6 +960,10 @@ subdirectories).
|
||||||
Normally, the annex needs to already contain the content object for the
|
Normally, the annex needs to already contain the content object for the
|
||||||
key. To override this, use --force.
|
key. To override this, use --force.
|
||||||
|
|
||||||
|
If the key and file are not specified on the command line, they are
|
||||||
|
instead read from stdin. Any number of lines can be provided in this
|
||||||
|
mode, each containing a key and filename, sepearated by whitespace.
|
||||||
|
|
||||||
* `dropkey [key ...]`
|
* `dropkey [key ...]`
|
||||||
|
|
||||||
This plumbing-level command drops the annexed data for the specified
|
This plumbing-level command drops the annexed data for the specified
|
||||||
|
|
Loading…
Reference in a new issue