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

Fixed: Replace duplicate slashes from file names when importing 

Fixes #3470
This commit is contained in:
gl3nni3 2020-01-05 02:52:45 +01:00 committed by Mark McDowall
parent c6ea7d7e63
commit 2d94857369
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/NzbDrone.Common.Test/OsPathFixture.cs
View File

@ -185,6 +185,15 @@ namespace NzbDrone.Common.Test
osPath.FullPath.Should().Be(@"/just/a/test/to/verify the/slashes/"); osPath.FullPath.Should().Be(@"/just/a/test/to/verify the/slashes/");
} }
[Test]
public void should_fix_double_slashes_unix()
{
var osPath = new OsPath(@"/just/a//test////to/verify the/slashes/");
osPath.Kind.Should().Be(OsPathKind.Unix);
osPath.FullPath.Should().Be(@"/just/a/test/to/verify the/slashes/");
}
[Test] [Test]
public void should_combine_mixed_slashes() public void should_combine_mixed_slashes()
{ {

7
src/NzbDrone.Common/Disk/OsPath.cs
View File

@ -71,7 +71,12 @@ namespace NzbDrone.Common.Disk
case OsPathKind.Windows: case OsPathKind.Windows:
return path.Replace('/', '\\'); return path.Replace('/', '\\');
case OsPathKind.Unix: case OsPathKind.Unix:
return path.Replace('\\', '/'); path = path.Replace('\\', '/');
while (path.Contains("//"))
{
path = path.Replace("//", "/");
}
return path;
} }
return path; return path;