diff options
author | Joey Hess <joey@kitenet.net> | 2013-10-13 15:40:38 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-10-13 15:40:38 -0400 |
commit | d6bf4460d8b7ff91ba553958240054ca8a2a91d6 (patch) | |
tree | bc23043851e98c771a3b451456a0103332b20444 /Command/Vicfg.hs | |
parent | f0cf034faa674921dae63d7a54270861bbe86e29 (diff) |
add schedule command
Mostly because it gives me an excuse and a hook to document the schedule
expression format.
Diffstat (limited to 'Command/Vicfg.hs')
-rw-r--r-- | Command/Vicfg.hs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs index c6fc5ffc9..22c641408 100644 --- a/Command/Vicfg.hs +++ b/Command/Vicfg.hs @@ -12,7 +12,6 @@ import qualified Data.Set as S import System.Environment (getEnv) import Data.Tuple (swap) import Data.Char (isSpace) -import Data.Either import Common.Annex import Command @@ -132,7 +131,7 @@ genCfg cfg descs = unlines $ concat , com "Scheduled activities" , com "(Separate multiple activities with \"; \")" ] - (\(l, u) -> line "schedule" u $ intercalate "; " $ map fromScheduledActivity l) + (\(l, u) -> line "schedule" u $ fromScheduledActivities l) (\u -> line "schedule" u "") settings field desc showvals showdefaults = concat @@ -188,14 +187,11 @@ parseCfg curcfg = go [] curcfg . lines Nothing -> let m = M.insert u value (cfgPreferredContentMap cfg) in Right $ cfg { cfgPreferredContentMap = m } - | setting == "schedule" = - let (bad, good) = partitionEithers $ - map parseScheduledActivity $ split "; " value - in if null bad - then - let m = M.insert u good (cfgScheduleMap cfg) - in Right $ cfg { cfgScheduleMap = m } - else Left $ intercalate "; " bad + | setting == "schedule" = case parseScheduledActivities value of + Left e -> Left e + Right l -> + let m = M.insert u l (cfgScheduleMap cfg) + in Right $ cfg { cfgScheduleMap = m } | otherwise = badval "setting" setting showerr (Just msg, l) = [parseerr ++ msg, l] |