Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with a relative complete dir in sabnzbd.

This commit is contained in:
Taloth Saldono 2014-07-12 00:16:49 +02:00
parent 2a0f461135
commit df0082c077
3 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
View File

@ -23,6 +23,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
private SabnzbdQueue _queued;
private SabnzbdHistory _failed;
private SabnzbdHistory _completed;
private SabnzbdConfig _config;
[SetUp]
public void Setup()
@ -40,6 +41,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
};
_queued = new SabnzbdQueue
{
DefaultRootFolder = @"Y:\nzbget\root".AsOsAgnostic(),
Paused = false,
Items = new List<SabnzbdQueueItem>()
{
@ -87,19 +89,21 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
}
};
Mocker.GetMock<ISabnzbdProxy>()
.Setup(s => s.GetConfig(It.IsAny<SabnzbdSettings>()))
.Returns(new SabnzbdConfig
_config = new SabnzbdConfig
{
Misc = new SabnzbdConfigMisc
Misc = new SabnzbdConfigMisc
{
complete_dir = "/remote/mount/"
complete_dir = @"/remote/mount"
},
Categories = new List<SabnzbdCategory>
{
new SabnzbdCategory { Name = "tv", Dir = "vv" }
}
});
};
Mocker.GetMock<ISabnzbdProxy>()
.Setup(s => s.GetConfig(It.IsAny<SabnzbdSettings>()))
.Returns(_config);
}
protected void WithMountPoint(String mountPath)
@ -129,7 +133,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
if (queue == null)
{
queue = new SabnzbdQueue() { Items = new List<SabnzbdQueueItem>() };
queue = new SabnzbdQueue()
{
DefaultRootFolder = _queued.DefaultRootFolder,
Items = new List<SabnzbdQueueItem>()
};
}
Mocker.GetMock<ISabnzbdProxy>()
@ -314,14 +322,23 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
result.OutputPath.Should().Be(@"C:\".AsOsAgnostic());
}
[Test]
public void should_return_status_with_outputdir()
[TestCase(@"Y:\nzbget\root", @"completed\downloads", @"vv", @"Y:\nzbget\root\completed\downloads\vv")]
[TestCase(@"Y:\nzbget\root", @"completed", @"vv", @"Y:\nzbget\root\completed\vv")]
[TestCase(@"/nzbget/root", @"completed/downloads", @"vv", @"/nzbget/root/completed/downloads/vv")]
[TestCase(@"/nzbget/root", @"completed", @"vv", @"/nzbget/root/completed/vv")]
public void should_return_status_with_outputdir(String rootFolder, String completeDir, String categoryDir, String expectedDir)
{
_queued.DefaultRootFolder = rootFolder;
_config.Misc.complete_dir = completeDir;
_config.Categories.First().Dir = categoryDir;
WithQueue(null);
var result = Subject.GetStatus();
result.IsLocalhost.Should().BeTrue();
result.OutputRootFolders.Should().NotBeNull();
result.OutputRootFolders.First().Should().Be(@"/remote/mount/vv");
result.OutputRootFolders.First().Should().Be(expectedDir);
}
[Test]
@ -329,6 +346,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
WithMountPoint(@"O:\mymount".AsOsAgnostic());
WithQueue(null);
var result = Subject.GetStatus();
result.IsLocalhost.Should().BeTrue();

14
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View File

@ -236,6 +236,20 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
var completeDir = config.Misc.complete_dir.TrimEnd('\\', '/');
if (!completeDir.StartsWith("/") && !completeDir.StartsWith("\\") && !completeDir.Contains(':'))
{
var queue = _proxy.GetQueue(0, 1, Settings);
if (queue.DefaultRootFolder.StartsWith("/"))
{
completeDir = queue.DefaultRootFolder + "/" + completeDir;
}
else
{
completeDir = queue.DefaultRootFolder + "\\" + completeDir;
}
}
foreach (var category in config.Categories)
{
var relativeDir = category.Dir.TrimEnd('*');

3
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdQueue.cs
View File

@ -5,6 +5,9 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabnzbdQueue
{
[JsonProperty(PropertyName = "my_home")]
public string DefaultRootFolder { get; set; }
public bool Paused { get; set; }
[JsonProperty(PropertyName = "slots")]