From 44956f3f6c58b253c188ce12a170a30dbdc06fe1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Jul 2015 16:32:33 -0400 Subject: convert Whereis --- Command/Whereis.hs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Command') diff --git a/Command/Whereis.hs b/Command/Whereis.hs index 2c6018b24..3610eed78 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -19,21 +19,25 @@ cmd :: Command cmd = noCommit $ withGlobalOptions (jsonOption : annexedMatchingOptions) $ command "whereis" SectionQuery "lists repositories that have file content" - paramPaths (withParams seek) + paramPaths (seek <$$> optParser) data WhereisOptions = WhereisOptions { whereisFiles :: CmdParams - , jsonOption :: GlobalSetter , keyOptions :: Maybe KeyOptions } -seek :: CmdParams -> CommandSeek -seek ps = do +optParser :: CmdParamsDesc -> Parser WhereisOptions +optParser desc = WhereisOptions + <$> cmdParams desc + <*> optional (parseKeyOptions False) + +seek :: WhereisOptions -> CommandSeek +seek o = do m <- remoteMap id - withKeyOptions False + withKeyOptions (keyOptions o) False (startKeys m) (withFilesInGit $ whenAnnexed $ start m) - ps + (whereisFiles o) start :: M.Map UUID Remote -> FilePath -> Key -> CommandStart start remotemap file key = start' remotemap key (Just file) -- cgit v1.2.3