Backup_Repos/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2026-05-09 05:40:53 +02:00
Code Issues Projects Releases Wiki Activity

Fixed: Prevent paths with multiple slashes causing backups to fail

Browse source 
Closes #8221
This commit is contained in:
Touchstone64 2025-12-01 11:16:17 +00:00 committed by Mark McDowall
parent 4e52b3c93e
commit 87892a1d0c
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
View file

@ -579,6 +579,21 @@ public void MoveFolder_should_rename_casesensitive_folder()
Directory.Exists(destination.FullName).Should().Be(true);
}
[Test]
public void TransferFile_should_find_files_with_multiple_slashes_within_their_path()
{
WithRealDiskProvider();
var root = GetFilledTempFolder();
var rootDir = root.FullName;
var from = Path.Combine(rootDir, "source-file");
var toRootDir = rootDir.Replace(Path.DirectorySeparatorChar.ToString(), new string(Path.DirectorySeparatorChar, 3));
var to = Path.Combine(toRootDir, "destination-file");
File.WriteAllText(from, "Source file");
var mode = Subject.TransferFile(from, to, TransferMode.Copy);
mode.Should().Be(TransferMode.Copy);
}
[Test]
public void should_throw_if_destination_is_readonly()
{

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

@ -28,15 +28,15 @@ public DiskTransferService(IDiskProvider diskProvider, Logger logger)
private string ResolveRealParentPath(string path)
{
var parentPath = path.GetParentPath();
if (!_diskProvider.FolderExists(parentPath))
if (!_diskProvider.FolderExists(path.GetParentPath()))
{
return path;
}
var cleanPath = path.GetCleanPath();
var parentPath = cleanPath.GetParentPath();
var realParentPath = parentPath.GetActualCasing();
var partialChildPath = path.Substring(parentPath.Length);
var partialChildPath = cleanPath.Substring(parentPath.Length);
return realParentPath + partialChildPath;
}