nmattia/niv
1
1
Fork 0
mirror of https://github.com/nmattia/niv.git synced 2024-11-29 09:42:35 +03:00
Code Issues Projects Releases Wiki Activity

Simplify key value parsing

Browse Source
This commit is contained in:
Nicolas Mattia 2019-11-24 20:29:14 +01:00
parent e4ea8de1c5
commit 47eaf09c89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Niv/Cli.hs
View File

@ -83,20 +83,20 @@ parsePackageSpec =
Opts.metavar "KEY=VAL" <> Opts.metavar "KEY=VAL" <>
Opts.help "Set the package spec attribute <KEY> to <VAL>, where <VAL> may be JSON." Opts.help "Set the package spec attribute <KEY> to <VAL>, where <VAL> may be JSON."
) <|> ) <|>
Opts.option (Opts.maybeReader (parseKeyVal (Aeson.String . T.pack))) Opts.option (Opts.maybeReader (parseKeyVal Aeson.toJSON))
( Opts.long "string-attribute" <> ( Opts.long "string-attribute" <>
Opts.short 's' <> Opts.short 's' <>
Opts.metavar "KEY=VAL" <> Opts.metavar "KEY=VAL" <>
Opts.help "Set the package spec attribute <KEY> to <VAL>." Opts.help "Set the package spec attribute <KEY> to <VAL>."
) <|> ) <|>
shortcutAttributes <|> shortcutAttributes <|>
((\x -> ("url_template",Aeson.String x)) <$> Opts.strOption ((("url_template",) . Aeson.String) <$> Opts.strOption
( Opts.long "template" <> ( Opts.long "template" <>
Opts.short 't' <> Opts.short 't' <>
Opts.metavar "URL" <> Opts.metavar "URL" <>
Opts.help "Used during 'update' when building URL. Occurrences of <foo> are replaced with attribute 'foo'." Opts.help "Used during 'update' when building URL. Occurrences of <foo> are replaced with attribute 'foo'."
)) <|> )) <|>
((\x -> ("type", Aeson.String x)) <$> Opts.strOption ((("type",) . Aeson.String) <$> Opts.strOption
( Opts.long "type" <> ( Opts.long "type" <>
Opts.short 'T' <> Opts.short 'T' <>
Opts.metavar "TYPE" <> Opts.metavar "TYPE" <>
@ -104,7 +104,7 @@ parsePackageSpec =
)) ))
parseKeyValJSON = parseKeyVal $ \x -> parseKeyValJSON = parseKeyVal $ \x ->
fromMaybe (Aeson.String $ T.pack x) (Aeson.decodeStrict (B8.pack x)) fromMaybe (Aeson.toJSON x) (Aeson.decodeStrict (B8.pack x))
-- Parse "key=val" into ("key", val) -- Parse "key=val" into ("key", val)
parseKeyVal parseKeyVal