github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 04:59:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Replace duplicate slashes from file names when importing

Browse source 
Fixes #3470
This commit is contained in:
gl3nni3 2020-01-05 02:52:45 +01:00 • committed by Qstick
commit a229062e6f
2 changed files with 16 additions and 1 deletions
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()
{ {

8
src/NzbDrone.Common/Disk/OsPath.cs
View file

@ -85,7 +85,13 @@ 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;