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

Support globbing for "@" filters in "find" and "restore"

Browse Source 
Change some comments.
This commit is contained in:
Dean Ferreyra
2020-09-04 09:54:33 -07:00
parent 3a66668e6a
commit 5c2fb96f5f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/CommandLine/Commands.cs
+10 -10
View File
@@ -236,15 +236,15 @@ namespace Duplicati.CommandLine
}
/// <summary>
/// For bare file names with no wildcards, replace with the
/// equivalent of prefixing with "*/" so we search all folders.
/// For bare file names with no wildcards, replace argument with
/// the equivalent of prefixing with "*/" so we search all folders.
/// </summary>
public static IEnumerable<string> PrefixArgsWithAsterisk(IEnumerable<string> argList) =>
argList.Select(PrefixArgWithAsterisk);
/// <summary>
/// For bare file names with no wildcards, replace with the
/// equivalent of prefixing with "*/" so we search all folders.
/// For bare file names with no wildcards, return argument with
/// the equivalent of prefixing with "*/" so we search all folders.
/// </summary>
private static string PrefixArgWithAsterisk(string arg)
{
@@ -268,15 +268,15 @@ namespace Duplicati.CommandLine
}
/// <summary>
/// For folders, replace with the equivalent of suffixing with "/*"
/// so we restore contents in the folder.
/// For folders, replace argument with the equivalent of suffixing
/// with "*" so we restore contents in the folder.
/// </summary>
public static IEnumerable<string> SuffixArgsWithAsterisk(IEnumerable<string> argList) =>
argList.Select(SuffixArgWithAsterisk);
/// <summary>
/// For folders, replace with the equivalent of suffixing with "/*"
/// so we restore contents in the folder.
/// For folders, return argument with the equivalent of suffixing
/// with "*" so we restore contents in the folder.
/// </summary>
private static string SuffixArgWithAsterisk(string arg)
{
@@ -285,12 +285,12 @@ namespace Duplicati.CommandLine
if (endsWithSeparator && arg.StartsWith("@", StringComparison.Ordinal))
{
// Convert to Regexp filter and suffix with "/.*"
// Convert to Regexp filter and suffix with ".*"
return $"[{Regex.Escape(arg.Substring(1))}.*]";
}
else if (endsWithSeparator && !containsWildcards && !arg.StartsWith("[", StringComparison.Ordinal))
{
// Suffix with "/*"
// Suffix with "*"
return arg + "*";
}
else