Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2026-01-08 00:23:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Normalize unicode characters when comparing paths for equality

Browse source 
(cherry picked from commit ceeec091f85d0094e07537b7f62f18292655a710)
This commit is contained in:
Mark McDowall 2024-11-03 16:22:32 -08:00 committed by Bogdan
parent 2429dd91c6
commit ea86d14ca7
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/NzbDrone.Common.Test/PathExtensionFixture.cs
View file

@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Text;
using FluentAssertions;
using Moq;
using NUnit.Framework;
@ -433,5 +434,14 @@ public void unix_path_should_return_relative_path(string parentPath, string chil
{
parentPath.GetRelativePath(childPath).Should().Be(relativePath);
}
[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);
}
}
}

4
src/NzbDrone.Common/Extensions/PathExtensions.cs
View file

@ -55,6 +55,10 @@ public static bool PathNotEquals(this string firstPath, string secondPath, Strin
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)
{
comparison = DiskProviderBase.PathStringComparison;

4
src/NzbDrone.Common/PathEqualityComparer.cs
View file

@ -21,10 +21,10 @@ public int GetHashCode(string obj)
{
if (OsInfo.IsWindows)
{
return obj.CleanFilePath().ToLower().GetHashCode();
return obj.CleanFilePath().Normalize().ToLower().GetHashCode();
}
return obj.CleanFilePath().GetHashCode();
return obj.CleanFilePath().Normalize().GetHashCode();
}
}
}