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

Merge branch 'master' of git://github.com/kayone/NzbDrone

This commit is contained in:
Mark McDowall 2011-06-16 00:01:48 -07:00
parent 9837e54ca5 33a38481dc
commit a151c9cd0f
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NzbDrone.Core.Test/EpisodeProviderTest.cs
View File

@ -280,9 +280,9 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void IsSeasonIgnored_should_return_true_if_all_episodes_ignored() public void IsSeasonIgnored_should_return_true_if_all_episodes_ignored()
{ {
var repo = MockLib.GetEmptyRepository(); var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer(MockBehavior.Strict); var mocker = new AutoMoqer(MockBehavior.Strict);
mocker.SetConstant(repo); mocker.SetConstant(db);
var episodes = Builder<Episode>.CreateListOfSize(4) var episodes = Builder<Episode>.CreateListOfSize(4)
.WhereAll() .WhereAll()
@ -291,7 +291,7 @@ namespace NzbDrone.Core.Test
.Have(c => c.SeasonNumber = 2) .Have(c => c.SeasonNumber = 2)
.Build(); .Build();
repo.AddMany(episodes); episodes.ToList().ForEach(c => db.Insert(c));
//Act //Act
var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2); var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2);
@ -303,9 +303,9 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void IsSeasonIgnored_should_return_false_if_none_of_episodes_are_ignored() public void IsSeasonIgnored_should_return_false_if_none_of_episodes_are_ignored()
{ {
var repo = MockLib.GetEmptyRepository(); var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer(MockBehavior.Strict); var mocker = new AutoMoqer(MockBehavior.Strict);
mocker.SetConstant(repo); mocker.SetConstant(db);
var episodes = Builder<Episode>.CreateListOfSize(4) var episodes = Builder<Episode>.CreateListOfSize(4)
.WhereAll() .WhereAll()
@ -314,7 +314,7 @@ namespace NzbDrone.Core.Test
.Have(c => c.SeasonNumber = 2) .Have(c => c.SeasonNumber = 2)
.Build(); .Build();
repo.AddMany(episodes); episodes.ToList().ForEach(c => db.Insert(c));
//Act //Act
var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2); var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2);
@ -326,9 +326,9 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void IsSeasonIgnored_should_return_false_if_some_of_episodes_are_ignored() public void IsSeasonIgnored_should_return_false_if_some_of_episodes_are_ignored()
{ {
var repo = MockLib.GetEmptyRepository(); var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer(MockBehavior.Strict); var mocker = new AutoMoqer(MockBehavior.Strict);
mocker.SetConstant(repo); mocker.SetConstant(db);
var episodes = Builder<Episode>.CreateListOfSize(4) var episodes = Builder<Episode>.CreateListOfSize(4)
.WhereAll() .WhereAll()
@ -340,7 +340,7 @@ namespace NzbDrone.Core.Test
episodes[2].Ignored = false; episodes[2].Ignored = false;
repo.AddMany(episodes); episodes.ToList().ForEach(c => db.Insert(c));
//Act //Act
var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2); var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2);
@ -352,9 +352,9 @@ namespace NzbDrone.Core.Test
[Test] [Test]
public void IsSeasonIgnored_should_return_true_if_invalid_series() public void IsSeasonIgnored_should_return_true_if_invalid_series()
{ {
var repo = MockLib.GetEmptyRepository(); var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer(MockBehavior.Strict); var mocker = new AutoMoqer(MockBehavior.Strict);
mocker.SetConstant(repo); mocker.SetConstant(db);
//Act //Act
var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2); var result = mocker.Resolve<EpisodeProvider>().IsIgnored(10, 2);

14
NzbDrone.Core/Providers/EpisodeProvider.cs
View File

@ -162,15 +162,12 @@ namespace NzbDrone.Core.Providers
{ {
newList.ForEach(episode => _database.Insert(episode)); newList.ForEach(episode => _database.Insert(episode));
updateList.ForEach(episode => _database.Update(episode)); updateList.ForEach(episode => _database.Update(episode));
#if DEBUG
//Shouldn't run if Database is a mock since transaction will be null //Shouldn't run if Database is a mock since transaction will be null
if (_database.GetType().Namespace != "Castle.Proxies" && tran != null) if (_database.GetType().Namespace != "Castle.Proxies" && tran != null)
{ {
tran.Complete(); tran.Complete();
} }
#else
tran.Complete();
#endif
} }
@ -189,9 +186,9 @@ namespace NzbDrone.Core.Providers
{ {
var unIgnoredCount = _database.ExecuteScalar<int>( var unIgnoredCount = _database.ExecuteScalar<int>(
"SELECT COUNT (*) FROM Episodes WHERE SeriesId=@0 AND SeasonNumber=@1 AND Ignored=False"); "SELECT COUNT (*) FROM Episodes WHERE SeriesId=@0 AND SeasonNumber=@1 AND Ignored='0'", seriesId, seasonNumber);
return unIgnoredCount != 0; return unIgnoredCount == 0;
} }
public virtual IList<int> GetSeasons(int seriesId) public virtual IList<int> GetSeasons(int seriesId)
@ -212,15 +209,12 @@ namespace NzbDrone.Core.Providers
_database.Update(episode); _database.Update(episode);
} }
#if DEBUG
//Shouldn't run if Database is a mock since transaction will be null //Shouldn't run if Database is a mock since transaction will be null
if (_database.GetType().Namespace != "Castle.Proxies" && tran != null) if (_database.GetType().Namespace != "Castle.Proxies" && tran != null)
{ {
tran.Complete(); tran.Complete();
} }
#else
tran.Complete();
#endif
Logger.Info("Ignore flag for Series:{0} Season:{1} successfully set to {2}", seriesId, seasonNumber, isIgnored); Logger.Info("Ignore flag for Series:{0} Season:{1} successfully set to {2}", seriesId, seasonNumber, isIgnored);
} }