2012-10-03 21:04:52 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2014-03-15 20:17:01 +00:00
|
|
|
- Copyright 2012-2014 Joey Hess <joey@kitenet.net>
|
2012-10-03 21:04:52 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2014-10-14 18:10:22 +00:00
|
|
|
{-# LANGUAGE RankNTypes #-}
|
|
|
|
|
2012-10-03 21:04:52 +00:00
|
|
|
module Command.Vicfg where
|
|
|
|
|
|
|
|
import qualified Data.Map as M
|
|
|
|
import qualified Data.Set as S
|
|
|
|
import System.Environment (getEnv)
|
|
|
|
import Data.Tuple (swap)
|
2012-10-03 23:13:21 +00:00
|
|
|
import Data.Char (isSpace)
|
2014-10-14 18:10:22 +00:00
|
|
|
import Data.Default
|
2012-10-03 21:04:52 +00:00
|
|
|
|
|
|
|
import Common.Annex
|
|
|
|
import Command
|
|
|
|
import Annex.Perms
|
|
|
|
import Types.TrustLevel
|
|
|
|
import Types.Group
|
|
|
|
import Logs.Trust
|
|
|
|
import Logs.Group
|
2012-10-04 19:48:59 +00:00
|
|
|
import Logs.PreferredContent
|
2013-10-07 21:11:13 +00:00
|
|
|
import Logs.Schedule
|
2013-05-23 18:54:59 +00:00
|
|
|
import Types.StandardGroups
|
2013-10-07 21:11:13 +00:00
|
|
|
import Types.ScheduledActivity
|
2012-10-03 21:04:52 +00:00
|
|
|
import Remote
|
|
|
|
|
2014-10-14 18:20:10 +00:00
|
|
|
cmd :: [Command]
|
|
|
|
cmd = [command "vicfg" paramNothing seek
|
2013-03-24 22:28:21 +00:00
|
|
|
SectionSetup "edit git-annex's configuration"]
|
2012-10-03 21:04:52 +00:00
|
|
|
|
fix inversion of control in CommandSeek (no behavior changes)
I've been disliking how the command seek actions were written for some
time, with their inversion of control and ugly workarounds.
The last straw to fix it was sync --content, which didn't fit the
Annex [CommandStart] interface well at all. I have not yet made it take
advantage of the changed interface though.
The crucial change, and probably why I didn't do it this way from the
beginning, is to make each CommandStart action be run with exceptions
caught, and if it fails, increment a failure counter in annex state.
So I finally remove the very first code I wrote for git-annex, which
was before I had exception handling in the Annex monad, and so ran outside
that monad, passing state explicitly as it ran each CommandStart action.
This was a real slog from 1 to 5 am.
Test suite passes.
Memory usage is lower than before, sometimes by a couple of megabytes, and
remains constant, even when running in a large repo, and even when
repeatedly failing and incrementing the error counter. So no accidental
laziness space leaks.
Wall clock speed is identical, even in large repos.
This commit was sponsored by an anonymous bitcoiner.
2014-01-20 08:11:42 +00:00
|
|
|
seek :: CommandSeek
|
|
|
|
seek = withNothing start
|
2012-10-03 21:04:52 +00:00
|
|
|
|
|
|
|
start :: CommandStart
|
|
|
|
start = do
|
|
|
|
f <- fromRepo gitAnnexTmpCfgFile
|
2012-10-03 23:13:21 +00:00
|
|
|
createAnnexDirectory $ parentDir f
|
|
|
|
cfg <- getCfg
|
2012-10-13 03:11:26 +00:00
|
|
|
descs <- uuidDescriptions
|
2014-12-22 19:17:00 +00:00
|
|
|
liftIO $ writeFileAnyEncoding f $ genCfg cfg descs
|
2012-10-03 23:13:21 +00:00
|
|
|
vicfg cfg f
|
2012-10-03 21:04:52 +00:00
|
|
|
stop
|
|
|
|
|
2012-10-03 23:13:21 +00:00
|
|
|
vicfg :: Cfg -> FilePath -> Annex ()
|
|
|
|
vicfg curcfg f = do
|
2012-10-03 21:04:52 +00:00
|
|
|
vi <- liftIO $ catchDefaultIO "vi" $ getEnv "EDITOR"
|
|
|
|
-- Allow EDITOR to be processed by the shell, so it can contain options.
|
2012-12-18 16:19:24 +00:00
|
|
|
unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, shellEscape f]]) $
|
2012-10-03 21:04:52 +00:00
|
|
|
error $ vi ++ " exited nonzero; aborting"
|
2014-12-22 19:17:00 +00:00
|
|
|
r <- parseCfg (defCfg curcfg) <$> liftIO (readFileStrictAnyEncoding f)
|
2012-10-03 21:04:52 +00:00
|
|
|
liftIO $ nukeFile f
|
|
|
|
case r of
|
|
|
|
Left s -> do
|
2014-12-22 19:17:00 +00:00
|
|
|
liftIO $ writeFileAnyEncoding f s
|
2012-10-03 23:13:21 +00:00
|
|
|
vicfg curcfg f
|
2012-10-03 23:37:39 +00:00
|
|
|
Right newcfg -> setCfg curcfg newcfg
|
2012-10-03 21:04:52 +00:00
|
|
|
|
|
|
|
data Cfg = Cfg
|
|
|
|
{ cfgTrustMap :: TrustMap
|
|
|
|
, cfgGroupMap :: M.Map UUID (S.Set Group)
|
2014-03-15 20:17:01 +00:00
|
|
|
, cfgPreferredContentMap :: M.Map UUID PreferredContentExpression
|
2014-03-29 19:20:55 +00:00
|
|
|
, cfgRequiredContentMap :: M.Map UUID PreferredContentExpression
|
2014-03-15 20:17:01 +00:00
|
|
|
, cfgGroupPreferredContentMap :: M.Map Group PreferredContentExpression
|
2013-10-07 21:11:13 +00:00
|
|
|
, cfgScheduleMap :: M.Map UUID [ScheduledActivity]
|
2012-10-03 21:04:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
getCfg :: Annex Cfg
|
|
|
|
getCfg = Cfg
|
|
|
|
<$> trustMapRaw -- without local trust overrides
|
|
|
|
<*> (groupsByUUID <$> groupMap)
|
2012-10-04 19:48:59 +00:00
|
|
|
<*> preferredContentMapRaw
|
2014-03-29 19:20:55 +00:00
|
|
|
<*> requiredContentMapRaw
|
2014-03-15 20:17:01 +00:00
|
|
|
<*> groupPreferredContentMapRaw
|
2013-10-07 21:11:13 +00:00
|
|
|
<*> scheduleMap
|
2012-10-03 21:04:52 +00:00
|
|
|
|
2012-10-03 23:37:39 +00:00
|
|
|
setCfg :: Cfg -> Cfg -> Annex ()
|
|
|
|
setCfg curcfg newcfg = do
|
2014-03-15 20:17:01 +00:00
|
|
|
let diff = diffCfg curcfg newcfg
|
|
|
|
mapM_ (uncurry trustSet) $ M.toList $ cfgTrustMap diff
|
|
|
|
mapM_ (uncurry groupSet) $ M.toList $ cfgGroupMap diff
|
|
|
|
mapM_ (uncurry preferredContentSet) $ M.toList $ cfgPreferredContentMap diff
|
2014-03-29 19:20:55 +00:00
|
|
|
mapM_ (uncurry requiredContentSet) $ M.toList $ cfgRequiredContentMap diff
|
2014-03-15 20:17:01 +00:00
|
|
|
mapM_ (uncurry groupPreferredContentSet) $ M.toList $ cfgGroupPreferredContentMap diff
|
|
|
|
mapM_ (uncurry scheduleSet) $ M.toList $ cfgScheduleMap diff
|
|
|
|
|
2014-10-14 18:10:22 +00:00
|
|
|
{- Default config has all the keys from the input config, but with their
|
|
|
|
- default values. -}
|
|
|
|
defCfg :: Cfg -> Cfg
|
|
|
|
defCfg curcfg = Cfg
|
|
|
|
{ cfgTrustMap = mapdef $ cfgTrustMap curcfg
|
|
|
|
, cfgGroupMap = mapdef $ cfgGroupMap curcfg
|
|
|
|
, cfgPreferredContentMap = mapdef $ cfgPreferredContentMap curcfg
|
|
|
|
, cfgRequiredContentMap = mapdef $ cfgRequiredContentMap curcfg
|
|
|
|
, cfgGroupPreferredContentMap = mapdef $ cfgGroupPreferredContentMap curcfg
|
|
|
|
, cfgScheduleMap = mapdef $ cfgScheduleMap curcfg
|
|
|
|
}
|
|
|
|
where
|
|
|
|
mapdef :: forall k v. Default v => M.Map k v -> M.Map k v
|
2014-10-14 18:20:10 +00:00
|
|
|
mapdef = M.map (const def)
|
2014-10-14 18:10:22 +00:00
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
diffCfg :: Cfg -> Cfg -> Cfg
|
|
|
|
diffCfg curcfg newcfg = Cfg
|
|
|
|
{ cfgTrustMap = diff cfgTrustMap
|
|
|
|
, cfgGroupMap = diff cfgGroupMap
|
|
|
|
, cfgPreferredContentMap = diff cfgPreferredContentMap
|
2014-03-29 19:20:55 +00:00
|
|
|
, cfgRequiredContentMap = diff cfgRequiredContentMap
|
2014-03-15 20:17:01 +00:00
|
|
|
, cfgGroupPreferredContentMap = diff cfgGroupPreferredContentMap
|
|
|
|
, cfgScheduleMap = diff cfgScheduleMap
|
|
|
|
}
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
|
|
|
diff f = M.differenceWith (\x y -> if x == y then Nothing else Just x)
|
|
|
|
(f newcfg) (f curcfg)
|
2012-10-03 21:04:52 +00:00
|
|
|
|
2012-10-13 03:11:26 +00:00
|
|
|
genCfg :: Cfg -> M.Map UUID String -> String
|
2014-03-15 20:17:01 +00:00
|
|
|
genCfg cfg descs = unlines $ intercalate [""]
|
|
|
|
[ intro
|
|
|
|
, trust
|
|
|
|
, groups
|
|
|
|
, preferredcontent
|
|
|
|
, grouppreferredcontent
|
|
|
|
, standardgroups
|
2014-03-29 19:20:55 +00:00
|
|
|
, requiredcontent
|
2014-03-15 20:17:01 +00:00
|
|
|
, schedule
|
|
|
|
]
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
|
|
|
intro =
|
|
|
|
[ com "git-annex configuration"
|
|
|
|
, com ""
|
|
|
|
, com "Changes saved to this file will be recorded in the git-annex branch."
|
|
|
|
, com ""
|
|
|
|
, com "Lines in this file have the format:"
|
2014-03-15 20:17:01 +00:00
|
|
|
, com " setting field = value"
|
2012-11-12 05:05:04 +00:00
|
|
|
]
|
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
trust = settings cfg descs cfgTrustMap
|
|
|
|
[ com "Repository trust configuration"
|
2013-05-23 18:54:59 +00:00
|
|
|
, com "(Valid trust levels: " ++ trustlevels ++ ")"
|
2012-11-12 05:05:04 +00:00
|
|
|
]
|
|
|
|
(\(t, u) -> line "trust" u $ showTrustLevel t)
|
2014-10-14 18:20:10 +00:00
|
|
|
(\u -> lcom $ line "trust" u $ showTrustLevel def)
|
2013-05-23 18:54:59 +00:00
|
|
|
where
|
2014-03-15 20:17:01 +00:00
|
|
|
trustlevels = unwords $ map showTrustLevel [Trusted .. DeadTrusted]
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
groups = settings cfg descs cfgGroupMap
|
|
|
|
[ com "Repository groups"
|
2013-05-23 18:54:59 +00:00
|
|
|
, com $ "(Standard groups: " ++ grouplist ++ ")"
|
2012-11-12 05:05:04 +00:00
|
|
|
, com "(Separate group names with spaces)"
|
|
|
|
]
|
|
|
|
(\(s, u) -> line "group" u $ unwords $ S.toList s)
|
|
|
|
(\u -> lcom $ line "group" u "")
|
2013-05-23 18:54:59 +00:00
|
|
|
where
|
2014-10-09 18:53:13 +00:00
|
|
|
grouplist = unwords $ map fromStandardGroup [minBound..]
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
preferredcontent = settings cfg descs cfgPreferredContentMap
|
2014-07-11 18:30:36 +00:00
|
|
|
[ com "Repository preferred contents"
|
|
|
|
, com "(Set to \"standard\" to use a repository's group's preferred contents)"
|
|
|
|
]
|
2014-03-15 20:17:01 +00:00
|
|
|
(\(s, u) -> line "wanted" u s)
|
2014-07-11 18:30:36 +00:00
|
|
|
(\u -> line "wanted" u "")
|
2014-03-29 19:20:55 +00:00
|
|
|
|
|
|
|
requiredcontent = settings cfg descs cfgRequiredContentMap
|
|
|
|
[ com "Repository required contents" ]
|
|
|
|
(\(s, u) -> line "required" u s)
|
|
|
|
(\u -> line "required" u "")
|
2014-03-15 20:17:01 +00:00
|
|
|
|
|
|
|
grouppreferredcontent = settings' cfg allgroups cfgGroupPreferredContentMap
|
|
|
|
[ com "Group preferred contents"
|
|
|
|
, com "(Used by repositories with \"groupwanted\" in their preferred contents)"
|
2012-11-12 05:05:04 +00:00
|
|
|
]
|
2014-03-15 20:17:01 +00:00
|
|
|
(\(s, g) -> gline g s)
|
2014-07-11 18:30:36 +00:00
|
|
|
(\g -> gline g "")
|
2014-03-15 20:17:01 +00:00
|
|
|
where
|
2014-10-09 18:53:13 +00:00
|
|
|
gline g value = [ unwords ["groupwanted", g, "=", value] ]
|
2014-03-15 20:17:01 +00:00
|
|
|
allgroups = S.unions $ stdgroups : M.elems (cfgGroupMap cfg)
|
|
|
|
stdgroups = S.fromList $ map fromStandardGroup [minBound..maxBound]
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
standardgroups =
|
|
|
|
[ com "Standard preferred contents"
|
|
|
|
, com "(Used by wanted or groupwanted expressions containing \"standard\")"
|
|
|
|
, com "(For reference only; built-in and cannot be changed!)"
|
|
|
|
]
|
|
|
|
++ map gline [minBound..maxBound]
|
|
|
|
where
|
|
|
|
gline g = com $ unwords
|
|
|
|
[ "standard"
|
2014-03-15 21:08:55 +00:00
|
|
|
, fromStandardGroup g, "=", standardPreferredContent g
|
2014-03-15 20:17:01 +00:00
|
|
|
]
|
|
|
|
|
|
|
|
schedule = settings cfg descs cfgScheduleMap
|
|
|
|
[ com "Scheduled activities"
|
2013-10-07 21:11:13 +00:00
|
|
|
, com "(Separate multiple activities with \"; \")"
|
|
|
|
]
|
2013-10-13 19:40:38 +00:00
|
|
|
(\(l, u) -> line "schedule" u $ fromScheduledActivities l)
|
2013-10-07 21:11:13 +00:00
|
|
|
(\u -> line "schedule" u "")
|
|
|
|
|
2012-11-12 05:05:04 +00:00
|
|
|
line setting u value =
|
2013-09-25 07:09:06 +00:00
|
|
|
[ com $ "(for " ++ fromMaybe "" (M.lookup u descs) ++ ")"
|
2012-11-12 05:05:04 +00:00
|
|
|
, unwords [setting, fromUUID u, "=", value]
|
|
|
|
]
|
2014-03-15 20:17:01 +00:00
|
|
|
|
|
|
|
settings :: Ord v => Cfg -> M.Map UUID String -> (Cfg -> M.Map UUID v) -> [String] -> ((v, UUID) -> [String]) -> (UUID -> [String]) -> [String]
|
|
|
|
settings cfg descs = settings' cfg (M.keysSet descs)
|
|
|
|
|
|
|
|
settings' :: (Ord v, Ord f) => Cfg -> S.Set f -> (Cfg -> M.Map f v) -> [String] -> ((v, f) -> [String]) -> (f -> [String]) -> [String]
|
|
|
|
settings' cfg s field desc showvals showdefaults = concat
|
|
|
|
[ desc
|
|
|
|
, concatMap showvals $ sort $ map swap $ M.toList $ field cfg
|
|
|
|
, concatMap (lcom . showdefaults) missing
|
|
|
|
]
|
|
|
|
where
|
|
|
|
missing = S.toList $ s `S.difference` M.keysSet (field cfg)
|
|
|
|
|
|
|
|
lcom :: [String] -> [String]
|
|
|
|
lcom = map (\l -> if "#" `isPrefixOf` l then l else '#' : l)
|
2012-10-03 21:04:52 +00:00
|
|
|
|
|
|
|
{- If there's a parse error, returns a new version of the file,
|
|
|
|
- with the problem lines noted. -}
|
2012-10-03 23:13:21 +00:00
|
|
|
parseCfg :: Cfg -> String -> Either String Cfg
|
2014-10-14 18:10:22 +00:00
|
|
|
parseCfg defcfg = go [] defcfg . lines
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
|
|
|
go c cfg []
|
2013-09-25 07:09:06 +00:00
|
|
|
| null (mapMaybe fst c) = Right cfg
|
2012-11-12 05:05:04 +00:00
|
|
|
| otherwise = Left $ unlines $
|
|
|
|
badheader ++ concatMap showerr (reverse c)
|
|
|
|
go c cfg (l:ls) = case parse (dropWhile isSpace l) cfg of
|
|
|
|
Left msg -> go ((Just msg, l):c) cfg ls
|
|
|
|
Right cfg' -> go ((Nothing, l):c) cfg' ls
|
|
|
|
|
|
|
|
parse l cfg
|
|
|
|
| null l = Right cfg
|
|
|
|
| "#" `isPrefixOf` l = Right cfg
|
2014-03-15 20:17:01 +00:00
|
|
|
| null setting || null f = Left "missing field"
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
| otherwise = parsed cfg f setting value'
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
|
|
|
(setting, rest) = separate isSpace l
|
|
|
|
(r, value) = separate (== '=') rest
|
|
|
|
value' = trimspace value
|
2014-03-15 20:17:01 +00:00
|
|
|
f = reverse $ trimspace $ reverse $ trimspace r
|
2012-11-12 05:05:04 +00:00
|
|
|
trimspace = dropWhile isSpace
|
|
|
|
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
parsed cfg f setting value
|
2012-11-12 05:05:04 +00:00
|
|
|
| setting == "trust" = case readTrustLevel value of
|
|
|
|
Nothing -> badval "trust value" value
|
|
|
|
Just t ->
|
|
|
|
let m = M.insert u t (cfgTrustMap cfg)
|
|
|
|
in Right $ cfg { cfgTrustMap = m }
|
|
|
|
| setting == "group" =
|
|
|
|
let m = M.insert u (S.fromList $ words value) (cfgGroupMap cfg)
|
|
|
|
in Right $ cfg { cfgGroupMap = m }
|
2014-03-15 20:17:01 +00:00
|
|
|
| setting == "wanted" =
|
2012-11-12 05:05:04 +00:00
|
|
|
case checkPreferredContentExpression value of
|
|
|
|
Just e -> Left e
|
|
|
|
Nothing ->
|
|
|
|
let m = M.insert u value (cfgPreferredContentMap cfg)
|
|
|
|
in Right $ cfg { cfgPreferredContentMap = m }
|
2014-03-29 19:20:55 +00:00
|
|
|
| setting == "required" =
|
|
|
|
case checkPreferredContentExpression value of
|
|
|
|
Just e -> Left e
|
|
|
|
Nothing ->
|
|
|
|
let m = M.insert u value (cfgRequiredContentMap cfg)
|
|
|
|
in Right $ cfg { cfgRequiredContentMap = m }
|
2014-03-15 20:17:01 +00:00
|
|
|
| setting == "groupwanted" =
|
|
|
|
case checkPreferredContentExpression value of
|
|
|
|
Just e -> Left e
|
|
|
|
Nothing ->
|
|
|
|
let m = M.insert f value (cfgGroupPreferredContentMap cfg)
|
|
|
|
in Right $ cfg { cfgGroupPreferredContentMap = m }
|
2013-10-13 19:40:38 +00:00
|
|
|
| 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 }
|
2012-11-12 05:05:04 +00:00
|
|
|
| otherwise = badval "setting" setting
|
2014-03-15 20:17:01 +00:00
|
|
|
where
|
|
|
|
u = toUUID f
|
2012-11-12 05:05:04 +00:00
|
|
|
|
|
|
|
showerr (Just msg, l) = [parseerr ++ msg, l]
|
|
|
|
showerr (Nothing, l)
|
|
|
|
-- filter out the header and parse error lines
|
|
|
|
-- from any previous parse failure
|
|
|
|
| any (`isPrefixOf` l) (parseerr:badheader) = []
|
|
|
|
| otherwise = [l]
|
|
|
|
|
|
|
|
badval desc val = Left $ "unknown " ++ desc ++ " \"" ++ val ++ "\""
|
|
|
|
badheader =
|
2014-03-15 20:17:01 +00:00
|
|
|
[ com "** There was a problem parsing your input!"
|
|
|
|
, com "** Search for \"Parse error\" to find the bad lines."
|
|
|
|
, com "** Either fix the bad lines, or delete them (to discard your changes)."
|
2012-11-12 05:05:04 +00:00
|
|
|
]
|
2014-03-15 20:17:01 +00:00
|
|
|
parseerr = com "** Parse error in next line: "
|
2012-10-03 23:13:21 +00:00
|
|
|
|
|
|
|
com :: String -> String
|
|
|
|
com s = "# " ++ s
|