From 5c094afd7e79934cb02f29a9a0080ed12c7e1098 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Fri, 17 Aug 2012 09:16:50 -0400 Subject: [PATCH] Made BaseJsonHandler strongly typed. Moved DTO entities to their own DTO namespace in Model. --- MediaBrowser.Api/ApiService.cs | 5 ++-- .../HttpHandlers/GenresHandler.cs | 6 +++-- MediaBrowser.Api/HttpHandlers/ItemHandler.cs | 5 ++-- .../HttpHandlers/ItemListHandler.cs | 5 ++-- .../HttpHandlers/PersonHandler.cs | 5 ++-- .../PluginConfigurationHandler.cs | 5 ++-- .../HttpHandlers/PluginsHandler.cs | 9 ++++--- .../HttpHandlers/StudiosHandler.cs | 8 +++--- .../HttpHandlers/UserConfigurationHandler.cs | 5 ++-- MediaBrowser.Api/HttpHandlers/UsersHandler.cs | 8 +++--- MediaBrowser.Api/HttpHandlers/VideoHandler.cs | 4 +-- MediaBrowser.Api/HttpHandlers/YearsHandler.cs | 6 +++-- MediaBrowser.ApiInteraction/ApiClient.cs | 25 ++++++++++--------- .../Net/Handlers/BaseJsonHandler.cs | 10 ++++---- MediaBrowser.Controller/Kernel.cs | 1 + .../Xml/BaseItemXmlParser.cs | 4 --- .../{Entities => DTO}/ApiBaseItem.cs | 16 +++++++++--- .../{Entities => DTO}/CategoryInfo.cs | 2 +- .../{Plugins => DTO}/PluginInfo.cs | 2 +- MediaBrowser.Model/Entities/BaseItem.cs | 4 +-- MediaBrowser.Model/MediaBrowser.Model.csproj | 6 ++--- MediaBrowser.Movies/Entities/BoxSet.cs | 4 +-- MediaBrowser.Movies/Entities/Movie.cs | 3 --- .../MainWindow.xaml.cs | 6 ++--- MediaBrowser.TV/Entities/Episode.cs | 1 - MediaBrowser.TV/Metadata/EpisodeXmlParser.cs | 4 --- 26 files changed, 85 insertions(+), 74 deletions(-) rename MediaBrowser.Model/{Entities => DTO}/ApiBaseItem.cs (73%) rename MediaBrowser.Model/{Entities => DTO}/CategoryInfo.cs (89%) rename MediaBrowser.Model/{Plugins => DTO}/PluginInfo.cs (90%) diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index 7c52e0e5c6..e4a7f71bf5 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Reflection; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api @@ -23,9 +24,9 @@ namespace MediaBrowser.Api /// /// Takes a BaseItem and returns the actual object that will be serialized by the api /// - public static ApiBaseItemWrapper GetSerializationObject(BaseItem item, bool includeChildren, Guid userId) + public static BaseItemWrapper GetSerializationObject(BaseItem item, bool includeChildren, Guid userId) { - ApiBaseItemWrapper wrapper = new ApiBaseItemWrapper() + BaseItemWrapper wrapper = new BaseItemWrapper() { Item = item, UserItemData = Kernel.Instance.GetUserItemData(userId, item.Id), diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs index 0c38a23962..c3292d3633 100644 --- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs @@ -1,13 +1,15 @@ using System; +using System.Collections.Generic; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public class GenresHandler : BaseJsonHandler + public class GenresHandler : BaseJsonHandler>> { - protected override object GetObjectToSerialize() + protected override IEnumerable> GetObjectToSerialize() { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs index 28def271f8..efb67db54e 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs @@ -1,12 +1,13 @@ using System; using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public class ItemHandler : BaseJsonHandler + public class ItemHandler : BaseJsonHandler> { - protected sealed override object GetObjectToSerialize() + protected sealed override BaseItemWrapper GetObjectToSerialize() { Guid userId = Guid.Parse(QueryString["userid"]); diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs index 0d9d3d0a89..6e08561b23 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.Linq; using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public abstract class ItemListHandler : BaseJsonHandler + public abstract class ItemListHandler : BaseJsonHandler>> { - protected override object GetObjectToSerialize() + protected override IEnumerable> GetObjectToSerialize() { return ItemsToSerialize.Select(i => { diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs index 103e49cd2d..513840b81e 100644 --- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs @@ -1,11 +1,12 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public class PersonHandler : BaseJsonHandler + public class PersonHandler : BaseJsonHandler { - protected override object GetObjectToSerialize() + protected override Person GetObjectToSerialize() { return Kernel.Instance.ItemController.GetPerson(QueryString["name"]); } diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs index 4dc317ecc1..0e19aecd5c 100644 --- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs @@ -2,12 +2,13 @@ using System.Linq; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.Plugins; namespace MediaBrowser.Api.HttpHandlers { - public class PluginConfigurationHandler : BaseJsonHandler + public class PluginConfigurationHandler : BaseJsonHandler { - protected override object GetObjectToSerialize() + protected override BasePluginConfiguration GetObjectToSerialize() { string pluginName = QueryString["name"]; diff --git a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs index a44e126921..c3c1b40493 100644 --- a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs @@ -1,16 +1,17 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; -using MediaBrowser.Model.Plugins; +using MediaBrowser.Model.DTO; namespace MediaBrowser.Api.HttpHandlers { /// /// Provides information about installed plugins /// - public class PluginsHandler : BaseJsonHandler + public class PluginsHandler : BaseJsonHandler> { - protected override object GetObjectToSerialize() + protected override IEnumerable GetObjectToSerialize() { var plugins = Kernel.Instance.Plugins.Select(p => { diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs index a381af15fe..b1be2cad2a 100644 --- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs @@ -1,17 +1,19 @@ using System; +using System.Collections.Generic; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public class StudiosHandler : BaseJsonHandler + public class StudiosHandler : BaseJsonHandler>> { - protected override object GetObjectToSerialize() + protected override IEnumerable> GetObjectToSerialize() { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); - + return Kernel.Instance.GetAllStudios(parent, userId); } } diff --git a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs index f9d3536b6d..12e80f3060 100644 --- a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs @@ -1,12 +1,13 @@ using System; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.Configuration; namespace MediaBrowser.Api.HttpHandlers { - public class UserConfigurationHandler : BaseJsonHandler + public class UserConfigurationHandler : BaseJsonHandler { - protected override object GetObjectToSerialize() + protected override UserConfiguration GetObjectToSerialize() { Guid userId = Guid.Parse(QueryString["userid"]); diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs index 64f68f62f1..64239005fc 100644 --- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs @@ -1,11 +1,13 @@ -using MediaBrowser.Common.Net.Handlers; +using System.Collections.Generic; +using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.Users; namespace MediaBrowser.Api.HttpHandlers { - class UsersHandler : BaseJsonHandler + class UsersHandler : BaseJsonHandler> { - protected override object GetObjectToSerialize() + protected override IEnumerable GetObjectToSerialize() { return Kernel.Instance.Users; } diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs index 7fe82ef0c6..343fcc70bd 100644 --- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.IO; using System.Linq; -using MediaBrowser.Model.Entities; -using System.Drawing; using MediaBrowser.Common.Drawing; +using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs index 044866dca3..cc34748805 100644 --- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs @@ -1,13 +1,15 @@ using System; +using System.Collections.Generic; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.HttpHandlers { - public class YearsHandler : BaseJsonHandler + public class YearsHandler : BaseJsonHandler>> { - protected override object GetObjectToSerialize() + protected override IEnumerable> GetObjectToSerialize() { Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder; Guid userId = Guid.Parse(QueryString["userid"]); diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs index 0750223b6d..7818dbdf8b 100644 --- a/MediaBrowser.ApiInteraction/ApiClient.cs +++ b/MediaBrowser.ApiInteraction/ApiClient.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Users; @@ -90,7 +91,7 @@ namespace MediaBrowser.ApiInteraction /// Use if a max width is required. Aspect ratio will be preserved. /// Use if a max height is required. Aspect ratio will be preserved. /// Quality level, from 0-100. Currently only applies to JPG. The default value should suffice. - public IEnumerable GetBackdropImageUrls(ApiBaseItemWrapper itemWrapper, int? width = null, int? height = null, int? maxWidth = null, int? maxHeight = null, int? quality = null) + public IEnumerable GetBackdropImageUrls(BaseItemWrapper itemWrapper, int? width = null, int? height = null, int? maxWidth = null, int? maxHeight = null, int? quality = null) { Guid? backdropItemId = null; int backdropCount = 0; @@ -130,7 +131,7 @@ namespace MediaBrowser.ApiInteraction /// Use if a max width is required. Aspect ratio will be preserved. /// Use if a max height is required. Aspect ratio will be preserved. /// Quality level, from 0-100. Currently only applies to JPG. The default value should suffice. - public string GetLogoImageUrl(ApiBaseItemWrapper itemWrapper, int? width = null, int? height = null, int? maxWidth = null, int? maxHeight = null, int? quality = null) + public string GetLogoImageUrl(BaseItemWrapper itemWrapper, int? width = null, int? height = null, int? maxWidth = null, int? maxHeight = null, int? quality = null) { Guid? logoItemId = !string.IsNullOrEmpty(itemWrapper.Item.LogoImagePath) ? itemWrapper.Item.Id : itemWrapper.ParentLogoItemId; @@ -153,7 +154,7 @@ namespace MediaBrowser.ApiInteraction /// /// Gets a BaseItem /// - public async Task> GetItemAsync(Guid id, Guid userId) + public async Task> GetItemAsync(Guid id, Guid userId) { string url = ApiUrl + "/item?userId=" + userId.ToString(); @@ -164,7 +165,7 @@ namespace MediaBrowser.ApiInteraction using (Stream stream = await HttpClient.GetStreamAsync(url)) { - return JsonSerializer.DeserializeFromStream>(stream); + return JsonSerializer.DeserializeFromStream>(stream); } } @@ -210,33 +211,33 @@ namespace MediaBrowser.ApiInteraction /// /// Gets all items that contain a given Year /// - public async Task>> GetItemsWithYearAsync(string name, Guid userId) + public async Task>> GetItemsWithYearAsync(string name, Guid userId) { string url = ApiUrl + "/itemswithyear?userId=" + userId.ToString() + "&name=" + name; using (Stream stream = await HttpClient.GetStreamAsync(url)) { - return JsonSerializer.DeserializeFromStream>>(stream); + return JsonSerializer.DeserializeFromStream>>(stream); } } /// /// Gets all items that contain a given Genre /// - public async Task>> GetItemsWithGenreAsync(string name, Guid userId) + public async Task>> GetItemsWithGenreAsync(string name, Guid userId) { string url = ApiUrl + "/itemswithgenre?userId=" + userId.ToString() + "&name=" + name; using (Stream stream = await HttpClient.GetStreamAsync(url)) { - return JsonSerializer.DeserializeFromStream>>(stream); + return JsonSerializer.DeserializeFromStream>>(stream); } } /// /// Gets all items that contain a given Person /// - public async Task>> GetItemsWithPersonAsync(string name, PersonType? personType, Guid userId) + public async Task>> GetItemsWithPersonAsync(string name, PersonType? personType, Guid userId) { string url = ApiUrl + "/itemswithperson?userId=" + userId.ToString() + "&name=" + name; @@ -247,7 +248,7 @@ namespace MediaBrowser.ApiInteraction using (Stream stream = await HttpClient.GetStreamAsync(url)) { - return JsonSerializer.DeserializeFromStream>>(stream); + return JsonSerializer.DeserializeFromStream>>(stream); } } @@ -280,13 +281,13 @@ namespace MediaBrowser.ApiInteraction /// /// Gets all items that contain a given Studio /// - public async Task>> GetItemsWithStudioAsync(string name, Guid userId) + public async Task>> GetItemsWithStudioAsync(string name, Guid userId) { string url = ApiUrl + "/itemswithstudio?userId=" + userId.ToString() + "&name=" + name; using (Stream stream = await HttpClient.GetStreamAsync(url)) { - return JsonSerializer.DeserializeFromStream>>(stream); + return JsonSerializer.DeserializeFromStream>>(stream); } } diff --git a/MediaBrowser.Common/Net/Handlers/BaseJsonHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseJsonHandler.cs index 03de398c90..a35af92313 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseJsonHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseJsonHandler.cs @@ -4,7 +4,7 @@ using MediaBrowser.Common.Serialization; namespace MediaBrowser.Common.Net.Handlers { - public abstract class BaseJsonHandler : BaseHandler + public abstract class BaseJsonHandler : BaseHandler { public override string ContentType { @@ -12,7 +12,7 @@ namespace MediaBrowser.Common.Net.Handlers } private bool _ObjectToSerializeEnsured = false; - private object _ObjectToSerialize; + private T _ObjectToSerialize; private void EnsureObjectToSerialize() { @@ -29,7 +29,7 @@ namespace MediaBrowser.Common.Net.Handlers } } - private object ObjectToSerialize + private T ObjectToSerialize { get { @@ -38,7 +38,7 @@ namespace MediaBrowser.Common.Net.Handlers } } - protected abstract object GetObjectToSerialize(); + protected abstract T GetObjectToSerialize(); protected override void PrepareResponse() { @@ -51,7 +51,7 @@ namespace MediaBrowser.Common.Net.Handlers { return Task.Run(() => { - JsonSerializer.SerializeToStream(ObjectToSerialize, stream); + JsonSerializer.SerializeToStream(ObjectToSerialize, stream); }); } } diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 18598d0144..ef9a07814b 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -13,6 +13,7 @@ using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Progress; using MediaBrowser.Model.Users; diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs index 38b8584fc0..30bf3d367b 100644 --- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs @@ -113,10 +113,6 @@ namespace MediaBrowser.Controller.Xml item.CustomRating = reader.ReadString(); break; - case "CustomPin": - item.CustomPin = reader.ReadString(); - break; - case "Genre": { var genres = (item.Genres ?? new string[] { }).ToList(); diff --git a/MediaBrowser.Model/Entities/ApiBaseItem.cs b/MediaBrowser.Model/DTO/ApiBaseItem.cs similarity index 73% rename from MediaBrowser.Model/Entities/ApiBaseItem.cs rename to MediaBrowser.Model/DTO/ApiBaseItem.cs index e40fdc25f8..d6b0f4a047 100644 --- a/MediaBrowser.Model/Entities/ApiBaseItem.cs +++ b/MediaBrowser.Model/DTO/ApiBaseItem.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; +using MediaBrowser.Model.Entities; using MediaBrowser.Model.Users; -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Model.DTO { /// /// This is a concrete class that the UI can use to deserialize @@ -10,7 +11,7 @@ namespace MediaBrowser.Model.Entities /// public class ApiBaseItem : BaseItem { - // TV Series + // Series properties public string Status { get; set; } public IEnumerable AirDays { get; set; } public string AirTime { get; set; } @@ -19,14 +20,14 @@ namespace MediaBrowser.Model.Entities /// /// This is the full return object when requesting an Item /// - public class ApiBaseItemWrapper + public class BaseItemWrapper where T : BaseItem { public T Item { get; set; } public UserItemData UserItemData { get; set; } - public IEnumerable> Children { get; set; } + public IEnumerable> Children { get; set; } public bool IsFolder { get; set; } @@ -55,4 +56,11 @@ namespace MediaBrowser.Model.Entities public int? ParentBackdropCount { get; set; } } + + /// + /// This is strictly for convenience so the UI's don't have to use the verbose generic syntax of BaseItemWrapper + /// + public class ApiBaseItemWrapper : BaseItemWrapper + { + } } diff --git a/MediaBrowser.Model/Entities/CategoryInfo.cs b/MediaBrowser.Model/DTO/CategoryInfo.cs similarity index 89% rename from MediaBrowser.Model/Entities/CategoryInfo.cs rename to MediaBrowser.Model/DTO/CategoryInfo.cs index 934a0ae1d1..e6b2aeafb0 100644 --- a/MediaBrowser.Model/Entities/CategoryInfo.cs +++ b/MediaBrowser.Model/DTO/CategoryInfo.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Model.DTO { /// /// This is a stub class used by the api to get IBN types along with their item counts diff --git a/MediaBrowser.Model/Plugins/PluginInfo.cs b/MediaBrowser.Model/DTO/PluginInfo.cs similarity index 90% rename from MediaBrowser.Model/Plugins/PluginInfo.cs rename to MediaBrowser.Model/DTO/PluginInfo.cs index e08128fd7b..76e9026a6b 100644 --- a/MediaBrowser.Model/Plugins/PluginInfo.cs +++ b/MediaBrowser.Model/DTO/PluginInfo.cs @@ -1,6 +1,6 @@ using System; -namespace MediaBrowser.Model.Plugins +namespace MediaBrowser.Model.DTO { /// /// This is a serializable stub class that is used by the api to provide information about installed plugins. diff --git a/MediaBrowser.Model/Entities/BaseItem.cs b/MediaBrowser.Model/Entities/BaseItem.cs index 322bac564c..d2745e460f 100644 --- a/MediaBrowser.Model/Entities/BaseItem.cs +++ b/MediaBrowser.Model/Entities/BaseItem.cs @@ -26,9 +26,9 @@ namespace MediaBrowser.Model.Entities public IEnumerable BackdropImagePaths { get; set; } public string OfficialRating { get; set; } - + + [IgnoreDataMember] public string CustomRating { get; set; } - public string CustomPin { get; set; } public string Overview { get; set; } public string Tagline { get; set; } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 97a2233204..dd9034ed56 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -33,11 +33,11 @@ - + - + @@ -47,7 +47,7 @@ - + diff --git a/MediaBrowser.Movies/Entities/BoxSet.cs b/MediaBrowser.Movies/Entities/BoxSet.cs index 520722607d..ed6cb14012 100644 --- a/MediaBrowser.Movies/Entities/BoxSet.cs +++ b/MediaBrowser.Movies/Entities/BoxSet.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Entities; namespace MediaBrowser.Movies.Entities { diff --git a/MediaBrowser.Movies/Entities/Movie.cs b/MediaBrowser.Movies/Entities/Movie.cs index 585b5b7773..25fb1327cb 100644 --- a/MediaBrowser.Movies/Entities/Movie.cs +++ b/MediaBrowser.Movies/Entities/Movie.cs @@ -6,9 +6,6 @@ namespace MediaBrowser.Movies.Entities { public class Movie : Video { - public string TmdbId { get; set; } - public string ImdbId { get; set; } - [IgnoreDataMember] public IEnumerable