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

Merge remote-tracking branch 'origin/dynamic-jobs'

This commit is contained in:
Mark McDowall 2012-10-19 08:39:07 -07:00
parent de62dc6f56 cb0f1fe513
commit db585b3bd7
52 changed files with 292 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
View File

@ -79,6 +79,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ConfigFileProviderTest.cs" />
<Compile Include="ReflectionExtensions.cs" />
<Compile Include="ReportingService_ReportParseError_Fixture.cs" />
<Compile Include="PathExtentionFixture.cs" />
<Compile Include="DiskProviderFixture.cs" />

15
NzbDrone.Common.Test/ReflectionExtensions.cs Normal file
View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Common.Test
{
public static class ReflectionExtensions
{
public static T GetPropertyValue<T>(this object obj, string propertyName)
{
return (T)obj.GetType().GetProperty(propertyName).GetValue(obj, null);
}
}
}

2
NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
View File

@ -161,7 +161,7 @@ namespace NzbDrone.Core.Test.JobTests
private void StartUpdate()
{
Mocker.Resolve<AppUpdateJob>().Start(MockNotification, 0, 0);
Mocker.Resolve<AppUpdateJob>().Start(MockNotification, null);
}
}
}

65
NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
View File

@ -12,6 +12,7 @@ using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.JobTests
@ -39,13 +40,13 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, new { SeriesId = It.IsAny<int>(), SeasonNumber = It.IsAny<int>() }),
Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, new { SeriesId = It.IsAny<int>(), SeasonNumber = 0 }),
Times.Never());
}
@ -65,23 +66,19 @@ namespace NzbDrone.Core.Test.JobTests
.With(e => e.Series = series)
.Build();
WithStrictMocker();
WithEnableBacklogSearching();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<EpisodeSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), 0)).Verifiable();
.Setup(s => s.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") == 1)));
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)),
Times.Once());
}
@ -101,23 +98,16 @@ namespace NzbDrone.Core.Test.JobTests
.With(e => e.Series = series)
.Build();
WithStrictMocker();
WithEnableBacklogSearching();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<EpisodeSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), 0)).Verifiable();
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)),
Times.Exactly(episodes.Count));
}
@ -138,26 +128,19 @@ namespace NzbDrone.Core.Test.JobTests
.With(e => e.SeasonNumber = 1)
.Build();
WithStrictMocker();
WithEnableBacklogSearching();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<EpisodeSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), 0)).Verifiable();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)),
Times.Exactly(episodes.Count));
}
@ -179,27 +162,21 @@ namespace NzbDrone.Core.Test.JobTests
.With(e => e.SeasonNumber = 1)
.Build();
WithStrictMocker();
WithEnableBacklogSearching();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<SeasonSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), It.IsAny<int>())).Verifiable();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(episodes.Select(e => e.EpisodeNumber).ToList());
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") >= 0 &&
d.GetPropertyValue<int>("SeasonNumber") >= 0)),
Times.Once());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Times.Never());
}
[Test]
@ -227,29 +204,23 @@ namespace NzbDrone.Core.Test.JobTests
.With(e => e.Series = series2)
.Build();
WithStrictMocker();
WithEnableBacklogSearching();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<SeasonSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), It.IsAny<int>())).Verifiable();
Mocker.GetMock<EpisodeSearchJob>()
.Setup(s => s.Start(notification, It.IsAny<int>(), 0)).Verifiable();
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(new List<int> { 1, 2, 3, 4, 5 });
//Act
Mocker.Resolve<BacklogSearchJob>().Start(notification, 0, 0);
Mocker.Resolve<BacklogSearchJob>().Start(notification, null);
//Assert
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), It.IsAny<int>()),
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") >= 0 &&
d.GetPropertyValue<int>("SeasonNumber") >= 0)),
Times.Once());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)),
Times.Exactly(5));
}

6
NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
View File

@ -57,7 +57,7 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<SeriesProvider>().Setup(s => s.GetAllSeries())
.Returns(series);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, 0, 0);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, null);
VerifyDownloadMock(series.Count);
}
@ -74,7 +74,7 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<SeriesProvider>().Setup(s => s.GetAllSeries())
.Returns(series);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, 0, 0);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, null);
VerifyDownloadMock(3);
}
@ -89,7 +89,7 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<SeriesProvider>().Setup(s => s.GetSeries(series.SeriesId))
.Returns(series);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, 1, 0);
Mocker.Resolve<BannerDownloadJob>().Start(_notification, new { SeriesId = series.SeriesId });
VerifyDownloadMock(1);
}
}

8
NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
View File

@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.JobTests
.Returns(new List<EpisodeFile>());
//Act
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), series.SeriesId, 0);
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), new { SeriesId = series.SeriesId });
//Assert
Mocker.VerifyAllMocks();
@ -68,7 +68,7 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.Scan(series[1]))
.Returns(new List<EpisodeFile>());
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), 0, 0);
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), null);
Mocker.VerifyAllMocks();
@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.Scan(series[1]))
.Throws(new InvalidOperationException("Bad Job"));
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), 0, 0);
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), null);
Mocker.VerifyAllMocks();
@ -126,7 +126,7 @@ namespace NzbDrone.Core.Test.JobTests
.Returns(new List<EpisodeFile>());
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), 0, 0);
Mocker.Resolve<DiskScanJob>().Start(new ProgressNotification("Test"), null);

