mirror of
https://github.com/lidarr/Lidarr
synced 2024-12-24 16:51:58 +00:00
Fixed American Dad's scene naming gong show
This commit is contained in:
parent
f819a24e65
commit
d22905676c
2 changed files with 86 additions and 14 deletions
|
@ -1,5 +1,6 @@
|
||||||
// ReSharper disable RedundantUsingDirective
|
// ReSharper disable RedundantUsingDirective
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using MbUnit.Framework;
|
using MbUnit.Framework;
|
||||||
using NzbDrone.Core.Providers;
|
using NzbDrone.Core.Providers;
|
||||||
using NzbDrone.Core.Test.Framework;
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
@ -38,19 +39,19 @@ public void successful_title_lookup(string title)
|
||||||
|
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Row(new object[] {"CAPITAL", "capital", true})]
|
[Row(new object[] { "CAPITAL", "capital", true })]
|
||||||
[Row(new object[] {"Something!!", "Something", true})]
|
[Row(new object[] { "Something!!", "Something", true })]
|
||||||
[Row(new object[] {"Simpsons 2000", "Simpsons", true})]
|
[Row(new object[] { "Simpsons 2000", "Simpsons", true })]
|
||||||
[Row(new object[] {"Simp222sons", "Simpsons", true})]
|
[Row(new object[] { "Simp222sons", "Simpsons", true })]
|
||||||
[Row(new object[] {"Simpsons", "The Simpsons", true})]
|
[Row(new object[] { "Simpsons", "The Simpsons", true })]
|
||||||
[Row(new object[] {"Law and order", "Law & order", true})]
|
[Row(new object[] { "Law and order", "Law & order", true })]
|
||||||
[Row(new object[] {"xxAndxx", "xxxx", false})]
|
[Row(new object[] { "xxAndxx", "xxxx", false })]
|
||||||
[Row(new object[] {"Andxx", "xx", false})]
|
[Row(new object[] { "Andxx", "xx", false })]
|
||||||
[Row(new object[] {"xxAnd", "xx", false})]
|
[Row(new object[] { "xxAnd", "xx", false })]
|
||||||
[Row(new object[] {"Thexx", "xx", false})]
|
[Row(new object[] { "Thexx", "xx", false })]
|
||||||
[Row(new object[] {"Thexx", "xx", false})]
|
[Row(new object[] { "Thexx", "xx", false })]
|
||||||
[Row(new object[] {"xxThexx", "xxxxx", false})]
|
[Row(new object[] { "xxThexx", "xxxxx", false })]
|
||||||
[Row(new object[] {"Simpsons The", "Simpsons", true})]
|
[Row(new object[] { "Simpsons The", "Simpsons", true })]
|
||||||
public void Name_match_test(string a, string b, bool match)
|
public void Name_match_test(string a, string b, bool match)
|
||||||
{
|
{
|
||||||
bool result = TvDbProvider.IsTitleMatch(a, b);
|
bool result = TvDbProvider.IsTitleMatch(a, b);
|
||||||
|
@ -83,5 +84,50 @@ public void no_result_title_lookup()
|
||||||
//assert
|
//assert
|
||||||
Assert.IsNull(result);
|
Assert.IsNull(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void American_dad_fix()
|
||||||
|
{
|
||||||
|
//setup
|
||||||
|
var tvdbProvider = new TvDbProvider();
|
||||||
|
|
||||||
|
//act
|
||||||
|
var result = tvdbProvider.GetSeries(73141, true);
|
||||||
|
|
||||||
|
var seasons = result.Episodes.Select(e => e.SeasonNumber)
|
||||||
|
.Distinct().ToList();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
var seasons1 = result.Episodes.Where(e => e.SeasonNumber == 1).ToList();
|
||||||
|
var seasons2 = result.Episodes.Where(e => e.SeasonNumber == 2).ToList();
|
||||||
|
var seasons3 = result.Episodes.Where(e => e.SeasonNumber == 3).ToList();
|
||||||
|
var seasons4 = result.Episodes.Where(e => e.SeasonNumber == 4).ToList();
|
||||||
|
var seasons5 = result.Episodes.Where(e => e.SeasonNumber == 5).ToList();
|
||||||
|
var seasons6 = result.Episodes.Where(e => e.SeasonNumber == 6).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
foreach (var episode in result.Episodes)
|
||||||
|
{
|
||||||
|
Console.WriteLine(episode);
|
||||||
|
}
|
||||||
|
|
||||||
|
//assert
|
||||||
|
Assert.Count(7, seasons);
|
||||||
|
Assert.Count(23, seasons1);
|
||||||
|
Assert.Count(19, seasons2);
|
||||||
|
Assert.Count(16, seasons3);
|
||||||
|
Assert.Count(20, seasons4);
|
||||||
|
Assert.Count(18, seasons5);
|
||||||
|
|
||||||
|
Assert.Distinct(seasons1.Select(s => s.EpisodeNumber));
|
||||||
|
Assert.Distinct(seasons2.Select(s => s.EpisodeNumber));
|
||||||
|
Assert.Distinct(seasons3.Select(s => s.EpisodeNumber));
|
||||||
|
Assert.Distinct(seasons4.Select(s => s.EpisodeNumber));
|
||||||
|
Assert.Distinct(seasons5.Select(s => s.EpisodeNumber));
|
||||||
|
Assert.Distinct(seasons6.Select(s => s.EpisodeNumber));
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
@ -79,7 +80,32 @@ public virtual TvdbSeries GetSeries(int id, bool loadEpisodes)
|
||||||
lock (_handler)
|
lock (_handler)
|
||||||
{
|
{
|
||||||
Logger.Debug("Fetching SeriesId'{0}' from tvdb", id);
|
Logger.Debug("Fetching SeriesId'{0}' from tvdb", id);
|
||||||
return _handler.GetSeries(id, TvdbLanguage.DefaultLanguage, loadEpisodes, false, false);
|
var result = _handler.GetSeries(id, TvdbLanguage.DefaultLanguage, loadEpisodes, false, false);
|
||||||
|
|
||||||
|
|
||||||
|
//Fix American Dad's scene gongshow
|
||||||
|
if (result != null && result.Id == 73141)
|
||||||
|
{
|
||||||
|
var seasonOneEpisodeCount = result.Episodes.Where(e => e.SeasonNumber == 0).Count();
|
||||||
|
var seasonOneId = result.Episodes.Where(e => e.SeasonNumber == 1).First().SeasonId;
|
||||||
|
|
||||||
|
foreach (var episode in result.Episodes)
|
||||||
|
{
|
||||||
|
if (episode.SeasonNumber > 1)
|
||||||
|
{
|
||||||
|
if (episode.SeasonNumber == 2)
|
||||||
|
{
|
||||||
|
episode.EpisodeNumber = episode.EpisodeNumber + seasonOneEpisodeCount;
|
||||||
|
episode.SeasonId = seasonOneId;
|
||||||
|
}
|
||||||
|
|
||||||
|
episode.SeasonNumber = episode.SeasonNumber - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue