Fixed: Not properly getting the parent of a folder with a trailing slash

GetParentFolder will trim trailing slashes
pull/6/head
Mark McDowall 10 years ago
parent 1b3993bf6a
commit 3ed8f0ea84

@ -346,6 +346,15 @@ namespace NzbDrone.Common.Test.DiskTests
Console.WriteLine(GetFilledTempFolder().LastWriteTimeUtc); Console.WriteLine(GetFilledTempFolder().LastWriteTimeUtc);
} }
[Test]
public void GetParentFolder_should_remove_trailing_slash_before_getting_parent_folder()
{
var path = @"C:\Test\TV\".AsOsAgnostic();
var parent = @"C:\Test".AsOsAgnostic();
Subject.GetParentFolder(path).Should().Be(parent);
}
private void VerifyCopy(string source, string destination) private void VerifyCopy(string source, string destination)
{ {
var sourceFiles = Directory.GetFileSystemEntries(source, "*", SearchOption.AllDirectories).Select(v => v.Substring(source.Length + 1)).ToArray(); var sourceFiles = Directory.GetFileSystemEntries(source, "*", SearchOption.AllDirectories).Select(v => v.Substring(source.Length + 1)).ToArray();

@ -355,7 +355,7 @@ namespace NzbDrone.Common.Disk
{ {
Ensure.That(path, () => path).IsValidPath(); Ensure.That(path, () => path).IsValidPath();
var parent = Directory.GetParent(path); var parent = Directory.GetParent(path.TrimEnd(Path.DirectorySeparatorChar));
if (parent == null) if (parent == null)
{ {

Loading…
Cancel
Save