42
NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
View File

@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test.JobTests
public class ImportNewSeriesJobTest : CoreTest
{
[Test]
public void import_new_series_succesfull()
public void import_new_series_succesful()
{
var series = Builder<Series>.CreateListOfSize(2)
.All().With(s => s.LastInfoSync = null)
@ -39,23 +39,23 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<DiskScanJob>()
.Setup(j => j.Start(notification, series[0].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)))
.Callback(() => series[0].LastDiskSync = DateTime.Now);
Mocker.GetMock<DiskScanJob>()
.Setup(j => j.Start(notification, series[1].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)))
.Callback(() => series[1].LastDiskSync = DateTime.Now);
Mocker.GetMock<BannerDownloadJob>()
.Setup(j => j.Start(notification, It.IsAny<int>(), 0));
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") >= 0)));
Mocker.GetMock<UpdateInfoJob>()
.Setup(j => j.Start(notification, series[0].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)))
.Callback(() => series[0].LastInfoSync = DateTime.Now);
Mocker.GetMock<UpdateInfoJob>()
.Setup(j => j.Start(notification, series[1].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)))
.Callback(() => series[1].LastInfoSync = DateTime.Now);
Mocker.GetMock<SeriesProvider>()
@ -68,16 +68,14 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.GetSeriesFiles(It.IsAny<int>())).Returns(new List<EpisodeFile>());
//Act
Mocker.Resolve<ImportNewSeriesJob>().Start(notification, 0, 0);
Mocker.Resolve<ImportNewSeriesJob>().Start(notification, null);
//Assert
Mocker.VerifyAllMocks();
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)), Times.Once());
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)), Times.Once());
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, series[0].SeriesId, 0), Times.Once());
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, series[1].SeriesId, 0), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, series[0].SeriesId, 0), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, series[1].SeriesId, 0), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)), Times.Once());
}
@ -103,19 +101,19 @@ namespace NzbDrone.Core.Test.JobTests
.Returns(series);
Mocker.GetMock<UpdateInfoJob>()
.Setup(j => j.Start(notification, series[0].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)))
.Callback(() => series[0].LastInfoSync = DateTime.Now);
Mocker.GetMock<UpdateInfoJob>()
.Setup(j => j.Start(notification, series[1].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)))
.Throws(new InvalidOperationException());
Mocker.GetMock<DiskScanJob>()
.Setup(j => j.Start(notification, series[0].SeriesId, 0))
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)))
.Callback(() => series[0].LastDiskSync = DateTime.Now);
Mocker.GetMock<BannerDownloadJob>()
.Setup(j => j.Start(notification, series[0].SeriesId, 0));
.Setup(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)));
Mocker.GetMock<SeriesProvider>()
.Setup(s => s.GetSeries(series[0].SeriesId)).Returns(series[0]);
@ -124,15 +122,13 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.GetSeriesFiles(It.IsAny<int>())).Returns(new List<EpisodeFile>());
//Act
Mocker.Resolve<ImportNewSeriesJob>().Start(notification, 0, 0);
Mocker.Resolve<ImportNewSeriesJob>().Start(notification, null);
//Assert
Mocker.VerifyAllMocks();
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[1].SeriesId)), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, series[0].SeriesId, 0), Times.Once());
Mocker.GetMock<UpdateInfoJob>().Verify(j => j.Start(notification, series[1].SeriesId, 0), Times.Once());
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, series[0].SeriesId, 0), Times.Once());
Mocker.GetMock<DiskScanJob>().Verify(j => j.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == series[0].SeriesId)), Times.Once());
ExceptionVerification.ExpectedErrors(1);

72
NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs Normal file
View File

@ -0,0 +1,72 @@
using System.Linq;
using System;
using System.Diagnostics;
using System.IO;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.JobTests
{
[TestFixture]
internal class PostDownloadScanJobFixture : CoreTest
{
[SetUp]
public void Setup()
{
Mocker.GetMock<DiskProvider>().Setup(s => s.FolderExists(It.IsAny<string>())).Returns(true);
}
[Test]
public void should_use_options_Path_when_provided()
{
var path = @"C:\Test\Unsorted TV";
Mocker.GetMock<PostDownloadProvider>().Setup(s => s.ProcessDropFolder(path));
Mocker.Resolve<PostDownloadScanJob>().Start(MockNotification, new { Path = path });
Mocker.GetMock<PostDownloadProvider>().Verify(s => s.ProcessDropFolder(path), Times.Once());
}
[Test]
public void should_not_get_sabDropDir_when_path_is_supplied()
{
var path = @"C:\Test\Unsorted TV";
Mocker.GetMock<PostDownloadProvider>().Setup(s => s.ProcessDropFolder(path));
Mocker.Resolve<PostDownloadScanJob>().Start(MockNotification, new { Path = path });
Mocker.GetMock<ConfigProvider>().Verify(s => s.SabDropDirectory, Times.Never());
}
[Test]
public void should_get_sabDropDir_when_path_is_not_supplied()
{
var path = @"C:\Test\Unsorted TV";
Mocker.GetMock<ConfigProvider>().SetupGet(s => s.SabDropDirectory).Returns(path);
Mocker.Resolve<PostDownloadScanJob>().Start(MockNotification, null);
Mocker.GetMock<ConfigProvider>().Verify(s => s.SabDropDirectory, Times.Once());
}
[Test]
public void should_use_sabDropDir_when_options_Path_is_not_provided()
{
var path = @"C:\Test\Unsorted TV";
Mocker.GetMock<ConfigProvider>().SetupGet(s => s.SabDropDirectory).Returns(path);
Mocker.Resolve<PostDownloadScanJob>().Start(MockNotification, null);
Mocker.GetMock<PostDownloadProvider>().Verify(s => s.ProcessDropFolder(path), Times.Once());
}
}
}

