2010-11-02 23:04:24 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2019-02-05 17:13:09 +00:00
|
|
|
- Copyright 2010-2019 Joey Hess <id@joeyh.name>
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2015-03-15 18:07:43 +00:00
|
|
|
{-# LANGUAGE BangPatterns #-}
|
|
|
|
|
2010-11-02 23:04:24 +00:00
|
|
|
module Command.FromKey where
|
|
|
|
|
|
|
|
import Command
|
2011-10-04 04:40:47 +00:00
|
|
|
import qualified Annex.Queue
|
|
|
|
import Annex.Content
|
2019-02-05 17:13:09 +00:00
|
|
|
import Annex.WorkTree
|
2015-03-15 17:51:58 +00:00
|
|
|
import qualified Annex
|
2015-05-23 02:41:36 +00:00
|
|
|
import qualified Backend.URL
|
|
|
|
|
|
|
|
import Network.URI
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2019-02-05 18:03:29 +00:00
|
|
|
cmd = notDirect $ notBareRepo $ withGlobalOptions [jsonOptions] $
|
2015-07-08 19:08:02 +00:00
|
|
|
command "fromkey" SectionPlumbing "adds a file using a specific key"
|
2016-12-05 14:59:20 +00:00
|
|
|
(paramRepeating (paramPair paramKey paramPath))
|
added -z
Added -z option to git-annex commands that use --batch, useful for
supporting filenames containing newlines.
It only controls input to --batch, the output will still be line delimited
unless --json or etc is used to get some other output. While git often
makes -z affect both input and output, I don't like trying them together,
and making it affect output would have been a significant complication,
and also git-annex output is generally not intended to be machine parsed,
unless using --json or a format option.
Commands that take pairs like "file key" still separate them with a space
in --batch mode. All such commands take care to support filenames with
spaces when parsing that, so there was no need to change it, and it would
have needed significant changes to the batch machinery to separate tose
with a null.
To make fromkey and registerurl support -z, I had to give them a --batch
option. The implicit batch mode they enter when not provided with input
parameters does not support -z as that would have complicated option
parsing. Seemed better to move these toward using the same --batch as
everything else, though the implicit batch mode can still be used.
This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-09-20 20:09:21 +00:00
|
|
|
(seek <$$> optParser)
|
2010-12-30 19:06:26 +00:00
|
|
|
|
added -z
Added -z option to git-annex commands that use --batch, useful for
supporting filenames containing newlines.
It only controls input to --batch, the output will still be line delimited
unless --json or etc is used to get some other output. While git often
makes -z affect both input and output, I don't like trying them together,
and making it affect output would have been a significant complication,
and also git-annex output is generally not intended to be machine parsed,
unless using --json or a format option.
Commands that take pairs like "file key" still separate them with a space
in --batch mode. All such commands take care to support filenames with
spaces when parsing that, so there was no need to change it, and it would
have needed significant changes to the batch machinery to separate tose
with a null.
To make fromkey and registerurl support -z, I had to give them a --batch
option. The implicit batch mode they enter when not provided with input
parameters does not support -z as that would have complicated option
parsing. Seemed better to move these toward using the same --batch as
everything else, though the implicit batch mode can still be used.
This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-09-20 20:09:21 +00:00
|
|
|
data FromKeyOptions = FromKeyOptions
|
|
|
|
{ keyFilePairs :: CmdParams
|
|
|
|
, batchOption :: BatchMode
|
|
|
|
}
|
|
|
|
|
|
|
|
optParser :: CmdParamsDesc -> Parser FromKeyOptions
|
|
|
|
optParser desc = FromKeyOptions
|
|
|
|
<$> cmdParams desc
|
|
|
|
<*> parseBatchOption
|
|
|
|
|
|
|
|
seek :: FromKeyOptions -> CommandSeek
|
|
|
|
seek o = case (batchOption o, keyFilePairs o) of
|
2019-02-05 18:03:29 +00:00
|
|
|
(Batch fmt, _) -> seekBatch fmt
|
added -z
Added -z option to git-annex commands that use --batch, useful for
supporting filenames containing newlines.
It only controls input to --batch, the output will still be line delimited
unless --json or etc is used to get some other output. While git often
makes -z affect both input and output, I don't like trying them together,
and making it affect output would have been a significant complication,
and also git-annex output is generally not intended to be machine parsed,
unless using --json or a format option.
Commands that take pairs like "file key" still separate them with a space
in --batch mode. All such commands take care to support filenames with
spaces when parsing that, so there was no need to change it, and it would
have needed significant changes to the batch machinery to separate tose
with a null.
To make fromkey and registerurl support -z, I had to give them a --batch
option. The implicit batch mode they enter when not provided with input
parameters does not support -z as that would have complicated option
parsing. Seemed better to move these toward using the same --batch as
everything else, though the implicit batch mode can still be used.
This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-09-20 20:09:21 +00:00
|
|
|
-- older way of enabling batch input, does not support BatchNull
|
2019-02-05 18:03:29 +00:00
|
|
|
(NoBatch, []) -> seekBatch BatchLine
|
added -z
Added -z option to git-annex commands that use --batch, useful for
supporting filenames containing newlines.
It only controls input to --batch, the output will still be line delimited
unless --json or etc is used to get some other output. While git often
makes -z affect both input and output, I don't like trying them together,
and making it affect output would have been a significant complication,
and also git-annex output is generally not intended to be machine parsed,
unless using --json or a format option.
Commands that take pairs like "file key" still separate them with a space
in --batch mode. All such commands take care to support filenames with
spaces when parsing that, so there was no need to change it, and it would
have needed significant changes to the batch machinery to separate tose
with a null.
To make fromkey and registerurl support -z, I had to give them a --batch
option. The implicit batch mode they enter when not provided with input
parameters does not support -z as that would have complicated option
parsing. Seemed better to move these toward using the same --batch as
everything else, though the implicit batch mode can still be used.
This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-09-20 20:09:21 +00:00
|
|
|
(NoBatch, ps) -> do
|
|
|
|
force <- Annex.getState Annex.force
|
2018-10-01 18:12:06 +00:00
|
|
|
withPairs (commandAction . start force) ps
|
2010-11-11 22:54:52 +00:00
|
|
|
|
2019-02-05 18:03:29 +00:00
|
|
|
seekBatch :: BatchFormat -> CommandSeek
|
|
|
|
seekBatch fmt = batchInput fmt parse commandAction
|
|
|
|
where
|
|
|
|
parse s =
|
|
|
|
let (keyname, file) = separate (== ' ') s
|
|
|
|
in if not (null keyname) && not (null file)
|
|
|
|
then Right $ go file (mkKey keyname)
|
|
|
|
else Left "Expected pairs of key and filename"
|
|
|
|
go file key = do
|
|
|
|
showStart "fromkey" file
|
|
|
|
next $ perform key file
|
|
|
|
|
2016-12-05 14:59:20 +00:00
|
|
|
start :: Bool -> (String, FilePath) -> CommandStart
|
|
|
|
start force (keyname, file) = do
|
2015-05-23 02:41:36 +00:00
|
|
|
let key = mkKey keyname
|
2015-03-15 17:51:58 +00:00
|
|
|
unless force $ do
|
|
|
|
inbackend <- inAnnex key
|
2016-11-16 01:29:54 +00:00
|
|
|
unless inbackend $ giveup $
|
2015-03-15 17:51:58 +00:00
|
|
|
"key ("++ keyname ++") is not present in backend (use --force to override this sanity check)"
|
2010-11-02 23:04:24 +00:00
|
|
|
showStart "fromkey" file
|
2011-10-31 16:47:13 +00:00
|
|
|
next $ perform key file
|
2016-12-05 14:59:20 +00:00
|
|
|
|
2015-05-30 06:08:49 +00:00
|
|
|
-- From user input to a Key.
|
|
|
|
-- User can input either a serialized key, or an url.
|
|
|
|
--
|
|
|
|
-- In some cases, an input can be parsed as both a key and as an uri.
|
|
|
|
-- For example, "WORM--a:a" parses as an uri. To disambiguate, check
|
|
|
|
-- the uri scheme, to see if it looks like the prefix of a key. This relies
|
|
|
|
-- on key backend names never containing a ':'.
|
2015-05-23 02:41:36 +00:00
|
|
|
mkKey :: String -> Key
|
2015-05-30 06:08:49 +00:00
|
|
|
mkKey s = case parseURI s of
|
|
|
|
Just u | not (isKeyPrefix (uriScheme u)) ->
|
|
|
|
Backend.URL.fromUrl s Nothing
|
2019-01-14 17:17:47 +00:00
|
|
|
_ -> case deserializeKey s of
|
2015-05-30 06:08:49 +00:00
|
|
|
Just k -> k
|
2016-11-16 01:29:54 +00:00
|
|
|
Nothing -> giveup $ "bad key/url " ++ s
|
2015-05-23 02:41:36 +00:00
|
|
|
|
2011-10-31 16:47:13 +00:00
|
|
|
perform :: Key -> FilePath -> CommandPerform
|
2019-02-05 18:03:29 +00:00
|
|
|
perform key file = lookupFileNotHidden file >>= \case
|
|
|
|
Nothing -> ifM (liftIO $ doesFileExist file)
|
|
|
|
( hasothercontent
|
|
|
|
, do
|
|
|
|
link <- calcRepo $ gitAnnexLink file key
|
|
|
|
liftIO $ createDirectoryIfMissing True (parentDir file)
|
|
|
|
liftIO $ createSymbolicLink link file
|
|
|
|
Annex.Queue.addCommand "add" [Param "--"] [file]
|
|
|
|
next $ return True
|
|
|
|
)
|
2019-02-05 17:13:09 +00:00
|
|
|
Just k
|
2019-02-05 18:03:29 +00:00
|
|
|
| k == key -> next $ return True
|
|
|
|
| otherwise -> hasothercontent
|
|
|
|
where
|
|
|
|
hasothercontent = do
|
|
|
|
warning $ file ++ " already exists with different content"
|
|
|
|
next $ return False
|