Compare commits

...

1 Commits

Author SHA1 Message Date
Mark McDowall
17f28a10d5 Fixed: Normalize unicode characters when comparing paths for equality
(cherry picked from commit ceeec091f85d0094e07537b7f62f18292655a710)
2024-11-15 03:02:58 +00:00
3 changed files with 16 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Text;
using FluentAssertions; using FluentAssertions;
using Moq; using Moq;
using NUnit.Framework; using NUnit.Framework;
@@ -316,5 +317,14 @@ namespace NzbDrone.Common.Test
result[2].Should().Be(@"Music"); result[2].Should().Be(@"Music");
result[3].Should().Be(@"Author Title"); result[3].Should().Be(@"Author Title");
} }
[Test]
public void should_be_equal_with_different_unicode_representations()
{
var path1 = @"C:\Test\file.mkv".AsOsAgnostic().Normalize(NormalizationForm.FormC);
var path2 = @"C:\Test\file.mkv".AsOsAgnostic().Normalize(NormalizationForm.FormD);
path1.PathEquals(path2);
}
} }
} }

View File

@@ -60,6 +60,10 @@ namespace NzbDrone.Common.Extensions
public static bool PathEquals(this string firstPath, string secondPath, StringComparison? comparison = null) public static bool PathEquals(this string firstPath, string secondPath, StringComparison? comparison = null)
{ {
// Normalize paths to ensure unicode characters are represented the same way
firstPath = firstPath.Normalize();
secondPath = secondPath?.Normalize();
if (!comparison.HasValue) if (!comparison.HasValue)
{ {
comparison = DiskProviderBase.PathStringComparison; comparison = DiskProviderBase.PathStringComparison;

View File

@@ -21,10 +21,10 @@ namespace NzbDrone.Common
{ {
if (OsInfo.IsWindows) if (OsInfo.IsWindows)
{ {
return obj.CleanFilePath().ToLower().GetHashCode(); return obj.CleanFilePath().Normalize().ToLower().GetHashCode();
} }
return obj.CleanFilePath().GetHashCode(); return obj.CleanFilePath().Normalize().GetHashCode();
} }
} }
} }