11
NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
View File

@ -13,6 +13,7 @@ using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.JobTests
@ -41,10 +42,10 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
//Act
Mocker.Resolve<RecentBacklogSearchJob>().Start(MockNotification, 0, 0);
Mocker.Resolve<RecentBacklogSearchJob>().Start(MockNotification, null);
//Assert
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(MockNotification, It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(MockNotification, new { EpisodeId = It.IsAny<int>() }),
Times.Never());
}
@ -87,13 +88,13 @@ namespace NzbDrone.Core.Test.JobTests
Mocker.GetMock<EpisodeProvider>()
.Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
Mocker.GetMock<EpisodeSearchJob>().Setup(c => c.Start(It.IsAny<ProgressNotification>(), It.IsAny<int>(), 0));
Mocker.GetMock<EpisodeSearchJob>().Setup(c => c.Start(It.IsAny<ProgressNotification>(), It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)));
//Act
Mocker.Resolve<RecentBacklogSearchJob>().Start(MockNotification, 0, 0);
Mocker.Resolve<RecentBacklogSearchJob>().Start(MockNotification, null);
//Assert
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(It.IsAny<ProgressNotification>(), It.IsAny<int>(), 0),
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(It.IsAny<ProgressNotification>(), It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)),
Times.Exactly(40));
}

9
NzbDrone.Core.Test/JobTests/SearchJobTest.cs
View File

@ -15,21 +15,20 @@ namespace NzbDrone.Core.Test.JobTests
[TestCase(0)]
[TestCase(-1)]
[TestCase(-100)]
[ExpectedException(typeof(ArgumentOutOfRangeException))]
[ExpectedException(typeof(ArgumentException))]
public void start_target_id_less_than_0_throws_exception(int target)
{
WithStrictMocker();
Mocker.Resolve<EpisodeSearchJob>().Start(new ProgressNotification("Test"), target, 0);
Mocker.Resolve<EpisodeSearchJob>().Start(new ProgressNotification("Test"), new { EpisodeId = target });
}
[TestCase(0)]
[TestCase(-1)]
[TestCase(-100)]
[ExpectedException(typeof(ArgumentOutOfRangeException))]
[ExpectedException(typeof(ArgumentException))]
public void start_secondary_target_id_less_than_0_throws_exception(int target)
{
WithStrictMocker();
Mocker.Resolve<SeasonSearchJob>().Start(new ProgressNotification("Test"), 0, target);
Mocker.Resolve<SeasonSearchJob>().Start(new ProgressNotification("Test"), new { SeriesId = 1, SeasonNumber = target });
}
}
}

12
NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
View File

@ -51,12 +51,12 @@ namespace NzbDrone.Core.Test.JobTests
.Returns(episodes.Select(e => e.EpisodeNumber).ToList());
//Act
Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 1);
Mocker.Resolve<SeasonSearchJob>().Start(notification, new { SeriesId = 1, SeasonNumber = 1 });
//Assert
Mocker.VerifyAllMocks();
Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Once());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0), Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, new { EpisodeId = It.IsAny<int>() }), Times.Never());
}
[Test]
@ -75,7 +75,7 @@ namespace NzbDrone.Core.Test.JobTests
.Returns(new List<int>());
//Act
Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 1);
Mocker.Resolve<SeasonSearchJob>().Start(notification, new { SeriesId = 1, SeasonNumber = 1 });
//Assert
Mocker.VerifyAllMocks();
@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.JobTests
//Act
Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 1);
Mocker.Resolve<SeasonSearchJob>().Start(notification, new { SeriesId = 1, SeasonNumber = 1 });
//Assert
Mocker.VerifyAllMocks();
@ -118,11 +118,11 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(c => c.PartialSeasonSearch(notification, 1, 0)).Returns(new List<int>());
//Act
Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 0);
Mocker.Resolve<SeasonSearchJob>().Start(notification, new { SeriesId = 1, SeasonNumber = 0 });
//Assert
Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0), Times.Never());
Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, new { EpisodeId = It.IsAny<int>() }), Times.Never());
}
}
}

15
NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
View File

