Fixed issue trying getting parent of drive

This commit is contained in:
Mark McDowall 2014-06-09 18:26:49 -07:00
parent cdca754b0f
commit 95f4d71c68
3 changed files with 14 additions and 2 deletions

View File

@ -268,5 +268,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
result.OutputPath.Should().Be(@"C:\sorted\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE".AsOsAgnostic()); result.OutputPath.Should().Be(@"C:\sorted\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE".AsOsAgnostic());
} }
[Test]
public void should_not_blow_up_if_storage_is_drive_root()
{
_completed.Items.First().Storage = @"C:\".AsOsAgnostic();
WithQueue(null);
WithHistory(_completed);
var result = Subject.GetItems().Single();
result.OutputPath.Should().Be(@"C:\".AsOsAgnostic());
}
} }
} }

View File

@ -162,7 +162,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
if (!sabHistoryItem.Storage.IsNullOrWhiteSpace()) if (!sabHistoryItem.Storage.IsNullOrWhiteSpace())
{ {
var parent = Directory.GetParent(sabHistoryItem.Storage); var parent = Directory.GetParent(sabHistoryItem.Storage);
if (parent.Name == sabHistoryItem.Title) if (parent != null && parent.Name == sabHistoryItem.Title)
{ {
historyItem.OutputPath = parent.FullName; historyItem.OutputPath = parent.FullName;
} }

View File

@ -6,7 +6,6 @@ using NzbDrone.Common;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Serializer; using NzbDrone.Common.Serializer;
using NzbDrone.Core.Download.Clients.Sabnzbd.Responses; using NzbDrone.Core.Download.Clients.Sabnzbd.Responses;
using NzbDrone.Core.Instrumentation.Extensions;
using RestSharp; using RestSharp;
namespace NzbDrone.Core.Download.Clients.Sabnzbd namespace NzbDrone.Core.Download.Clients.Sabnzbd