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
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2010-11-02 23:04:24 +00:00
|
|
|
-}
|
|
|
|
|
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
|
2020-03-06 15:57:15 +00:00
|
|
|
import Annex.Perms
|
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-08-26 19:52:19 +00:00
|
|
|
cmd = 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
|
2020-04-15 20:04:05 +00:00
|
|
|
parse s = do
|
2019-02-05 18:03:29 +00:00
|
|
|
let (keyname, file) = separate (== ' ') s
|
2020-04-15 20:04:05 +00:00
|
|
|
if not (null keyname) && not (null file)
|
|
|
|
then do
|
|
|
|
file' <- liftIO $ relPathCwdToFile file
|
|
|
|
return $ Right $ go file' (keyOpt keyname)
|
|
|
|
else return $
|
|
|
|
Left "Expected pairs of key and filename"
|
2019-12-05 15:40:10 +00:00
|
|
|
go file key = starting "fromkey" (mkActionItem (key, toRawFilePath file)) $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
perform key file
|
2019-02-05 18:03:29 +00:00
|
|
|
|
2016-12-05 14:59:20 +00:00
|
|
|
start :: Bool -> (String, FilePath) -> CommandStart
|
|
|
|
start force (keyname, file) = do
|
2019-11-22 20:24:04 +00:00
|
|
|
let key = keyOpt 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)"
|
2019-12-05 15:40:10 +00:00
|
|
|
starting "fromkey" (mkActionItem (key, toRawFilePath file)) $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
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 ':'.
|
2019-11-22 20:24:04 +00:00
|
|
|
keyOpt :: String -> Key
|
|
|
|
keyOpt s = case parseURI s of
|
2015-05-30 06:08:49 +00:00
|
|
|
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
|
2020-07-10 18:17:35 +00:00
|
|
|
perform key file = lookupKeyNotHidden (toRawFilePath file) >>= \case
|
2019-02-05 18:03:29 +00:00
|
|
|
Nothing -> ifM (liftIO $ doesFileExist file)
|
|
|
|
( hasothercontent
|
|
|
|
, do
|
|
|
|
link <- calcRepo $ gitAnnexLink file key
|
2020-03-06 15:57:15 +00:00
|
|
|
createWorkTreeDirectory (parentDir file)
|
2019-02-05 18:03:29 +00:00
|
|
|
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
|