@ -6,6 +6,7 @@ using NzbDrone.Core.Jobs;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.JobTests
@ -30,14 +31,14 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(c => c.IsIgnored(It.IsAny<int>(), It.IsAny<int>())).Returns(false);
Mocker.GetMock<SeasonSearchJob>()
.Setup(c => c.Start(notification, 1, It.IsAny<int>())).Verifiable();
.Setup(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == 1 && d.GetPropertyValue<int>("SeasonNumber") >= 0))).Verifiable();
//Act
Mocker.Resolve<SeriesSearchJob>().Start(notification, 1, 0);
Mocker.Resolve<SeriesSearchJob>().Start(notification, new { SeriesId = 1 });
//Assert
Mocker.VerifyAllMocks();
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, 1, It.IsAny<int>()),
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, It.Is<object>(d => d.GetPropertyValue<int>("SeriesId") == 1 && d.GetPropertyValue<int>("SeasonNumber") >= 0)),
Times.Exactly(seasons.Count));
}
@ -54,11 +55,11 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(c => c.GetSeasons(1)).Returns(seasons);
//Act
Mocker.Resolve<SeriesSearchJob>().Start(notification, 1, 0);
Mocker.Resolve<SeriesSearchJob>().Start(notification, new { SeriesId = 1 });
//Assert
Mocker.VerifyAllMocks();
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, 1, It.IsAny<int>()),
Mocker.GetMock<SeasonSearchJob>().Verify(c => c.Start(notification, new { SeriesId = 1, SeasonNumber = It.IsAny<int>() }),
Times.Never());
}
@ -69,11 +70,11 @@ namespace NzbDrone.Core.Test.JobTests
.Setup(c => c.GetSeasons(It.IsAny<int>()))
.Returns(new List<int> { 0, 1, 2 });
Mocker.Resolve<SeriesSearchJob>().Start(MockNotification, 12, 0);
Mocker.Resolve<SeriesSearchJob>().Start(MockNotification, new { SeriesId = 12 });
Mocker.GetMock<SeasonSearchJob>()
.Verify(c => c.Start(It.IsAny<ProgressNotification>(), It.IsAny<int>(), 0), Times.Never());
.Verify(c => c.Start(It.IsAny<ProgressNotification>(), new { SeriesId = It.IsAny<int>(), SeasonNumber = 0 }), Times.Never());
}
}
}

2
NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View File

@ -74,6 +74,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.1.7.0\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
@ -143,6 +144,7 @@
<Compile Include="JobTests\BacklogSearchJobTest.cs" />
<Compile Include="JobTests\BannerDownloadJobTest.cs" />
<Compile Include="JobTests\RssSyncJobTest.cs" />
<Compile Include="JobTests\PostDownloadScanJobFixture.cs" />
<Compile Include="JobTests\RecentBacklogSearchJobTest.cs" />
<Compile Include="ParserFixture\QualityParserTests.cs" />
<Compile Include="ProviderTests\ConfigProviderTests\ConfigCachingFixture.cs" />

3
NzbDrone.Core.Test/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@ -37,3 +38,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: InternalsVisibleTo("NzbDrone.Core")]

5
NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
View File

@ -436,8 +436,7 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
var stuckQueueItem = new JobQueueItem
{
JobType = fakeJob.GetType(),
TargetId = 12,
SecondaryTargetId = 0
Options = new { TargetId = 12 }
};
//Act
@ -446,7 +445,7 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
jobProvider.Queue.Add(stuckQueueItem);
WaitForQueue();
jobProvider.QueueJob(stuckQueueItem.JobType, stuckQueueItem.TargetId, stuckQueueItem.SecondaryTargetId);
jobProvider.QueueJob(stuckQueueItem.JobType, stuckQueueItem.Options);
WaitForQueue();
//Assert

2
NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
View File

@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
public int ExecutionCount { get; private set; }
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
ExecutionCount++;
Console.WriteLine("Begin " + Name);

2
NzbDrone.Core/Jobs/AppUpdateJob.cs
View File

@ -46,7 +46,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(2); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
notification.CurrentMessage = "Checking for updates";

6
NzbDrone.Core/Jobs/BacklogSearchJob.cs
View File

@ -38,7 +38,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(30); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
var missingEpisodes = GetMissingForEnabledSeries().GroupBy(e => new { e.SeriesId, e.SeasonNumber });
@ -73,7 +73,7 @@ namespace NzbDrone.Core.Jobs
{
//Process as a full season
Logger.Debug("Processing Full Season: {0} Season {1}", seriesId, seasonNumber);
_seasonSearchJob.Start(notification, seriesId, seasonNumber);
_seasonSearchJob.Start(notification, new { SeriesId = seriesId, SeasonNumber = seasonNumber });
}
}
}
@ -82,7 +82,7 @@ namespace NzbDrone.Core.Jobs
//Process the list of remaining episodes, 1 by 1
foreach (var episode in individualEpisodes)
{
_episodeSearchJob.Start(notification, episode.EpisodeId, 0);
_episodeSearchJob.Start(notification, new { EpisodeId = episode.EpisodeId});
}
}

6
NzbDrone.Core/Jobs/BannerDownloadJob.cs
View File

