From 22bbf83e4226f2c8e2140cb82668c6356f90ce54 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 26 Mar 2013 22:51:48 -0700 Subject: [PATCH] Fixed scene mapping deserialization --- NzbDrone.Core/MetadataSource/TvDbProxy.cs | 4 ---- NzbDrone.Core/ReferenceData/SceneMapping.cs | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NzbDrone.Core/MetadataSource/TvDbProxy.cs b/NzbDrone.Core/MetadataSource/TvDbProxy.cs index 6de7d763a..3a271aaf4 100644 --- a/NzbDrone.Core/MetadataSource/TvDbProxy.cs +++ b/NzbDrone.Core/MetadataSource/TvDbProxy.cs @@ -48,7 +48,6 @@ namespace NzbDrone.Core.MetadataSource public virtual Series GetSeries(int tvDbSeriesId) { - var tvDbSeries = _handlerV2.GetSeriesBaseRecord("http://thetvdb.com", tvDbSeriesId); var series = new Series(); @@ -94,13 +93,10 @@ namespace NzbDrone.Core.MetadataSource } return series; - } public virtual IList GetEpisodes(int tvDbSeriesId) { - - var seriesRecord = _handlerV2.GetSeriesFullRecord("http://thetvdb.com", tvDbSeriesId); var tvdbEpisodes = seriesRecord.Episodes.OrderByDescending(e => e.FirstAired).ThenByDescending(e => e.EpisodeName) diff --git a/NzbDrone.Core/ReferenceData/SceneMapping.cs b/NzbDrone.Core/ReferenceData/SceneMapping.cs index c3be89ccf..8030bfef6 100644 --- a/NzbDrone.Core/ReferenceData/SceneMapping.cs +++ b/NzbDrone.Core/ReferenceData/SceneMapping.cs @@ -1,4 +1,5 @@ using System.Linq; +using Newtonsoft.Json; using NzbDrone.Core.Datastore; namespace NzbDrone.Core.ReferenceData @@ -6,7 +7,11 @@ namespace NzbDrone.Core.ReferenceData public class SceneMapping : ModelBase { public string CleanTitle { get; set; } + + [JsonProperty("Title")] public string SceneName { get; set; } + + [JsonProperty("Id")] public int TvdbId { get; set; } public int SeasonNumber { get; set; } }