mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-02-23 14:41:27 +00:00
Code Issues Releases Wiki Activity

Fixed: Updating Kodi won't fail if a series has an IMDB ID instead of a TVDB ID

Browse source
This commit is contained in:
Mark McDowall 2015-03-05 00:22:46 -08:00
parent 8b1e0f68dd
commit f021f9b146
4 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
View file

@ -13,6 +13,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
[TestFixture] [TestFixture]
public class GetSeriesPathFixture : CoreTest<JsonApiProvider> public class GetSeriesPathFixture : CoreTest<JsonApiProvider>
{ {
private const int TVDB_ID = 5;
private XbmcSettings _settings; private XbmcSettings _settings;
private Series _series; private Series _series;
private string _response; private string _response;
@ -25,24 +26,28 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
.Build(); .Build();
_xbmcSeries = Builder<TvShow>.CreateListOfSize(3) _xbmcSeries = Builder<TvShow>.CreateListOfSize(3)
.Build() .All()
.ToList(); .With(s => s.ImdbNumber = "0")
.TheFirst(1)
.With(s => s.ImdbNumber = TVDB_ID.ToString())
.Build()
.ToList();
Mocker.GetMock<IXbmcJsonApiProxy>() Mocker.GetMock<IXbmcJsonApiProxy>()
.Setup(s => s.GetSeries(_settings)) .Setup(s => s.GetSeries(_settings))
.Returns(_xbmcSeries); .Returns(_xbmcSeries);
} }
private void WithMatchingTvdbId() private void GivenMatchingTvdbId()
{ {
_series = new Series _series = new Series
{ {
TvdbId = _xbmcSeries.First().ImdbNumber, TvdbId = TVDB_ID,
Title = "TV Show" Title = "TV Show"
}; };
} }
private void WithMatchingTitle() private void GivenMatchingTitle()
{ {
_series = new Series _series = new Series
{ {
@ -51,7 +56,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
}; };
} }
private void WithoutMatchingSeries() private void GivenMatchingSeries()
{ {
_series = new Series _series = new Series
{ {
@ -63,7 +68,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
[Test] [Test]
public void should_return_null_when_series_is_not_found() public void should_return_null_when_series_is_not_found()
{ {
WithoutMatchingSeries(); GivenMatchingSeries();
Subject.GetSeriesPath(_settings, _series).Should().BeNull(); Subject.GetSeriesPath(_settings, _series).Should().BeNull();
} }
@ -71,7 +76,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
[Test] [Test]
public void should_return_path_when_tvdbId_matches() public void should_return_path_when_tvdbId_matches()
{ {
WithMatchingTvdbId(); GivenMatchingTvdbId();
Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File); Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File);
} }
@ -79,9 +84,24 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
[Test] [Test]
public void should_return_path_when_title_matches() public void should_return_path_when_title_matches()
{ {
WithMatchingTitle(); GivenMatchingTitle();
Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File); Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File);
} }
[Test]
public void should_not_throw_when_imdb_number_is_not_a_number()
{
GivenMatchingTvdbId();
_xbmcSeries.ForEach(s => s.ImdbNumber = "tt12345");
_xbmcSeries.Last().ImdbNumber = TVDB_ID.ToString();
Mocker.GetMock<IXbmcJsonApiProxy>()
.Setup(s => s.GetSeries(_settings))
.Returns(_xbmcSeries);
Subject.GetSeriesPath(_settings, _series).Should().NotBeNull();
}
} }
} }

9
src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
View file

@ -14,6 +14,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
[TestFixture] [TestFixture]
public class UpdateFixture : CoreTest<JsonApiProvider> public class UpdateFixture : CoreTest<JsonApiProvider>
{ {
private const int TVDB_ID = 5;
private XbmcSettings _settings; private XbmcSettings _settings;
private Series _series; private Series _series;
private List<TvShow> _xbmcSeries; private List<TvShow> _xbmcSeries;
@ -25,8 +26,10 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
.Build(); .Build();
_xbmcSeries = Builder<TvShow>.CreateListOfSize(3) _xbmcSeries = Builder<TvShow>.CreateListOfSize(3)
.Build() .TheFirst(1)
.ToList(); .With(s => s.ImdbNumber = TVDB_ID.ToString())
.Build()
.ToList();
Mocker.GetMock<IXbmcJsonApiProxy>() Mocker.GetMock<IXbmcJsonApiProxy>()
.Setup(s => s.GetSeries(_settings)) .Setup(s => s.GetSeries(_settings))
@ -41,7 +44,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
public void should_update_using_series_path() public void should_update_using_series_path()
{ {
var series = Builder<Series>.CreateNew() var series = Builder<Series>.CreateNew()
.With(s => s.TvdbId = _xbmcSeries.First().ImdbNumber) .With(s => s.TvdbId = TVDB_ID)
.Build(); .Build();
Subject.Update(_settings, series); Subject.Update(_settings, series);

8
src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
View file

@ -65,7 +65,13 @@ namespace NzbDrone.Core.Notifications.Xbmc
return null; return null;
} }
var matchingSeries = allSeries.FirstOrDefault(s => s.ImdbNumber == series.TvdbId || s.Label == series.Title); var matchingSeries = allSeries.FirstOrDefault(s =>
{
var tvdbId = 0;
Int32.TryParse(s.ImdbNumber, out tvdbId);
return tvdbId == series.TvdbId || s.Label == series.Title;
});
if (matchingSeries != null) return matchingSeries.File; if (matchingSeries != null) return matchingSeries.File;

2
src/NzbDrone.Core/Notifications/Xbmc/Model/TvShow.cs
View file

@ -4,7 +4,7 @@
{ {
public int TvShowId { get; set; } public int TvShowId { get; set; }
public string Label { get; set; } public string Label { get; set; }
public int ImdbNumber { get; set; } public string ImdbNumber { get; set; }
public string File { get; set; } public string File { get; set; }
} }
} }