@ -40,13 +40,13 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(30); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
Logger.Debug("Starting banner download job");
if (targetId > 0)
if (options != null)
{
var series = _seriesProvider.GetSeries(targetId);
var series = _seriesProvider.GetSeries(options.SeriesId);
if (series != null && !String.IsNullOrEmpty(series.BannerUrl))
{

2
NzbDrone.Core/Jobs/CleanupRecycleBinJob.cs
View File

@ -28,7 +28,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(24); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
_recycleBinProvider.Cleanup();
}

9
NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
View File

@ -35,12 +35,13 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
if (targetId <= 0)
throw new ArgumentOutOfRangeException("targetId");
var episode = _episodeProvider.GetEpisode(targetId);
if (options == null || options.EpisodeId <= 0)
throw new ArgumentNullException(options);
var episode = _episodeProvider.GetEpisode(options.EpisodeId);
notification.CurrentMessage = String.Format("Starting Conversion for {0}", episode);
var outputFile = _handbrakeProvider.ConvertFile(episode, notification);

4
NzbDrone.Core/Jobs/DeleteSeriesJob.cs
View File

@ -32,9 +32,9 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
DeleteSeries(notification, targetId, Convert.ToBoolean(secondaryTargetId));
DeleteSeries(notification, options.SeriesId, options.DeleteFiless);
}
private void DeleteSeries(ProgressNotification notification, int seriesId, bool deleteFiles)

6
NzbDrone.Core/Jobs/DiskScanJob.cs
View File

@ -38,16 +38,16 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromHours(6); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
IList<Series> seriesToScan;
if (targetId == 0)
if (options == null || options.SeriesId == 0)
{
seriesToScan = _seriesProvider.GetAllSeries().OrderBy(o => SortHelper.SkipArticles(o.Title)).ToList();
}
else
{
seriesToScan = new List<Series>() { _seriesProvider.GetSeries(targetId) };
seriesToScan = new List<Series>() { _seriesProvider.GetSeries(options.SeriesId) };
}
foreach (var series in seriesToScan)

2
NzbDrone.Core/Jobs/EmptyRecycleBinJob.cs
View File

@ -28,7 +28,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
_recycleBinProvider.Empty();
}

8
NzbDrone.Core/Jobs/EpisodeSearchJob.cs
View File

@ -31,12 +31,12 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
if (targetId <= 0)
throw new ArgumentOutOfRangeException("targetId");
if (options == null || options.EpisodeId <= 0)
throw new ArgumentException("options");
_searchProvider.EpisodeSearch(notification, targetId);
_searchProvider.EpisodeSearch(notification, options.EpisodeId);
}
}
}

2
NzbDrone.Core/Jobs/IJob.cs
View File

@ -28,6 +28,6 @@ namespace NzbDrone.Core.Jobs
/// this object should be used to update the progress on the UI</param>
/// <param name="targetId">The that should be used to limit the target of this job</param>
/// /// <param name="secondaryTargetId">The that should be used to limit the target of this job</param>
void Start(ProgressNotification notification, int targetId, int secondaryTargetId);
void Start(ProgressNotification notification, dynamic options);
}
}

8
NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
View File

@ -51,7 +51,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromMinutes(1); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
_attemptedSeries = new List<int>();
ScanSeries(notification);
@ -72,14 +72,14 @@ namespace NzbDrone.Core.Jobs
_attemptedSeries.Add(currentSeries.SeriesId);
notification.CurrentMessage = String.Format("Searching for '{0}'", new DirectoryInfo(currentSeries.Path).Name);
_updateInfoJob.Start(notification, currentSeries.SeriesId, 0);
_diskScanJob.Start(notification, currentSeries.SeriesId, 0);
_updateInfoJob.Start(notification, new { SeriesId = currentSeries.SeriesId });
_diskScanJob.Start(notification, new { SeriesId = currentSeries.SeriesId });
var updatedSeries = _seriesProvider.GetSeries(currentSeries.SeriesId);
AutoIgnoreSeasons(updatedSeries.SeriesId);
//Download the banner for the new series
_bannerDownloadJob.Start(notification, updatedSeries.SeriesId, 0);
_bannerDownloadJob.Start(notification, new { SeriesId = updatedSeries.SeriesId });
notification.CurrentMessage = String.Format("{0} was successfully imported", updatedSeries.Title);
}

9
NzbDrone.Core/Jobs/JobProvider.cs
View File

@ -145,13 +145,12 @@ namespace NzbDrone.Core.Jobs
logger.Trace("{0} Scheduled tasks have been added to the queue", pendingJobTypes.Count);
}
public virtual void QueueJob(Type jobType, int targetId = 0, int secondaryTargetId = 0, JobQueueItem.JobSourceType source = JobQueueItem.JobSourceType.User)
public virtual void QueueJob(Type jobType, dynamic options = null, JobQueueItem.JobSourceType source = JobQueueItem.JobSourceType.User)
{
var queueItem = new JobQueueItem
{
JobType = jobType,
TargetId = targetId,
SecondaryTargetId = secondaryTargetId,
Options = options,
Source = source
};
@ -277,7 +276,7 @@ namespace NzbDrone.Core.Jobs
var sw = Stopwatch.StartNew();
_notificationProvider.Register(_notification);
jobImplementation.Start(_notification, queueItem.TargetId, queueItem.SecondaryTargetId);
jobImplementation.Start(_notification, queueItem.Options);
_notification.Status = ProgressNotificationStatus.Completed;
settings.LastExecution = DateTime.Now;
@ -303,7 +302,7 @@ namespace NzbDrone.Core.Jobs
}
//Only update last execution status if was triggered by the scheduler
if (queueItem.TargetId == 0)
if (queueItem.Options == null)
{
SaveDefinition(settings);
}

