Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-12-06 08:28:50 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Command-line data path causing backups to fail

Browse source
This commit is contained in:
Touchstone64 2025-11-30 17:43:45 +00:00
parent b59ff0a3b1
commit 708cf392fb
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -540,6 +540,27 @@ public void MoveFolder_should_rename_caseinsensitive_folder()
source.FullName.GetActualCasing().Should().Be(destination.FullName); source.FullName.GetActualCasing().Should().Be(destination.FullName);
} }
[Test]
public void TransferFile_should_find_files_with_multiple_slashes_within_their_path()
{
WithRealDiskProvider();
var root = GetFilledTempFolder();
var rootDir = root.FullName;
var fromFileName = "source-file";
var from = Path.Combine(rootDir, fromFileName);
var to = Path.Combine(rootDir, "destination-file");
var oneSlash = new string(Path.DirectorySeparatorChar, 1);
var threeSlashes = new string(Path.DirectorySeparatorChar, 3);
var overSlashed = Path.Combine(rootDir.Replace(oneSlash, threeSlashes), fromFileName);
File.WriteAllText(from, "Source file");
var mode = Subject.TransferFile(overSlashed, to, TransferMode.Copy);
mode.Should().Be(TransferMode.Copy);
}
[Test] [Test]
public void should_throw_if_destination_is_readonly() public void should_throw_if_destination_is_readonly()
{ {

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

@ -28,15 +28,21 @@ public DiskTransferService(IDiskProvider diskProvider, Logger logger)
private string ResolveRealParentPath(string path) private string ResolveRealParentPath(string path)
{ {
var parentPath = path.GetParentPath(); var testExists = path.GetParentPath();
if (!_diskProvider.FolderExists(parentPath)) if (!_diskProvider.FolderExists(testExists))
{ {
return path; return path;
} }
var realParentPath = parentPath.GetActualCasing(); var cleanPath = path.GetCleanPath();
if (cleanPath != path)
{
_logger.Warn($"Path '{path}' is not clean, using '{cleanPath}' to resolve the parent path instead");
}
var partialChildPath = path.Substring(parentPath.Length); var parentPath = cleanPath.GetParentPath();
var realParentPath = parentPath.GetActualCasing();
var partialChildPath = cleanPath.Substring(parentPath.Length);
return realParentPath + partialChildPath; return realParentPath + partialChildPath;
} }