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

Merge pull request #3354 from warwickmm/bugfix/ordinal_filename_comparison

Browse Source 
Use ordinal sort rules to compare path names
This commit is contained in:
Rune Henriksen
2018-09-05 08:09:21 +02:00
committed by GitHub
parent 2c2f4f315d d67c5c393b
commit 72fc8e4134
2 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Utility/Utility.cs
+2 -2
View File
@@ -1054,12 +1054,12 @@ namespace Duplicati.Library.Utility
/// <summary>
/// Gets a string comparer that matches the client filesystems case sensitivity
/// </summary>
public static StringComparer ClientFilenameStringComparer => IsFSCaseSensitive ? StringComparer.CurrentCulture : StringComparer.CurrentCultureIgnoreCase;
public static StringComparer ClientFilenameStringComparer => IsFSCaseSensitive ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
/// <summary>
/// Gets the string comparision that matches the client filesystems case sensitivity
/// </summary>
public static StringComparison ClientFilenameStringComparison => IsFSCaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
public static StringComparison ClientFilenameStringComparison => IsFSCaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
/// <summary>
/// The path to the users home directory
Duplicati/UnitTest/UtilityTests.cs
+41 -1
View File
@@ -24,6 +24,46 @@ namespace Duplicati.UnitTest
{
public class UtilityTests
{
[Test]
[Category("Utility")]
[TestCase("da-DK")]
[TestCase("en-US")]
[TestCase("hu-HU")]
[TestCase("tr-TR")]
public static void FilenameStringComparison(string cultureName)
{
Action<string, string> checkStringComparison = (x, y) => Assert.IsFalse(String.Equals(x, y, Utility.ClientFilenameStringComparison));
Action<string, string> checkStringComparer = (x, y) => Assert.IsFalse(new HashSet<string>(new[] { x }).Contains(y, Utility.ClientFilenameStringComparer));
System.Globalization.CultureInfo originalCulture = System.Globalization.CultureInfo.CurrentCulture;
try
{
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(cultureName, false);
// These are equivalent with respect to hu-HU, but different with respect to en-US.
string ddzs = "ddzs";
string dzsdzs = "dzsdzs";
checkStringComparison(ddzs, dzsdzs);
checkStringComparer(ddzs, dzsdzs);
// Many cultures treat the following as equivalent.
string eAcuteOneCharacter = System.Text.Encoding.GetEncoding("iso-8859-1").GetString(new byte[] { 233 }); // 'é' as one character (ALT+0233).
string eAcuteTwoCharacters = "\u0065\u0301"; // 'e', combined with an acute accent (U+301).
checkStringComparison(eAcuteOneCharacter, eAcuteTwoCharacters);
checkStringComparer(eAcuteOneCharacter, eAcuteTwoCharacters);
// These are equivalent with respect to en-US, but different with respect to da-DK.
string aDiaeresisOneCharacter = "\u00C4"; // 'A' with a diaeresis.
string aDiaeresisTwoCharacters = "\u0041\u0308"; // 'A', combined with a diaeresis.
checkStringComparison(aDiaeresisOneCharacter, aDiaeresisTwoCharacters);
checkStringComparer(aDiaeresisOneCharacter, aDiaeresisTwoCharacters);
}
finally
{
System.Threading.Thread.CurrentThread.CurrentCulture = originalCulture;
}
}
[Test]
[Category("Utility")]
public static void ForceStreamRead()
@@ -82,7 +122,7 @@ namespace Duplicati.UnitTest
// Test with custom comparer.
IEqualityComparer<string> comparer = StringComparer.OrdinalIgnoreCase;
uniqueItems = new string[] {"a", "b", "c"};
uniqueItems = new string[] { "a", "b", "c" };
duplicateItems = new string[] { "a", "c" };
actualDuplicateItems = null;