diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-15 17:08:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-15 17:08:55 -0400 |
| commit | b3bd559c7c814fc26c2887a535837ff4fb4c7c51 (patch) | |
| tree | ed19959410b91060550b799b2e91578db12e3680 /Types | |
| parent | 0897e17b533593418890a1e57939520c5a242d06 (diff) | |
finish wiring up groupwanted
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/StandardGroups.hs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index 63182d2a1..37ba6e9c6 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -78,21 +78,21 @@ specialRemoteOnly PublicGroup = True specialRemoteOnly _ = False {- See doc/preferred_content.mdwn for explanations of these expressions. -} -preferredContent :: StandardGroup -> PreferredContentExpression -preferredContent ClientGroup = lastResort $ +standardPreferredContent :: StandardGroup -> PreferredContentExpression +standardPreferredContent ClientGroup = lastResort $ "((exclude=*/archive/* and exclude=archive/*) or (" ++ notArchived ++ ")) and not unused" -preferredContent TransferGroup = lastResort $ - "not (inallgroup=client and copies=client:2) and (" ++ preferredContent ClientGroup ++ ")" -preferredContent BackupGroup = "include=* or unused" -preferredContent IncrementalBackupGroup = lastResort +standardPreferredContent TransferGroup = lastResort $ + "not (inallgroup=client and copies=client:2) and (" ++ standardPreferredContent ClientGroup ++ ")" +standardPreferredContent BackupGroup = "include=* or unused" +standardPreferredContent IncrementalBackupGroup = lastResort "(include=* or unused) and (not copies=incrementalbackup:1)" -preferredContent SmallArchiveGroup = lastResort $ - "(include=*/archive/* or include=archive/*) and (" ++ preferredContent FullArchiveGroup ++ ")" -preferredContent FullArchiveGroup = lastResort notArchived -preferredContent SourceGroup = "not (copies=1)" -preferredContent ManualGroup = "present and (" ++ preferredContent ClientGroup ++ ")" -preferredContent PublicGroup = "inpreferreddir" -preferredContent UnwantedGroup = "exclude=*" +standardPreferredContent SmallArchiveGroup = lastResort $ + "(include=*/archive/* or include=archive/*) and (" ++ standardPreferredContent FullArchiveGroup ++ ")" +standardPreferredContent FullArchiveGroup = lastResort notArchived +standardPreferredContent SourceGroup = "not (copies=1)" +standardPreferredContent ManualGroup = "present and (" ++ standardPreferredContent ClientGroup ++ ")" +standardPreferredContent PublicGroup = "inpreferreddir" +standardPreferredContent UnwantedGroup = "exclude=*" notArchived :: String notArchived = "not (copies=archive:1 or copies=smallarchive:1)" |