4
NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
View File

@ -36,14 +36,14 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
var missingEpisodes = GetMissingForEnabledSeries();
Logger.Debug("Processing missing episodes from the past week, count: {0}", missingEpisodes.Count);
foreach (var episode in missingEpisodes)
{
_episodeSearchJob.Start(notification, episode.EpisodeId, 0);
_episodeSearchJob.Start(notification, new { EpisodeId = episode.EpisodeId });
}
}

10
NzbDrone.Core/Jobs/PostDownloadScanJob.cs
View File

@ -39,9 +39,15 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromMinutes(1); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
var dropFolder = _configProvider.SabDropDirectory;
string dropFolder;
if (options != null && !String.IsNullOrWhiteSpace(options.Path))
dropFolder = options.Path;
else
dropFolder = _configProvider.SabDropDirectory;
if (String.IsNullOrWhiteSpace(dropFolder))
{

4
NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
View File

@ -36,14 +36,14 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(1); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
var missingEpisodes = GetMissingForEnabledSeries();
Logger.Debug("Processing missing episodes from the last 30 days, count: {0}", missingEpisodes.Count);
foreach (var episode in missingEpisodes)
{
_episodeSearchJob.Start(notification, episode.EpisodeId, 0);
_episodeSearchJob.Start(notification, new { EpisodeId = episode.EpisodeId });
}
}

6
NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs
View File

@ -36,15 +36,15 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
List<Series> seriesToRefresh;
if (targetId <= 0)
if (options == null || options.SeriesId <= 0)
seriesToRefresh = _seriesProvider.GetAllSeries().ToList();
else
seriesToRefresh = new List<Series> { _seriesProvider.GetSeries(targetId) };
seriesToRefresh = new List<Series> { _seriesProvider.GetSeries(options.SeriesId) };
foreach(var series in seriesToRefresh)
{

24
NzbDrone.Core/Jobs/RenameSeasonJob.cs
View File

@ -41,24 +41,24 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
if (targetId <= 0)
throw new ArgumentOutOfRangeException("targetId");
if (options == null || options.SeriesId <= 0)
throw new ArgumentException("options");
if (secondaryTargetId <= 0)
throw new ArgumentOutOfRangeException("secondaryTargetId");
if (options.SeasonNumber < 0)
throw new ArgumentException("options.SeasonNumber");
var series = _seriesProvider.GetSeries(targetId);
var series = _seriesProvider.GetSeries(options.SeriesId);
notification.CurrentMessage = String.Format("Renaming episodes for {0} Season {1}", series.Title, secondaryTargetId);
notification.CurrentMessage = String.Format("Renaming episodes for {0} Season {1}", series.Title, options.SeasonNumber);
logger.Debug("Getting episodes from database for series: {0} and season: {1}", targetId, secondaryTargetId);
var episodeFiles = _mediaFileProvider.GetSeasonFiles(targetId, secondaryTargetId);
logger.Debug("Getting episodes from database for series: {0} and season: {1}", options.SeriesId, options.SeasonNumber);
var episodeFiles = _mediaFileProvider.GetSeasonFiles(options.SeriesId, options.SeasonNumber);
if (episodeFiles == null || !episodeFiles.Any())
{
logger.Warn("No episodes in database found for series: {0} and season: {1}.", targetId, secondaryTargetId);
logger.Warn("No episodes in database found for series: {0} and season: {1}.", options.SeriesId, options.SeasonNumber);
return;
}
@ -91,10 +91,10 @@ namespace NzbDrone.Core.Jobs
//Start AfterRename
var message = String.Format("Renamed: Series {0}, Season: {1}", series.Title, secondaryTargetId);
var message = String.Format("Renamed: Series {0}, Season: {1}", series.Title, options.SeasonNumber);
_externalNotificationProvider.AfterRename(message, series);
notification.CurrentMessage = String.Format("Rename completed for {0} Season {1}", series.Title, secondaryTargetId);
notification.CurrentMessage = String.Format("Rename completed for {0} Season {1}", series.Title, options.SeasonNumber);
}
}
}

6
NzbDrone.Core/Jobs/RenameSeriesJob.cs
View File

@ -41,18 +41,18 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
List<Series> seriesToRename;
if (targetId <= 0)
if (options == null || options.SeriesId <= 0)
{
seriesToRename = _seriesProvider.GetAllSeries().ToList();
}
else
{
seriesToRename = new List<Series>{ _seriesProvider.GetSeries(targetId) };
seriesToRename = new List<Series>{ _seriesProvider.GetSeries(options.SeriesId) };
}
foreach(var series in seriesToRename)

2
NzbDrone.Core/Jobs/RssSyncJob.cs
View File

