wip

1 files changed, 65 insertions, 19 deletions

diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index 320268f6a..1472a4d2b 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -1,4 +1,4 @@
-{- git-annex options
+{- git-annex command-line option parsing
  -
  - Copyright 2010-2015 Joey Hess <id@joeyh.name>
  -
@@ -8,6 +8,7 @@
 module CmdLine.GitAnnex.Options where
 
 import System.Console.GetOpt
+import Options.Applicative
 
 import Common.Annex
 import qualified Git.Config
@@ -15,6 +16,8 @@ import Git.Types
 import Types.TrustLevel
 import Types.NumCopies
 import Types.Messages
+import Types.Key
+import Types.Command
 import qualified Annex
 import qualified Remote
 import qualified Limit
@@ -51,24 +54,50 @@ gitAnnexOptions = commonOptions ++
 		>>= pure . (\r -> r { gitGlobalOpts = gitGlobalOpts r ++ [Param "-c", Param v] })
 		>>= Annex.changeGitRepo
 
--- Options for matching on annexed keys, rather than work tree files.
-keyOptions :: [Option]
-keyOptions = [ allOption, unusedOption, keyOption]
-
-allOption :: Option
-allOption = Option ['A'] ["all"] (NoArg (Annex.setFlag "all"))
-	"operate on all versions of all files"
-
-unusedOption :: Option
-unusedOption = Option ['U'] ["unused"] (NoArg (Annex.setFlag "unused"))
-	"operate on files found by last run of git-annex unused"
-
-keyOption :: Option
-keyOption = Option [] ["key"] (ReqArg (Annex.setField "key") paramKey)
-		"operate on specified key"
-
-incompleteOption :: Option
-incompleteOption = flagOption [] "incomplete" "resume previous downloads"
+-- Options for acting on keys, rather than work tree files.
+data KeyOptions = KeyOptions
+	{ wantAllKeys :: Bool
+	, wantUnusedKeys :: Bool
+	, wantIncompleteKeys :: Bool
+	, wantSpecificKey :: Maybe Key
+	}
+
+parseKeyOptions :: Bool -> Parser KeyOptions
+parseKeyOptions allowincomplete = KeyOptions
+	<$> parseAllKeysOption
+	<*> parseUnusedKeysOption
+	<*> (if allowincomplete then parseIncompleteOption else pure False)
+	<*> parseSpecificKeyOption
+
+parseAllKeysOption :: Parser Bool
+parseAllKeysOption = switch
+	( long "all"
+	<> short 'A'
+	<> help "operate on all versions of all files"
+	)
+
+parseUnusedKeysOption :: Parser Bool
+parseUnusedKeysOption = switch
+	( long "unused"
+	<> short 'U'
+	<> help "operate on files found by last run of git-annex unused"
+	)
+
+parseSpecificKeyOption :: Parser (Maybe Key)
+parseSpecificKeyOption = finalOpt $ option (str >>= parseKey)
+	( long "key"
+	<> help "operate on specified key"
+	<> metavar paramKey
+	)
+
+parseKey :: Monad m => String -> m Key
+parseKey = maybe (fail "invalid key") return . file2key
+
+parseIncompleteOption :: Parser Bool
+parseIncompleteOption = switch
+	( long "incomplete"
+	<> help "resume previous downloads"
+	)
 
 -- Options to match properties of annexed files.
 annexedMatchingOptions :: [Option]
@@ -161,3 +190,20 @@ timeLimitOption = Option ['T'] ["time-limit"]
 
 autoOption :: Option
 autoOption = flagOption ['a'] "auto" "automatic mode"
+
+parseAutoOption :: Parser Bool
+parseAutoOption = switch
+	( long "auto"
+	<> short 'a'
+	<> help "automatic mode"
+	)
+
+{- Parser that accepts all non-option params. -}
+cmdParams :: CmdParamsDesc -> Parser CmdParams
+cmdParams paramdesc = many (argument str (metavar paramdesc))
+
+{- Makes an option parser that is normally required be optional;
+ -  - its switch can be given zero or more times, and the last one
+ -   - given will be used. -}
+finalOpt :: Parser a -> Parser (Maybe a)
+finalOpt = lastMaybe <$$> many