Clean up some uses of showStart with "" for the file, or in some cases, a non-filename description string. That would generate bad json, although none of the commands doing that supported --json. Using "" for the file resulted in output like "foo rest"; now the extra space is eliminated. This commit was sponsored by Fernando Jimenez on Patreon.
		
			
				
	
	
		
			84 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			Haskell
		
	
	
	
	
	
			
		
		
	
	
			84 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			Haskell
		
	
	
	
	
	
{- git-annex command
 | 
						|
 -
 | 
						|
 - Copyright 2010, 2015 Joey Hess <id@joeyh.name>
 | 
						|
 -
 | 
						|
 - Licensed under the GNU GPL version 3 or higher.
 | 
						|
 -}
 | 
						|
 | 
						|
{-# LANGUAGE BangPatterns #-}
 | 
						|
 | 
						|
module Command.FromKey where
 | 
						|
 | 
						|
import Command
 | 
						|
import qualified Annex.Queue
 | 
						|
import Annex.Content
 | 
						|
import qualified Annex
 | 
						|
import qualified Backend.URL
 | 
						|
 | 
						|
import Network.URI
 | 
						|
 | 
						|
cmd :: Command
 | 
						|
cmd = notDirect $ notBareRepo $
 | 
						|
	command "fromkey" SectionPlumbing "adds a file using a specific key"
 | 
						|
		(paramRepeating (paramPair paramKey paramPath))
 | 
						|
		(withParams seek)
 | 
						|
 | 
						|
seek :: CmdParams -> CommandSeek
 | 
						|
seek [] = withNothing startMass []
 | 
						|
seek ps = do
 | 
						|
	force <- Annex.getState Annex.force
 | 
						|
	withPairs (start force) ps
 | 
						|
 | 
						|
start :: Bool -> (String, FilePath) -> CommandStart
 | 
						|
start force (keyname, file) = do
 | 
						|
	let key = mkKey keyname
 | 
						|
	unless force $ do
 | 
						|
		inbackend <- inAnnex key
 | 
						|
		unless inbackend $ giveup $
 | 
						|
			"key ("++ keyname ++") is not present in backend (use --force to override this sanity check)"
 | 
						|
	showStart "fromkey" file
 | 
						|
	next $ perform key file
 | 
						|
 | 
						|
startMass :: CommandStart
 | 
						|
startMass = do
 | 
						|
	showStart' "fromkey" (Just "stdin")
 | 
						|
	next massAdd
 | 
						|
 | 
						|
massAdd :: CommandPerform
 | 
						|
massAdd = go True =<< map (separate (== ' ')) <$> batchLines
 | 
						|
  where
 | 
						|
	go status [] = next $ return status
 | 
						|
	go status ((keyname,f):rest) | not (null keyname) && not (null f) = do
 | 
						|
		let key = mkKey keyname
 | 
						|
		ok <- perform' key f
 | 
						|
		let !status' = status && ok
 | 
						|
		go status' rest
 | 
						|
	go _ _ = giveup "Expected pairs of key and file on stdin, but got something else."
 | 
						|
 | 
						|
-- 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 ':'.
 | 
						|
mkKey :: String -> Key
 | 
						|
mkKey s = case parseURI s of
 | 
						|
	Just u | not (isKeyPrefix (uriScheme u)) ->
 | 
						|
		Backend.URL.fromUrl s Nothing
 | 
						|
	_ -> case file2key s of
 | 
						|
		Just k -> k
 | 
						|
		Nothing -> giveup $ "bad key/url " ++ s
 | 
						|
 | 
						|
perform :: Key -> FilePath -> CommandPerform
 | 
						|
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
 | 
						|
	liftIO $ createDirectoryIfMissing True (parentDir file)
 | 
						|
	liftIO $ createSymbolicLink link file
 | 
						|
	Annex.Queue.addCommand "add" [Param "--"] [file]
 | 
						|
	return True
 |