mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Trim whitespace on Remote Mapping Add 

Fixes #4481
This commit is contained in:
Qstick 2020-06-03 21:38:46 -04:00
parent 9ca291ecaf
commit 13f3d0292c
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using FizzWare.NBuilder;
using FluentAssertions;
@ -135,5 +135,24 @@ namespace NzbDrone.Core.Test.RemotePathMappingsTests
result.RemotePath.Should().Be(cleanedPath);
}
[TestCase(@" \\server\share\with\whitespace\ ", @"\\server\share\with\whitespace\")]
[TestCase(@" D:\with\whitespace\", @"D:\with\whitespace\")]
[TestCase(@"D:\with\whitespace\ ", @"D:\with\whitespace\")]
public void should_trim_whitespace_on_add(string remotePath, string cleanedPath)
{
GivenMapping();
var mapping = new RemotePathMapping
{
Host = "my-server.localdomain",
RemotePath = remotePath,
LocalPath = @"D:\mountedstorage\downloads\tv".AsOsAgnostic()
};
var result = Subject.Add(mapping);
result.RemotePath.Should().Be(cleanedPath);
}
}
}

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

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -50,8 +50,8 @@ namespace NzbDrone.Core.RemotePathMappings
public RemotePathMapping Add(RemotePathMapping mapping)
{
mapping.LocalPath = new OsPath(mapping.LocalPath).AsDirectory().FullPath;
mapping.RemotePath = new OsPath(mapping.RemotePath).AsDirectory().FullPath;
mapping.LocalPath = new OsPath(mapping.LocalPath.Trim()).AsDirectory().FullPath;
mapping.RemotePath = new OsPath(mapping.RemotePath.Trim()).AsDirectory().FullPath;
var all = All();