mirror of
https://github.com/Radarr/Radarr.git
synced 2024-11-10 13:02:47 +01:00
Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus
This commit is contained in:
commit
f9dab843ae
@ -51,7 +51,7 @@ public void Delete_None_Valid_TvDbEpisodeId()
|
|||||||
db.Insert(fakeEpisode);
|
db.Insert(fakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
mocker.Resolve<EpisodeProvider>().DeleteInvalidEpisodes(fakeSeries, tvDbSeries);
|
mocker.Resolve<EpisodeProvider>().DeleteEpisodesNotInTvdb(fakeSeries, tvDbSeries);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
var result = db.Fetch<Episode>();
|
var result = db.Fetch<Episode>();
|
||||||
@ -91,7 +91,7 @@ public void Delete_None_TvDbEpisodeId_is_zero()
|
|||||||
db.Insert(fakeEpisode);
|
db.Insert(fakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
mocker.Resolve<EpisodeProvider>().DeleteInvalidEpisodes(fakeSeries, tvDbSeries);
|
mocker.Resolve<EpisodeProvider>().DeleteEpisodesNotInTvdb(fakeSeries, tvDbSeries);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
var result = db.Fetch<Episode>();
|
var result = db.Fetch<Episode>();
|
||||||
@ -131,7 +131,7 @@ public void Delete_None_TvDbEpisodeId_is_null()
|
|||||||
db.Insert(fakeEpisode);
|
db.Insert(fakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
mocker.Resolve<EpisodeProvider>().DeleteInvalidEpisodes(fakeSeries, tvDbSeries);
|
mocker.Resolve<EpisodeProvider>().DeleteEpisodesNotInTvdb(fakeSeries, tvDbSeries);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
var result = db.Fetch<Episode>();
|
var result = db.Fetch<Episode>();
|
||||||
@ -173,7 +173,7 @@ public void Delete_TvDbId()
|
|||||||
db.Insert(fakeEpisode);
|
db.Insert(fakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
mocker.Resolve<EpisodeProvider>().DeleteInvalidEpisodes(fakeSeries, tvDbSeries);
|
mocker.Resolve<EpisodeProvider>().DeleteEpisodesNotInTvdb(fakeSeries, tvDbSeries);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
var result = db.Fetch<Episode>();
|
var result = db.Fetch<Episode>();
|
||||||
@ -230,7 +230,7 @@ public void Delete_TvDbId_multiple_series()
|
|||||||
db.Insert(otherFakeEpisode);
|
db.Insert(otherFakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
mocker.Resolve<EpisodeProvider>().DeleteInvalidEpisodes(fakeSeries, tvDbSeries);
|
mocker.Resolve<EpisodeProvider>().DeleteEpisodesNotInTvdb(fakeSeries, tvDbSeries);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
var result = db.Fetch<Episode>();
|
var result = db.Fetch<Episode>();
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
using FizzWare.NBuilder;
|
using FizzWare.NBuilder;
|
||||||
using FluentAssertions;
|
using FluentAssertions;
|
||||||
using Moq;
|
using Moq;
|
||||||
@ -21,13 +20,10 @@ namespace NzbDrone.Core.Test.ProviderTests
|
|||||||
// ReSharper disable InconsistentNaming
|
// ReSharper disable InconsistentNaming
|
||||||
public class EpisodeProviderTest_GetEpisodesByParseResult : CoreTest
|
public class EpisodeProviderTest_GetEpisodesByParseResult : CoreTest
|
||||||
{
|
{
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Single_GetSeason_Episode_Exists()
|
public void Single_GetSeason_Episode_Exists()
|
||||||
{
|
{
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
WithRealDb();
|
||||||
var mocker = new AutoMoqer();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeEpisode = Builder<Episode>.CreateNew()
|
var fakeEpisode = Builder<Episode>.CreateNew()
|
||||||
.With(e => e.SeriesId = 1)
|
.With(e => e.SeriesId = 1)
|
||||||
@ -37,8 +33,8 @@ public void Single_GetSeason_Episode_Exists()
|
|||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
db.Insert(fakeEpisode);
|
Db.Insert(fakeEpisode);
|
||||||
db.Insert(fakeSeries);
|
Db.Insert(fakeSeries);
|
||||||
|
|
||||||
var parseResult = new EpisodeParseResult
|
var parseResult = new EpisodeParseResult
|
||||||
{
|
{
|
||||||
@ -47,7 +43,7 @@ public void Single_GetSeason_Episode_Exists()
|
|||||||
EpisodeNumbers = new List<int> { 10 }
|
EpisodeNumbers = new List<int> { 10 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
||||||
|
|
||||||
ep.Should().HaveCount(1);
|
ep.Should().HaveCount(1);
|
||||||
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
|
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
|
||||||
@ -57,9 +53,7 @@ public void Single_GetSeason_Episode_Exists()
|
|||||||
[Test]
|
[Test]
|
||||||
public void Single_GetSeason_Episode_Doesnt_exists_should_not_add()
|
public void Single_GetSeason_Episode_Doesnt_exists_should_not_add()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -71,18 +65,16 @@ public void Single_GetSeason_Episode_Doesnt_exists_should_not_add()
|
|||||||
EpisodeNumbers = new List<int> { 10 }
|
EpisodeNumbers = new List<int> { 10 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
||||||
|
|
||||||
ep.Should().BeEmpty();
|
ep.Should().BeEmpty();
|
||||||
db.Fetch<Episode>().Should().HaveCount(0);
|
Db.Fetch<Episode>().Should().HaveCount(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Single_GetSeason_Episode_Doesnt_exists_should_add()
|
public void Single_GetSeason_Episode_Doesnt_exists_should_add()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -94,18 +86,16 @@ public void Single_GetSeason_Episode_Doesnt_exists_should_add()
|
|||||||
EpisodeNumbers = new List<int> { 10 }
|
EpisodeNumbers = new List<int> { 10 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
||||||
|
|
||||||
ep.Should().HaveCount(1);
|
ep.Should().HaveCount(1);
|
||||||
db.Fetch<Episode>().Should().HaveCount(1);
|
Db.Fetch<Episode>().Should().HaveCount(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Multi_GetSeason_Episode_Exists()
|
public void Multi_GetSeason_Episode_Exists()
|
||||||
{
|
{
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
WithRealDb();
|
||||||
var mocker = new AutoMoqer();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeEpisode = Builder<Episode>.CreateNew()
|
var fakeEpisode = Builder<Episode>.CreateNew()
|
||||||
.With(e => e.SeriesId = 1)
|
.With(e => e.SeriesId = 1)
|
||||||
@ -121,9 +111,9 @@ public void Multi_GetSeason_Episode_Exists()
|
|||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
db.Insert(fakeEpisode);
|
Db.Insert(fakeEpisode);
|
||||||
db.Insert(fakeEpisode2);
|
Db.Insert(fakeEpisode2);
|
||||||
db.Insert(fakeSeries);
|
Db.Insert(fakeSeries);
|
||||||
|
|
||||||
var parseResult = new EpisodeParseResult
|
var parseResult = new EpisodeParseResult
|
||||||
{
|
{
|
||||||
@ -132,10 +122,10 @@ public void Multi_GetSeason_Episode_Exists()
|
|||||||
EpisodeNumbers = new List<int> { 10, 11 }
|
EpisodeNumbers = new List<int> { 10, 11 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
||||||
|
|
||||||
ep.Should().HaveCount(2);
|
ep.Should().HaveCount(2);
|
||||||
db.Fetch<Episode>().Should().HaveCount(2);
|
Db.Fetch<Episode>().Should().HaveCount(2);
|
||||||
ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
|
ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
|
||||||
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
|
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
|
||||||
}
|
}
|
||||||
@ -143,9 +133,7 @@ public void Multi_GetSeason_Episode_Exists()
|
|||||||
[Test]
|
[Test]
|
||||||
public void Multi_GetSeason_Episode_Doesnt_exists_should_not_add()
|
public void Multi_GetSeason_Episode_Doesnt_exists_should_not_add()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -157,18 +145,16 @@ public void Multi_GetSeason_Episode_Doesnt_exists_should_not_add()
|
|||||||
EpisodeNumbers = new List<int> { 10, 11 }
|
EpisodeNumbers = new List<int> { 10, 11 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
|
||||||
|
|
||||||
ep.Should().BeEmpty();
|
ep.Should().BeEmpty();
|
||||||
db.Fetch<Episode>().Should().HaveCount(0);
|
Db.Fetch<Episode>().Should().HaveCount(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Multi_GetSeason_Episode_Doesnt_exists_should_add()
|
public void Multi_GetSeason_Episode_Doesnt_exists_should_add()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -180,18 +166,16 @@ public void Multi_GetSeason_Episode_Doesnt_exists_should_add()
|
|||||||
EpisodeNumbers = new List<int> { 10, 11 }
|
EpisodeNumbers = new List<int> { 10, 11 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
||||||
|
|
||||||
ep.Should().HaveCount(2);
|
ep.Should().HaveCount(2);
|
||||||
db.Fetch<Episode>().Should().HaveCount(2);
|
Db.Fetch<Episode>().Should().HaveCount(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Get_Episode_Zero_Doesnt_Exist_Should_add_ignored()
|
public void Get_Episode_Zero_Doesnt_Exist_Should_add_ignored()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -203,19 +187,17 @@ public void Get_Episode_Zero_Doesnt_Exist_Should_add_ignored()
|
|||||||
EpisodeNumbers = new List<int> { 0 }
|
EpisodeNumbers = new List<int> { 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
||||||
|
|
||||||
ep.Should().HaveCount(1);
|
ep.Should().HaveCount(1);
|
||||||
db.Fetch<Episode>().Should().HaveCount(1);
|
Db.Fetch<Episode>().Should().HaveCount(1);
|
||||||
ep.First().Ignored.Should().BeTrue();
|
ep.First().Ignored.Should().BeTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Get_Multi_Episode_Zero_Doesnt_Exist_Should_not_add_ignored()
|
public void Get_Multi_Episode_Zero_Doesnt_Exist_Should_not_add_ignored()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
WithRealDb();
|
||||||
var db = TestDbHelper.GetEmptyDatabase();
|
|
||||||
mocker.SetConstant(db);
|
|
||||||
|
|
||||||
var fakeSeries = Builder<Series>.CreateNew().Build();
|
var fakeSeries = Builder<Series>.CreateNew().Build();
|
||||||
|
|
||||||
@ -227,10 +209,10 @@ public void Get_Multi_Episode_Zero_Doesnt_Exist_Should_not_add_ignored()
|
|||||||
EpisodeNumbers = new List<int> { 0, 1 }
|
EpisodeNumbers = new List<int> { 0, 1 }
|
||||||
};
|
};
|
||||||
|
|
||||||
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
var ep = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult, true);
|
||||||
|
|
||||||
ep.Should().HaveCount(2);
|
ep.Should().HaveCount(2);
|
||||||
db.Fetch<Episode>().Should().HaveCount(2);
|
Db.Fetch<Episode>().Should().HaveCount(2);
|
||||||
ep.First().Ignored.Should().BeFalse();
|
ep.First().Ignored.Should().BeFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -238,9 +220,8 @@ public void Get_Multi_Episode_Zero_Doesnt_Exist_Should_not_add_ignored()
|
|||||||
[Description("GetEpisodeParseResult should return empty list if episode list is null")]
|
[Description("GetEpisodeParseResult should return empty list if episode list is null")]
|
||||||
public void GetEpisodeParseResult_should_return_empty_list_if_episode_list_is_null()
|
public void GetEpisodeParseResult_should_return_empty_list_if_episode_list_is_null()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
|
||||||
//Act
|
//Act
|
||||||
var episodes = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(new EpisodeParseResult());
|
var episodes = Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(new EpisodeParseResult());
|
||||||
//Assert
|
//Assert
|
||||||
episodes.Should().NotBeNull();
|
episodes.Should().NotBeNull();
|
||||||
episodes.Should().BeEmpty();
|
episodes.Should().BeEmpty();
|
||||||
@ -250,9 +231,9 @@ public void GetEpisodeParseResult_should_return_empty_list_if_episode_list_is_nu
|
|||||||
[Description("GetEpisodeParseResult should return empty list if episode list is empty")]
|
[Description("GetEpisodeParseResult should return empty list if episode list is empty")]
|
||||||
public void GetEpisodeParseResult_should_return_empty_list_if_episode_list_is_empty()
|
public void GetEpisodeParseResult_should_return_empty_list_if_episode_list_is_empty()
|
||||||
{
|
{
|
||||||
var mocker = new AutoMoqer();
|
|
||||||
//Act
|
//Act
|
||||||
var episodes = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(new EpisodeParseResult{EpisodeNumbers = new List<int>()});
|
var episodes =
|
||||||
|
Mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(new EpisodeParseResult { EpisodeNumbers = new List<int>() });
|
||||||
//Assert
|
//Assert
|
||||||
episodes.Should().NotBeNull();
|
episodes.Should().NotBeNull();
|
||||||
episodes.Should().BeEmpty();
|
episodes.Should().BeEmpty();
|
||||||
@ -272,18 +253,22 @@ public void GetEpisodeParseResult_should_return_single_episode_when_air_date_is_
|
|||||||
.With(s => s.SeriesId = 1)
|
.With(s => s.SeriesId = 1)
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
Mocker.GetMock<IDatabase>().Setup(s => s.Fetch<Episode, Series, EpisodeFile>(It.IsAny<String>(), It.IsAny<Object[]>()))
|
Mocker.GetMock<IDatabase>().Setup(
|
||||||
|
s =>
|
||||||
|
s.Fetch<Episode, Series, EpisodeFile>(It.IsAny<String>(),
|
||||||
|
It.IsAny<Object[]>()))
|
||||||
.Returns(fakeEpisode);
|
.Returns(fakeEpisode);
|
||||||
|
|
||||||
//Act
|
//Act
|
||||||
var episodes = Mocker.Resolve<EpisodeProvider>()
|
var episodes = Mocker.Resolve<EpisodeProvider>()
|
||||||
.GetEpisodesByParseResult(new EpisodeParseResult { AirDate = DateTime.Today, Series = fakeSeries }, true);
|
.GetEpisodesByParseResult(new EpisodeParseResult { AirDate = DateTime.Today, Series = fakeSeries },
|
||||||
|
true);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
episodes.Should().HaveCount(1);
|
episodes.Should().HaveCount(1);
|
||||||
episodes.First().AirDate.Should().Be(DateTime.Today);
|
episodes.First().AirDate.Should().Be(DateTime.Today);
|
||||||
|
|
||||||
Mocker.GetMock<IDatabase>().Verify(v=> v.Insert(It.IsAny<Episode>()), Times.Never());
|
Mocker.GetMock<IDatabase>().Verify(v => v.Insert(It.IsAny<Episode>()), Times.Never());
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -298,7 +283,8 @@ public void GetEpisodeParseResult_get_daily_should_add_new_episode()
|
|||||||
|
|
||||||
//Act
|
//Act
|
||||||
var episodes = Mocker.Resolve<EpisodeProvider>()
|
var episodes = Mocker.Resolve<EpisodeProvider>()
|
||||||
.GetEpisodesByParseResult(new EpisodeParseResult { AirDate = DateTime.Today, Series = fakeSeries }, true);
|
.GetEpisodesByParseResult(new EpisodeParseResult { AirDate = DateTime.Today, Series = fakeSeries },
|
||||||
|
true);
|
||||||
|
|
||||||
//Assert
|
//Assert
|
||||||
episodes.Should().HaveCount(1);
|
episodes.Should().HaveCount(1);
|
||||||
@ -308,5 +294,24 @@ public void GetEpisodeParseResult_get_daily_should_add_new_episode()
|
|||||||
|
|
||||||
episodesInDb.Should().HaveCount(1);
|
episodesInDb.Should().HaveCount(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void GetEpisodeParseResult_get_daily_should_not_add_new_episode_when_auto_add_is_false()
|
||||||
|
{
|
||||||
|
//Setup
|
||||||
|
WithRealDb();
|
||||||
|
|
||||||
|
var fakeSeries = Builder<Series>.CreateNew()
|
||||||
|
.With(s => s.SeriesId = 1)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
//Act
|
||||||
|
var episodes = Mocker.Resolve<EpisodeProvider>()
|
||||||
|
.GetEpisodesByParseResult(new EpisodeParseResult { AirDate = DateTime.Today, Series = fakeSeries }, false);
|
||||||
|
|
||||||
|
//Assert
|
||||||
|
episodes.Should().BeEmpty();
|
||||||
|
Db.Fetch<Episode>().Should().BeEmpty();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -129,7 +129,6 @@ public virtual IList<Episode> GetEpisodesByParseResult(EpisodeParseResult parseR
|
|||||||
{
|
{
|
||||||
var episodeInfo = GetEpisode(parseResult.Series.SeriesId, parseResult.AirDate.Value);
|
var episodeInfo = GetEpisode(parseResult.Series.SeriesId, parseResult.AirDate.Value);
|
||||||
|
|
||||||
//if still null we should add the temp episode
|
|
||||||
if (episodeInfo == null && autoAddNew)
|
if (episodeInfo == null && autoAddNew)
|
||||||
{
|
{
|
||||||
Logger.Debug("Episode {0} doesn't exist in db. adding it now.", parseResult);
|
Logger.Debug("Episode {0} doesn't exist in db. adding it now.", parseResult);
|
||||||
@ -159,10 +158,11 @@ public virtual IList<Episode> GetEpisodesByParseResult(EpisodeParseResult parseR
|
|||||||
|
|
||||||
AddEpisode(episodeInfo);
|
AddEpisode(episodeInfo);
|
||||||
}
|
}
|
||||||
|
if (episodeInfo != null)
|
||||||
//Add to Result and Return (There will only be one episode to return)
|
{
|
||||||
//TODO: This should not add if episode is still null (When doesn't exist and autoadd is false.)
|
|
||||||
result.Add(episodeInfo);
|
result.Add(episodeInfo);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -254,13 +254,6 @@ public virtual void RefreshEpisodeInfo(Series series)
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//DateTime throws an error in SQLServer per message below:
|
|
||||||
//SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
|
|
||||||
//So lets hack it so it works for SQLServer (as well as SQLite), perhaps we can find a better solution
|
|
||||||
//Todo: Fix this hack
|
|
||||||
if (episode.FirstAired < new DateTime(1753, 1, 1))
|
|
||||||
episode.FirstAired = new DateTime(1753, 1, 1);
|
|
||||||
|
|
||||||
Logger.Trace("Updating info for [{0}] - S{1}E{2}", tvDbSeriesInfo.SeriesName, episode.SeasonNumber, episode.EpisodeNumber);
|
Logger.Trace("Updating info for [{0}] - S{1}E{2}", tvDbSeriesInfo.SeriesName, episode.SeasonNumber, episode.EpisodeNumber);
|
||||||
|
|
||||||
//first check using tvdbId, this should cover cases when and episode number in a season is changed
|
//first check using tvdbId, this should cover cases when and episode number in a season is changed
|
||||||
@ -280,13 +273,15 @@ public virtual void RefreshEpisodeInfo(Series series)
|
|||||||
|
|
||||||
//If it is Episode Zero Ignore it, since it is new
|
//If it is Episode Zero Ignore it, since it is new
|
||||||
if (episode.EpisodeNumber == 0)
|
if (episode.EpisodeNumber == 0)
|
||||||
|
{
|
||||||
episodeToUpdate.Ignored = true;
|
episodeToUpdate.Ignored = true;
|
||||||
|
}
|
||||||
//Else we need to check if this episode should be ignored based on IsIgnored rules
|
//Else we need to check if this episode should be ignored based on IsIgnored rules
|
||||||
else
|
else
|
||||||
|
{
|
||||||
episodeToUpdate.Ignored = IsIgnored(series.SeriesId, episode.SeasonNumber);
|
episodeToUpdate.Ignored = IsIgnored(series.SeriesId, episode.SeasonNumber);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
updateList.Add(episodeToUpdate);
|
updateList.Add(episodeToUpdate);
|
||||||
@ -301,7 +296,6 @@ public virtual void RefreshEpisodeInfo(Series series)
|
|||||||
|
|
||||||
if (episode.FirstAired.Year > 1900)
|
if (episode.FirstAired.Year > 1900)
|
||||||
episodeToUpdate.AirDate = episode.FirstAired.Date;
|
episodeToUpdate.AirDate = episode.FirstAired.Date;
|
||||||
|
|
||||||
else
|
else
|
||||||
episodeToUpdate.AirDate = null;
|
episodeToUpdate.AirDate = null;
|
||||||
|
|
||||||
@ -321,8 +315,8 @@ public virtual void RefreshEpisodeInfo(Series series)
|
|||||||
Logger.Info("Finished episode refresh for series: {0}. Successful: {1} - Failed: {2} ",
|
Logger.Info("Finished episode refresh for series: {0}. Successful: {1} - Failed: {2} ",
|
||||||
tvDbSeriesInfo.SeriesName, successCount, failCount);
|
tvDbSeriesInfo.SeriesName, successCount, failCount);
|
||||||
|
|
||||||
//DeleteInvalidEpisodes
|
//DeleteEpisodesNotInTvdb
|
||||||
DeleteInvalidEpisodes(series, tvDbSeriesInfo);
|
DeleteEpisodesNotInTvdb(series, tvDbSeriesInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void UpdateEpisode(Episode episode)
|
public virtual void UpdateEpisode(Episode episode)
|
||||||
@ -426,9 +420,9 @@ public Episode AttachSeries(Episode episode)
|
|||||||
return episode;
|
return episode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void DeleteInvalidEpisodes(Series series, TvdbSeries tvDbSeriesInfo)
|
public virtual void DeleteEpisodesNotInTvdb(Series series, TvdbSeries tvDbSeriesInfo)
|
||||||
{
|
{
|
||||||
Logger.Info("Starting deletion of invalid episode for series: {0}", series.Title.WithDefault(series.SeriesId));
|
Logger.Trace("Starting deletion of episodes that no longer exist in TVDB: {0}", series.Title.WithDefault(series.SeriesId));
|
||||||
|
|
||||||
//Delete Episodes not matching TvDbIds for this series
|
//Delete Episodes not matching TvDbIds for this series
|
||||||
var tvDbIds = tvDbSeriesInfo.Episodes.Select(e => e.Id);
|
var tvDbIds = tvDbSeriesInfo.Episodes.Select(e => e.Id);
|
||||||
@ -437,10 +431,9 @@ public virtual void DeleteInvalidEpisodes(Series series, TvdbSeries tvDbSeriesIn
|
|||||||
var tvDbIdQuery = String.Format("DELETE FROM Episodes WHERE SeriesId = {0} AND TvDbEpisodeId > 0 AND TvDbEpisodeId NOT IN ({1})",
|
var tvDbIdQuery = String.Format("DELETE FROM Episodes WHERE SeriesId = {0} AND TvDbEpisodeId > 0 AND TvDbEpisodeId NOT IN ({1})",
|
||||||
series.SeriesId, tvDbIdString);
|
series.SeriesId, tvDbIdString);
|
||||||
|
|
||||||
Logger.Trace("Deleting invalid episodes by TvDbId for {0}", series.SeriesId);
|
|
||||||
_database.Execute(tvDbIdQuery);
|
_database.Execute(tvDbIdQuery);
|
||||||
|
|
||||||
Logger.Trace("Finished deleting invalid episodes for {0}", series.SeriesId);
|
Logger.Trace("Deleted episodes that no longer exist in TVDB for {0}", series.SeriesId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void SetPostDownloadStatus(List<int> episodeIds, PostDownloadStatusType postDownloadStatus)
|
public virtual void SetPostDownloadStatus(List<int> episodeIds, PostDownloadStatusType postDownloadStatus)
|
||||||
|
Loading…
Reference in New Issue
Block a user