2014-01-02 00:12:20 +00:00
|
|
|
{- unparsed preferred content expressions
|
|
|
|
-
|
2019-01-09 17:06:37 +00:00
|
|
|
- Copyright 2012-2019 Joey Hess <id@joeyh.name>
|
2014-01-02 00:12:20 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2014-01-02 00:12:20 +00:00
|
|
|
-}
|
|
|
|
|
|
|
|
module Logs.PreferredContent.Raw where
|
|
|
|
|
2016-01-20 20:36:33 +00:00
|
|
|
import Annex.Common
|
2014-01-02 00:12:20 +00:00
|
|
|
import qualified Annex.Branch
|
|
|
|
import qualified Annex
|
|
|
|
import Logs
|
|
|
|
import Logs.UUIDBased
|
2014-03-15 20:17:01 +00:00
|
|
|
import Logs.MapLog
|
2014-01-02 00:12:20 +00:00
|
|
|
import Types.StandardGroups
|
2014-03-15 20:17:01 +00:00
|
|
|
import Types.Group
|
2014-01-02 00:12:20 +00:00
|
|
|
|
2017-08-14 17:55:38 +00:00
|
|
|
import qualified Data.Map as M
|
2019-01-09 19:00:43 +00:00
|
|
|
import qualified Data.ByteString.Lazy as L
|
2019-01-10 17:23:42 +00:00
|
|
|
import qualified Data.Attoparsec.ByteString.Lazy as A
|
2019-01-09 17:06:37 +00:00
|
|
|
import Data.ByteString.Builder
|
2017-08-14 17:55:38 +00:00
|
|
|
|
2014-01-02 00:12:20 +00:00
|
|
|
{- Changes the preferred content configuration of a remote. -}
|
|
|
|
preferredContentSet :: UUID -> PreferredContentExpression -> Annex ()
|
2014-03-29 19:20:55 +00:00
|
|
|
preferredContentSet = setLog preferredContentLog
|
|
|
|
|
|
|
|
requiredContentSet :: UUID -> PreferredContentExpression -> Annex ()
|
|
|
|
requiredContentSet = setLog requiredContentLog
|
|
|
|
|
2019-11-26 19:27:22 +00:00
|
|
|
setLog :: RawFilePath -> UUID -> PreferredContentExpression -> Annex ()
|
2014-03-29 19:20:55 +00:00
|
|
|
setLog logfile uuid@(UUID _) val = do
|
2020-12-23 19:21:33 +00:00
|
|
|
c <- currentVectorClock
|
start implementing hidden git-annex repositories
This adds a separate journal, which does not currently get committed to
an index, but is planned to be committed to .git/annex/index-private.
Changes that are regarding a UUID that is private will get written to
this journal, and so will not be published into the git-annex branch.
All log writing should have been made to indicate the UUID it's
regarding, though I've not verified this yet.
Currently, no UUIDs are treated as private yet, a way to configure that
is needed.
The implementation is careful to not add any additional IO work when
privateUUIDsKnown is False. It will skip looking at the private journal
at all. So this should be free, or nearly so, unless the feature is
used. When it is used, all branch reads will be about twice as expensive.
It is very lucky -- or very prudent design -- that Annex.Branch.change
and maybeChange are the only ways to change a file on the branch,
and Annex.Branch.set is only internal use. That let Annex.Branch.get
always yield any private information that has been recorded, without
the risk that Annex.Branch.set might be called, with a non-private UUID,
and end up leaking the private information into the git-annex branch.
And, this relies on the way git-annex union merges the git-annex branch.
When reading a file, there can be a public and a private version, and
they are just concacenated together. That will be handled the same as if
there were two diverged git-annex branches that got union merged.
2021-04-20 18:32:41 +00:00
|
|
|
Annex.Branch.change (Annex.Branch.RegardingUUID [uuid]) logfile $
|
2019-02-21 17:43:21 +00:00
|
|
|
buildLogOld buildPreferredContentExpression
|
2017-08-14 17:55:38 +00:00
|
|
|
. changeLog c uuid val
|
2019-02-21 17:43:21 +00:00
|
|
|
. parseLogOld parsePreferredContentExpression
|
2014-03-29 19:20:55 +00:00
|
|
|
Annex.changeState $ \s -> s
|
|
|
|
{ Annex.preferredcontentmap = Nothing
|
|
|
|
, Annex.requiredcontentmap = Nothing
|
|
|
|
}
|
|
|
|
setLog _ NoUUID _ = error "unknown UUID; cannot modify"
|
2014-01-02 00:12:20 +00:00
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
{- Changes the preferred content configuration of a group. -}
|
|
|
|
groupPreferredContentSet :: Group -> PreferredContentExpression -> Annex ()
|
|
|
|
groupPreferredContentSet g val = do
|
2020-12-23 19:21:33 +00:00
|
|
|
c <- currentVectorClock
|
start implementing hidden git-annex repositories
This adds a separate journal, which does not currently get committed to
an index, but is planned to be committed to .git/annex/index-private.
Changes that are regarding a UUID that is private will get written to
this journal, and so will not be published into the git-annex branch.
All log writing should have been made to indicate the UUID it's
regarding, though I've not verified this yet.
Currently, no UUIDs are treated as private yet, a way to configure that
is needed.
The implementation is careful to not add any additional IO work when
privateUUIDsKnown is False. It will skip looking at the private journal
at all. So this should be free, or nearly so, unless the feature is
used. When it is used, all branch reads will be about twice as expensive.
It is very lucky -- or very prudent design -- that Annex.Branch.change
and maybeChange are the only ways to change a file on the branch,
and Annex.Branch.set is only internal use. That let Annex.Branch.get
always yield any private information that has been recorded, without
the risk that Annex.Branch.set might be called, with a non-private UUID,
and end up leaking the private information into the git-annex branch.
And, this relies on the way git-annex union merges the git-annex branch.
When reading a file, there can be a public and a private version, and
they are just concacenated together. That will be handled the same as if
there were two diverged git-annex branches that got union merged.
2021-04-20 18:32:41 +00:00
|
|
|
Annex.Branch.change
|
|
|
|
(Annex.Branch.RegardingUUID [])
|
|
|
|
groupPreferredContentLog $
|
2019-01-09 17:06:37 +00:00
|
|
|
buildGroupPreferredContent
|
2017-08-14 17:55:38 +00:00
|
|
|
. changeMapLog c g val
|
2019-01-09 19:00:43 +00:00
|
|
|
. parseGroupPreferredContent
|
2014-03-15 20:17:01 +00:00
|
|
|
Annex.changeState $ \s -> s { Annex.preferredcontentmap = Nothing }
|
|
|
|
|
2019-01-09 19:00:43 +00:00
|
|
|
parseGroupPreferredContent :: L.ByteString -> MapLog Group String
|
2019-01-10 17:23:42 +00:00
|
|
|
parseGroupPreferredContent = parseMapLog parsegroup parsestring
|
|
|
|
where
|
|
|
|
parsegroup = Group <$> A.takeByteString
|
|
|
|
parsestring = decodeBS <$> A.takeByteString
|
2019-01-09 19:00:43 +00:00
|
|
|
|
2019-01-09 17:06:37 +00:00
|
|
|
buildGroupPreferredContent :: MapLog Group PreferredContentExpression -> Builder
|
|
|
|
buildGroupPreferredContent = buildMapLog buildgroup buildexpr
|
|
|
|
where
|
2019-01-09 19:00:43 +00:00
|
|
|
buildgroup (Group g) = byteString g
|
2019-01-09 17:06:37 +00:00
|
|
|
buildexpr = byteString . encodeBS
|
|
|
|
|
convert old uuid-based log parsers to attoparsec
This preserves the workaround for the old bug that caused NoUUID items
to be stored in the log, prefixing log lines with " ". It's now handled
implicitly, by using takeWhile1 (/= ' ') to get the uuid.
There is a behavior change from the old parser, which split the value
into words and then recombined it. That meant that "foo bar" and "foo\tbar"
came out as "foo bar". That behavior was not documented, and seems
surprising; it meant that after a git-annex describe here "foo bar",
you wouldn't get that same string back out when git-annex displayed repo
descriptions.
Otoh, some other parsers relied on the old behavior, and the attoparsec
rewrites had to deal with the issue themselves...
For group.log, there are some edge cases around the user providing a
group name with a leading or trailing space. The old parser would ignore
such excess whitespace. The new parser does too, because the alternative
is to refuse to parse something like " group1 group2 " due to excess
whitespace, which would be even more confusing behavior.
The only git-annex branch log file that is not converted to attoparsec
and bytestring-builder now is transitions.log.
2019-01-10 18:39:36 +00:00
|
|
|
parsePreferredContentExpression :: A.Parser PreferredContentExpression
|
|
|
|
parsePreferredContentExpression = decodeBS <$> A.takeByteString
|
|
|
|
|
|
|
|
buildPreferredContentExpression :: PreferredContentExpression -> Builder
|
|
|
|
buildPreferredContentExpression = byteString . encodeBS
|
|
|
|
|
2014-01-02 00:12:20 +00:00
|
|
|
preferredContentMapRaw :: Annex (M.Map UUID PreferredContentExpression)
|
2019-02-21 17:43:21 +00:00
|
|
|
preferredContentMapRaw = simpleMap . parseLogOld parsePreferredContentExpression
|
2014-01-02 00:12:20 +00:00
|
|
|
<$> Annex.Branch.get preferredContentLog
|
2014-03-15 20:17:01 +00:00
|
|
|
|
2014-03-29 19:20:55 +00:00
|
|
|
requiredContentMapRaw :: Annex (M.Map UUID PreferredContentExpression)
|
2019-02-21 17:43:21 +00:00
|
|
|
requiredContentMapRaw = simpleMap . parseLogOld parsePreferredContentExpression
|
2014-03-29 19:20:55 +00:00
|
|
|
<$> Annex.Branch.get requiredContentLog
|
|
|
|
|
2014-03-15 20:17:01 +00:00
|
|
|
groupPreferredContentMapRaw :: Annex (M.Map Group PreferredContentExpression)
|
2019-01-09 19:00:43 +00:00
|
|
|
groupPreferredContentMapRaw = simpleMap . parseGroupPreferredContent
|
2014-03-15 20:17:01 +00:00
|
|
|
<$> Annex.Branch.get groupPreferredContentLog
|