diff --git a/Duplicati/CommandLine/Help.cs b/Duplicati/CommandLine/Help.cs index c78342861..326241afc 100644 --- a/Duplicati/CommandLine/Help.cs +++ b/Duplicati/CommandLine/Help.cs @@ -107,7 +107,7 @@ namespace Duplicati.CommandLine tp = tp.Replace("%DEFAULTENCRYPTIONMODULE%", opts.EncryptionModule); tp = tp.Replace("%DEFAULTCOMPRESSIONMODULE%", opts.CompressionModule); tp = tp.Replace("%GENERICMODULES%", string.Join(", ", Library.DynamicLoader.GenericLoader.Keys)); - var metaGroupNames = new[] { nameof(FilterGroup.All), nameof(FilterGroup.None), nameof(FilterGroup.DefaultExclude), nameof(FilterGroup.DefaultInclude), }; + var metaGroupNames = new[] { nameof(FilterGroup.None), nameof(FilterGroup.DefaultExclude), nameof(FilterGroup.DefaultInclude), }; tp = tp.Replace("%FILTER_GROUPS_SHORT%", string.Join(Environment.NewLine + " ", metaGroupNames.Concat(Enum.GetNames(typeof(FilterGroup)).Except(metaGroupNames, StringComparer.OrdinalIgnoreCase).OrderBy(x => x, StringComparer.OrdinalIgnoreCase)).Select(group => "{" + group + "}"))); tp = tp.Replace("%FILTER_GROUPS_LONG%", Library.Utility.FilterGroups.GetOptionDescriptions(4, true)); diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index a8c79ca45..41786f3fe 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -52,15 +52,10 @@ namespace Duplicati.Library.Utility /// Applications = 0x10, - /// - /// Meta option that includes all the other filters - /// - All = SystemFiles | OperatingSystem | CacheFiles | TemporaryFolders | Applications, - /// /// Meta option that specifies the default exclude filters /// - DefaultExclude = All, + DefaultExclude = SystemFiles | OperatingSystem | CacheFiles | TemporaryFolders | Applications, /// /// Meta option that specifies the default include filters @@ -151,9 +146,9 @@ namespace Duplicati.Library.Utility foreach (var e in Enum.GetValues(typeof(FilterGroup))) { var ed = (FilterGroup)e; - if (defaultExclude.HasFlag(ed) && ed != defaultExclude && ed != FilterGroup.All && ed != FilterGroup.None) + if (defaultExclude.HasFlag(ed) && ed != defaultExclude && ed != FilterGroup.None) defaultExcludeValues.Add(e.ToString()); - if (defaultInclude.HasFlag(ed) && ed != defaultInclude && ed != FilterGroup.All && ed != FilterGroup.None) + if (defaultInclude.HasFlag(ed) && ed != defaultInclude && ed != FilterGroup.None) defaultIncludeValues.Add(e.ToString()); } @@ -161,9 +156,8 @@ namespace Duplicati.Library.Utility var sb = new System.Text.StringBuilder(); sb.AppendLine(ind + LC.L("{0}: Selects no filters.", nameof(FilterGroup.None))); - sb.AppendLine(ind + LC.L("{0}: Selects all the filter groups.", nameof(FilterGroup.All))); - sb.AppendLine(ind + LC.L("{0}: A set of default exclude filters, currently evaluates to: {1}.", nameof(FilterGroup.DefaultExclude), FilterGroup.DefaultExclude == FilterGroup.All ? nameof(FilterGroup.All) : string.Join(",", defaultExcludeValues.DefaultIfEmpty(nameof(FilterGroup.None))))); - sb.AppendLine(ind + LC.L("{0}: A set of default include filters, currently evaluates to: {1}.", nameof(FilterGroup.DefaultInclude), FilterGroup.DefaultInclude == FilterGroup.All ? nameof(FilterGroup.All) : string.Join(",", defaultIncludeValues.DefaultIfEmpty(nameof(FilterGroup.None))))); + sb.AppendLine(ind + LC.L("{0}: A set of default exclude filters, currently evaluates to: {1}.", nameof(FilterGroup.DefaultExclude), string.Join(",", defaultExcludeValues.DefaultIfEmpty(nameof(FilterGroup.None))))); + sb.AppendLine(ind + LC.L("{0}: A set of default include filters, currently evaluates to: {1}.", nameof(FilterGroup.DefaultInclude), string.Join(",", defaultIncludeValues.DefaultIfEmpty(nameof(FilterGroup.None))))); if (includevalues) sb.AppendLine();