haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the All FilterGroup, since it becomes ambiguous in light of the DefaultExclude and DefaultInclude groups.

Browse Source
This commit is contained in:
Tyler Gill
2018-03-21 16:52:25 -06:00
parent c63597ab6a
commit 2d429f65a1
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/CommandLine/Help.cs
+1 -1
View File
@@ -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));
Duplicati/Library/Utility/FilterGroups.cs
+5 -11
View File
@@ -52,15 +52,10 @@ namespace Duplicati.Library.Utility
/// </summary>
Applications = 0x10,
/// <summary>
/// Meta option that includes all the other filters
/// </summary>
All = SystemFiles | OperatingSystem | CacheFiles | TemporaryFolders | Applications,
/// <summary>
/// Meta option that specifies the default exclude filters
/// </summary>
DefaultExclude = All,
DefaultExclude = SystemFiles | OperatingSystem | CacheFiles | TemporaryFolders | Applications,
/// <summary>
/// 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();