@ -49,7 +49,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromMinutes(_configProvider.RssSyncInterval); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
var reports = new List<EpisodeParseResult>();

2
NzbDrone.Core/Jobs/SearchHistoryCleanupJob.cs
View File

@ -36,7 +36,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromHours(24); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
Logger.Info("Running search history cleanup.");
_searchHistoryProvider.Cleanup();

22
NzbDrone.Core/Jobs/SeasonSearchJob.cs
View File

@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using NLog;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs
{
@ -37,27 +39,27 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
if (targetId <= 0)
throw new ArgumentOutOfRangeException("targetId");
if (options == null || options.SeriesId <= 0)
throw new ArgumentException("options");
if (secondaryTargetId < 0)
throw new ArgumentOutOfRangeException("secondaryTargetId");
if (options.SeasonNumber < 0)
throw new ArgumentException("options.SeasonNumber");
//Perform a Partial Season Search - Because a full season search is a waste
//3 searches should guarentee results, (24 eps) versus, a potential 4 to get the same eps.
var successes = _searchProvider.PartialSeasonSearch(notification, targetId, secondaryTargetId);
List<int> successes = _searchProvider.PartialSeasonSearch(notification, options.SeriesId, options.SeasonNumber);
if (successes.Count == 0)
return;
Logger.Debug("Getting episodes from database for series: {0} and season: {1}", targetId, secondaryTargetId);
var episodes = _episodeProvider.GetEpisodesBySeason(targetId, secondaryTargetId);
Logger.Debug("Getting episodes from database for series: {0} and season: {1}", options.SeriesId, options.SeasonNumber);
List<Episode> episodes = _episodeProvider.GetEpisodesBySeason(options.SeriesId, options.SeasonNumber);
if (episodes == null || episodes.Count == 0)
{
Logger.Warn("No episodes in database found for series: {0} and season: {1}.", targetId, secondaryTargetId);
Logger.Warn("No episodes in database found for series: {0} and season: {1}.", options.SeriesId, options.SeasonNumber);
return;
}
@ -68,7 +70,7 @@ namespace NzbDrone.Core.Jobs
foreach (var episode in episodes.Where(e => !e.Ignored && missingEpisodes.Contains(e.EpisodeNumber)).OrderBy(o => o.EpisodeNumber))
{
_episodeSearchJob.Start(notification, episode.EpisodeId, 0);
_episodeSearchJob.Start(notification, new { EpisodeId = episode.EpisodeId });
}
}
}

18
NzbDrone.Core/Jobs/SeriesSearchJob.cs
View File

@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using NLog;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Repository;
namespace NzbDrone.Core.Jobs
{
@ -30,19 +32,19 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromTicks(0); }
}
public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public void Start(ProgressNotification notification, dynamic options)
{
if (targetId <= 0)
throw new ArgumentOutOfRangeException("targetId");
if (options == null || options.SeriesId <= 0)
throw new ArgumentException("options.SeriesId");
logger.Debug("Getting seasons from database for series: {0}", targetId);
var seasons = _seasonProvider.GetSeasons(targetId).Where(s => s > 0);
logger.Debug("Getting seasons from database for series: {0}", options.SeriesId);
IList<int> seasons = _seasonProvider.GetSeasons(options.SeriesId);
foreach (var season in seasons)
foreach (var season in seasons.Where(s => s > 0))
{
if (!_seasonProvider.IsIgnored(targetId, season))
if (!_seasonProvider.IsIgnored(options.SeriesId, season))
{
_seasonSearchJob.Start(notification, targetId, season);
_seasonSearchJob.Start(notification, new { SeriesId = options.SeriesId, SeasonNumber = season });
}
}
}

2
NzbDrone.Core/Jobs/TrimLogsJob.cs
View File

@ -24,7 +24,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromDays(1); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
_logProvider.Trim();
}

6
NzbDrone.Core/Jobs/UpdateInfoJob.cs
View File

@ -41,16 +41,16 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromHours(12); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
IList<Series> seriesToUpdate;
if (targetId == 0)
if (options == null || options.SeriesId == 0)
{
seriesToUpdate = _seriesProvider.GetAllSeries().OrderBy(o => SortHelper.SkipArticles(o.Title)).ToList();
}
else
{
seriesToUpdate = new List<Series> { _seriesProvider.GetSeries(targetId) };
seriesToUpdate = new List<Series> { _seriesProvider.GetSeries(options.SeriesId) };
}
//Update any Daily Series in the DB with the IsDaily flag

2
NzbDrone.Core/Jobs/UpdateSceneMappingsJob.cs
View File

@ -29,7 +29,7 @@ namespace NzbDrone.Core.Jobs
get { return TimeSpan.FromHours(12); }
}
public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
public virtual void Start(ProgressNotification notification, dynamic options)
{
_sceneNameMappingProvider.UpdateMappings();
}

8
NzbDrone.Core/Model/JobQueueItem.cs
View File

