Merge branch 'develop'

This commit is contained in:
kayone
2013-11-18 11:33:30 -08:00
165 changed files with 4360 additions and 2994 deletions
+11 -3
View File
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.MetadataSource
series.Network = show.network;
series.AirTime = show.air_time_utc;
series.TitleSlug = show.url.ToLower().Replace("http://trakt.tv/show/", "");
series.Status = GetSeriesStatus(show.status);
series.Status = GetSeriesStatus(show.status, show.ended);
series.Seasons = show.seasons.Select(s => new Tv.Season
{
@@ -135,9 +135,17 @@ namespace NzbDrone.Core.MetadataSource
return withoutExtension + "-300" + extension;
}
private static SeriesStatusType GetSeriesStatus(string status)
private static SeriesStatusType GetSeriesStatus(string status, bool? ended)
{
if (string.IsNullOrWhiteSpace(status)) return SeriesStatusType.Continuing;
if (string.IsNullOrWhiteSpace(status))
{
if (ended.HasValue && ended.Value)
{
return SeriesStatusType.Ended;
}
return SeriesStatusType.Continuing;
}
if (status.Equals("Ended", StringComparison.InvariantCultureIgnoreCase)) return SeriesStatusType.Ended;
return SeriesStatusType.Continuing;
}