Upgraded Protobuf, and added api support for it

12 files changed, 16 insertions, 15 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
index eeadf1e45..c2b70e106 100644
--- a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// <summary>

     /// Gets a single genre

     /// </summary>

-    public class GenreHandler : BaseSerializationHandler<IBNItem>

+    public class GenreHandler : BaseJsonHandler<IBNItem>

     {

         protected override Task<IBNItem> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
index 8452bae3d..3280c3e32 100644
--- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.Entities;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class GenresHandler : BaseSerializationHandler<IEnumerable<IBNItem>>

+    public class GenresHandler : BaseJsonHandler<IEnumerable<IBNItem>>

     {

         protected override Task<IEnumerable<IBNItem>> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
index 35310f042..4f2a9c68e 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
@@ -8,7 +8,7 @@ using MediaBrowser.Model.Entities;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class ItemHandler : BaseSerializationHandler<DTOBaseItem>

+    public class ItemHandler : BaseJsonHandler<DTOBaseItem>

     {

         protected override Task<DTOBaseItem> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
index 09814b191..9d5e3eb58 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.Entities;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class ItemListHandler : BaseSerializationHandler<DTOBaseItem[]>

+    public class ItemListHandler : BaseJsonHandler<DTOBaseItem[]>

     {

         protected override Task<DTOBaseItem[]> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
index 0d496c240..3c34efae5 100644
--- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// <summary>

     /// Gets a single Person

     /// </summary>

-    public class PersonHandler : BaseSerializationHandler<IBNItem>

+    public class PersonHandler : BaseJsonHandler<IBNItem>

     {

         protected override Task<IBNItem> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
index 6abfb9b2d..fbc16109d 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Model.Plugins;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class PluginConfigurationHandler : BaseSerializationHandler<BasePluginConfiguration>

+    public class PluginConfigurationHandler : BaseJsonHandler<BasePluginConfiguration>

     {

         protected override Task<BasePluginConfiguration> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
index 67246cbc6..1cb4e95f7 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// <summary>

     /// Provides information about installed plugins

     /// </summary>

-    public class PluginsHandler : BaseSerializationHandler<IEnumerable<PluginInfo>>

+    public class PluginsHandler : BaseJsonHandler<IEnumerable<PluginInfo>>

     {

         protected override Task<IEnumerable<PluginInfo>> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
index 458dd9da1..af7e7fed0 100644
--- a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// <summary>

     /// Gets a single studio

     /// </summary>

-    public class StudioHandler : BaseSerializationHandler<IBNItem>

+    public class StudioHandler : BaseJsonHandler<IBNItem>

     {

         protected override Task<IBNItem> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
index 0f1e087fe..64348ac89 100644
--- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.Entities;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class StudiosHandler : BaseSerializationHandler<IEnumerable<IBNItem>>

+    public class StudiosHandler : BaseJsonHandler<IEnumerable<IBNItem>>

     {

         protected override Task<IEnumerable<IBNItem>> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
index 1c7ea6b27..44d23a208 100644
--- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
@@ -1,16 +1,17 @@
 using System.Collections.Generic;

+using System.Linq;

 using System.Threading.Tasks;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

-using MediaBrowser.Model.Entities;

+using MediaBrowser.Model.DTO;

 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    class UsersHandler : BaseSerializationHandler<IEnumerable<User>>

+    class UsersHandler : BaseJsonHandler<IEnumerable<DTOUser>>

     {

-        protected override Task<IEnumerable<User>> GetObjectToSerialize()

+        protected override Task<IEnumerable<DTOUser>> GetObjectToSerialize()

         {

-            return Task.FromResult<IEnumerable<User>>(Kernel.Instance.Users);

+            return Task.FromResult<IEnumerable<DTOUser>>(Kernel.Instance.Users.Select(u => ApiService.GetDTOUser(u)));

         }

     }

 }

diff --git a/MediaBrowser.Api/HttpHandlers/YearHandler.cs b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
index 1b0c7f670..0eb674e27 100644
--- a/MediaBrowser.Api/HttpHandlers/YearHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/YearHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
     /// <summary>

     /// Gets a single year

     /// </summary>

-    public class YearHandler : BaseSerializationHandler<IBNItem>

+    public class YearHandler : BaseJsonHandler<IBNItem>

     {

         protected override Task<IBNItem> GetObjectToSerialize()

         {

diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
index 449be7c5e..ee07ac8b0 100644
--- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs
@@ -9,7 +9,7 @@ using MediaBrowser.Model.Entities;
 

 namespace MediaBrowser.Api.HttpHandlers

 {

-    public class YearsHandler : BaseSerializationHandler<IEnumerable<IBNItem>>

+    public class YearsHandler : BaseJsonHandler<IEnumerable<IBNItem>>

     {

         protected override Task<IEnumerable<IBNItem>> GetObjectToSerialize()

         {