@ -5,20 +5,18 @@ namespace NzbDrone.Core.Model
public class JobQueueItem : IEquatable<JobQueueItem>
{
public Type JobType { get; set; }
public int TargetId { get; set; }
public int SecondaryTargetId { get; set; }
public dynamic Options { get; set; }
public JobSourceType Source { get; set; }
public bool Equals(JobQueueItem other)
{
return (JobType == other.JobType && TargetId == other.TargetId
&& SecondaryTargetId == other.SecondaryTargetId);
return (JobType == other.JobType && Options == other.Options);
}
public override string ToString()
{
return string.Format("[{0}({1}, {2})]", JobType.Name, TargetId, SecondaryTargetId);
return string.Format("[{0}({1})]", JobType.Name, Options);
}
public enum JobSourceType

1
NzbDrone.Core/Properties/AssemblyInfo.cs
View File

@ -12,6 +12,7 @@ using System.Runtime.InteropServices;
[assembly: Guid("3C29FEF7-4B07-49ED-822E-1C29DC49BFAB")]
[assembly: InternalsVisibleTo("NzbDrone.Core.Test")]
[assembly: InternalsVisibleTo("NzbDrone.Web")]
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

1
NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
View File

@ -89,6 +89,7 @@
<Compile Include="ExceptionVerification.cs" />
<Compile Include="LoggingTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReflectionExtensions.cs" />
<Compile Include="TestBase.cs" />
</ItemGroup>
<ItemGroup>

15
NzbDrone.Test.Common/ReflectionExtensions.cs Normal file
View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace NzbDrone.Test.Common
{
public static class ReflectionExtensions
{
public static T GetPropertyValue<T>(this object obj, string propertyName)
{
return (T)obj.GetType().GetProperty(propertyName).GetValue(obj, null);
}
}
}

4
NzbDrone.Web/Controllers/EpisodeController.cs
View File

@ -26,7 +26,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult SearchSeason(int seriesId, int seasonNumber)
{
_jobProvider.QueueJob(typeof(SeasonSearchJob), seriesId, seasonNumber);
_jobProvider.QueueJob(typeof(SeasonSearchJob), new { SeriesId = seriesId, SeasonNumber = seasonNumber });
return JsonNotificationResult.Queued("Season search");
}
@ -40,7 +40,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult RenameSeason(int seriesId, int seasonNumber)
{
_jobProvider.QueueJob(typeof(RenameSeasonJob), seriesId, seasonNumber);
_jobProvider.QueueJob(typeof(RenameSeasonJob), new { SeriesId = seriesId, SeasonNumber = seasonNumber });
return JsonNotificationResult.Queued("Season rename");
}

4
NzbDrone.Web/Controllers/SeriesController.cs
View File

@ -91,9 +91,9 @@ namespace NzbDrone.Web.Controllers
}
[HttpPost]
public EmptyResult DeleteSeries(int seriesId, bool deleteFiles)
public EmptyResult Delete(int seriesId, bool deleteFiles)
{
_jobProvider.QueueJob(typeof(DeleteSeriesJob), seriesId, Convert.ToInt32(deleteFiles));
_jobProvider.QueueJob(typeof(DeleteSeriesJob), new { SeriesId = seriesId, DeleteFiles = deleteFiles });
return new EmptyResult();
}

3
NzbDrone.Web/Controllers/SystemController.cs
View File

@ -41,8 +41,7 @@ namespace NzbDrone.Web.Controllers
var queue = _jobProvider.Queue.Select(c => new JobQueueItemModel
{
Name = c.JobType.Name,
TargetId = c.TargetId,
SecondaryTargetId = c.SecondaryTargetId
Options = c.Options
});
var serializedQueue = new JavaScriptSerializer().Serialize(queue);

3
NzbDrone.Web/Models/JobQueueItemModel.cs
View File

@ -7,7 +7,6 @@ namespace NzbDrone.Web.Models
public class JobQueueItemModel
{
public string Name { get; set; }
public int TargetId { get; set; }
public int SecondaryTargetId { get; set; }
public dynamic Options { get; set; }
}
}

3
NzbDrone.Web/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("NzbDrone.Web")]
@ -11,3 +12,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyFileVersion("1.0.0.*")]
[assembly: InternalsVisibleTo("NzbDrone.Core")]

2
NzbDrone.Web/Scripts/NzbDrone/series.js
View File

@ -1,6 +1,6 @@
var seriesEditorUrl = '../Series/Edit';
var saveSeriesEditorUrl = '../Series/Edit';
var seriesDeleteUrl = '../Series/DeleteSeries';
var seriesDeleteUrl = '../Series/Delete';
$("#seriesEditor").dialog({
autoOpen: false,

6
NzbDrone.Web/Views/System/Jobs.cshtml
View File

@ -30,8 +30,7 @@
<thead>
<tr>
<th>Type</th>
<th>Target</th>
<th>Secondary</th>
<th>Options</th>
</tr>
</thead>
<tbody>
@ -91,8 +90,7 @@
"sPaginationType": "four_button",
"aoColumns": [
{ sWidth: 'auto', "mDataProp": "Type"}, //Type
{ sWidth: '100px', "mDataProp": "Target" }, //Target
{ sWidth: '100px', "mDataProp": "SecondaryTarget" }, //SecondaryTarget
{ sWidth: '100px', "mDataProp": "Options" } //Options
]
});
});