Made BaseJsonHandler strongly typed. Moved DTO entities to their own DTO namespace in Model.

3 files changed, 2 insertions, 79 deletions

diff --git a/MediaBrowser.Model/Entities/ApiBaseItem.cs b/MediaBrowser.Model/Entities/ApiBaseItem.cs
deleted file mode 100644
index e40fdc25f8..0000000000
--- a/MediaBrowser.Model/Entities/ApiBaseItem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;

-using System.Collections.Generic;

-using MediaBrowser.Model.Users;

-

-namespace MediaBrowser.Model.Entities

-{

-    /// <summary>

-    /// This is a concrete class that the UI can use to deserialize

-    /// It is flat in the sense that it will be used regardless of the type of BaseItem involved

-    /// </summary>

-    public class ApiBaseItem : BaseItem

-    {

-        // TV Series

-        public string Status { get; set; }

-        public IEnumerable<DayOfWeek> AirDays { get; set; }

-        public string AirTime { get; set; }

-    }

-

-    /// <summary>

-    /// This is the full return object when requesting an Item

-    /// </summary>

-    public class ApiBaseItemWrapper<T>

-        where T : BaseItem

-    {

-        public T Item { get; set; }

-

-        public UserItemData UserItemData { get; set; }

-

-        public IEnumerable<ApiBaseItemWrapper<T>> Children { get; set; }

-

-        public bool IsFolder { get; set; }

-

-        public Guid? ParentId { get; set; }

-

-        public string Type { get; set; }

-

-        public bool IsType(Type type)

-        {

-            return IsType(type.Name);

-        }

-

-        public bool IsType(string type)

-        {

-            return Type.Equals(type, StringComparison.OrdinalIgnoreCase);

-        }

-

-        public IEnumerable<PersonInfo> People { get; set; }

-

-        /// <summary>

-        /// If the item does not have a logo, this will hold the Id of the Parent that has one.

-        /// </summary>

-        public Guid? ParentLogoItemId { get; set; }

-

-        public Guid? ParentBackdropItemId { get; set; }

-

-        public int? ParentBackdropCount { get; set; }

-    }

-}

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<string> 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/Entities/CategoryInfo.cs b/MediaBrowser.Model/Entities/CategoryInfo.cs
deleted file mode 100644
index 934a0ae1d1..0000000000
--- a/MediaBrowser.Model/Entities/CategoryInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-

-namespace MediaBrowser.Model.Entities

-{

-    /// <summary>

-    /// This is a stub class used by the api to get IBN types along with their item counts

-    /// </summary>

-    public class CategoryInfo<T>

-    {

-        /// <summary>

-        /// The actual genre, year, studio, etc

-        /// </summary>

-        public T Item { get; set; }

-

-        /// <summary>

-        /// The number of items that have the genre, year, studio, etc

-        /// </summary>

-        public int ItemCount { get; set; }

-    }

-}