Searched for uses of putStr and hPutStr and changed appropriate ones to filter out control characters and quote filenames. This notably does not make find and findkeys quote filenames in their default output. Because they should only do that when stdout is non a pipe. A few commands like calckey and lookupkey seem too low-level to make sense to filter output, so skipped those. Also when relaying output from other commands that is not progress output, have git-annex filter out control characters. Sponsored-by: k0ld on Patreon
		
			
				
	
	
		
			46 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			Haskell
		
	
	
	
	
	
			
		
		
	
	
			46 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			Haskell
		
	
	
	
	
	
{- git-annex command
 | 
						|
 -
 | 
						|
 - Copyright 2012 Joey Hess <id@joeyh.name>
 | 
						|
 -
 | 
						|
 - Licensed under the GNU AGPL version 3 or higher.
 | 
						|
 -}
 | 
						|
 | 
						|
module Command.Group where
 | 
						|
 | 
						|
import Command
 | 
						|
import qualified Remote
 | 
						|
import Logs.Group
 | 
						|
import Types.Group
 | 
						|
import Utility.SafeOutput
 | 
						|
 | 
						|
import qualified Data.Set as S
 | 
						|
 | 
						|
cmd :: Command
 | 
						|
cmd = noMessages $ command "group" SectionSetup "add a repository to a group"
 | 
						|
	(paramPair paramRemote paramDesc) (withParams seek)
 | 
						|
 | 
						|
seek :: CmdParams -> CommandSeek
 | 
						|
seek = withWords (commandAction . start)
 | 
						|
 | 
						|
start :: [String] -> CommandStart
 | 
						|
start ps@(name:g:[]) = do
 | 
						|
	u <- Remote.nameToUUID name
 | 
						|
	startingUsualMessages "group" ai si $
 | 
						|
		setGroup u (toGroup g)
 | 
						|
  where
 | 
						|
	ai = ActionItemOther (Just (UnquotedString name))
 | 
						|
	si = SeekInput ps
 | 
						|
start (name:[]) = do
 | 
						|
	u <- Remote.nameToUUID name
 | 
						|
	startingCustomOutput (ActionItemOther Nothing) $ do
 | 
						|
		liftIO . putStrLn . safeOutput . unwords . map fmt . S.toList
 | 
						|
			=<< lookupGroups u
 | 
						|
		next $ return True
 | 
						|
  where
 | 
						|
	fmt (Group g) = decodeBS g
 | 
						|
start _ = giveup "Specify a repository and a group."
 | 
						|
 | 
						|
setGroup :: UUID -> Group -> CommandPerform
 | 
						|
setGroup uuid g = do
 | 
						|
	groupChange uuid (S.insert g) 
 | 
						|
	next $ return True
 |