Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Remote path mapping host comparison ignores case 

Closes #3169
This commit is contained in:
Mark McDowall 2019-06-15 09:46:47 -07:00
parent 7dff9bc696
commit 394932b57f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core.Test/RemotePathMappingsTests/RemotePathMappingServiceFixture.cs
View File

@ -87,6 +87,7 @@ namespace NzbDrone.Core.Test.RemotePathMappingsTests
} }
[TestCase("my-server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")] [TestCase("my-server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")]
[TestCase("My-Server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")]
[TestCase("my-2server.localdomain", "/mnt/storage/downloads/tv", "/mnt/storage/downloads/tv")] [TestCase("my-2server.localdomain", "/mnt/storage/downloads/tv", "/mnt/storage/downloads/tv")]
[TestCase("my-server.localdomain", "/mnt/storageabc/downloads/tv", "/mnt/storageabc/downloads/tv")] [TestCase("my-server.localdomain", "/mnt/storageabc/downloads/tv", "/mnt/storageabc/downloads/tv")]
public void should_remap_remote_to_local(string host, string remotePath, string expectedLocalPath) public void should_remap_remote_to_local(string host, string remotePath, string expectedLocalPath)
@ -101,6 +102,7 @@ namespace NzbDrone.Core.Test.RemotePathMappingsTests
} }
[TestCase("my-server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")] [TestCase("my-server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")]
[TestCase("My-Server.localdomain", "/mnt/storage/downloads/tv", @"D:\mountedstorage\downloads\tv")]
[TestCase("my-server.localdomain", "/mnt/storage/", @"D:\mountedstorage")] [TestCase("my-server.localdomain", "/mnt/storage/", @"D:\mountedstorage")]
[TestCase("my-2server.localdomain", "/mnt/storage/downloads/tv", "/mnt/storage/downloads/tv")] [TestCase("my-2server.localdomain", "/mnt/storage/downloads/tv", "/mnt/storage/downloads/tv")]
[TestCase("my-server.localdomain", "/mnt/storageabc/downloads/tv", "/mnt/storageabc/downloads/tv")] [TestCase("my-server.localdomain", "/mnt/storageabc/downloads/tv", "/mnt/storageabc/downloads/tv")]

4
src/NzbDrone.Core/RemotePathMappings/RemotePathMappingService.cs
View File

@ -129,7 +129,7 @@ namespace NzbDrone.Core.RemotePathMappings
foreach (var mapping in All()) foreach (var mapping in All())
{ {
if (host == mapping.Host && new OsPath(mapping.RemotePath).Contains(remotePath)) if (host.Equals(mapping.Host, StringComparison.InvariantCultureIgnoreCase) && new OsPath(mapping.RemotePath).Contains(remotePath))
{ {
var localPath = new OsPath(mapping.LocalPath) + (remotePath - new OsPath(mapping.RemotePath)); var localPath = new OsPath(mapping.LocalPath) + (remotePath - new OsPath(mapping.RemotePath));
@ -149,7 +149,7 @@ namespace NzbDrone.Core.RemotePathMappings
foreach (var mapping in All()) foreach (var mapping in All())
{ {
if (host == mapping.Host && new OsPath(mapping.LocalPath).Contains(localPath)) if (host.Equals(mapping.Host, StringComparison.InvariantCultureIgnoreCase) && new OsPath(mapping.LocalPath).Contains(localPath))
{ {
var remotePath = new OsPath(mapping.RemotePath) + (localPath - new OsPath(mapping.LocalPath)); var remotePath = new OsPath(mapping.RemotePath) + (localPath - new OsPath(mapping.LocalPath));