Added api methods to get movie special features

8 files changed, 104 insertions, 0 deletions

diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs
index b3c623739..46303ddc4 100644
--- a/MediaBrowser.Api/ApiService.cs
+++ b/MediaBrowser.Api/ApiService.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Net;

 using System.Threading.Tasks;

+using MediaBrowser.Model.Entities.Movies;

 

 namespace MediaBrowser.Api

 {

@@ -237,6 +238,19 @@ namespace MediaBrowser.Api
                     Status = series.Status

                 };

             }

+

+            // Add MovieInfo

+            Movie movie = item as Movie;

+

+            if (movie != null)

+            {

+                int specialFeatureCount = movie.SpecialFeatures == null ? 0 : movie.SpecialFeatures.Count();

+

+                dto.MovieInfo = new MovieInfo()

+                {

+                    SpecialFeatureCount = specialFeatureCount

+                };

+            }

         }

 

         /// <summary>

diff --git a/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs b/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs
new file mode 100644
index 000000000..5b528b3fe
--- /dev/null
+++ b/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs
@@ -0,0 +1,49 @@
+using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Model.DTO;

+using MediaBrowser.Model.Entities;

+using MediaBrowser.Model.Entities.Movies;

+using System.ComponentModel.Composition;

+using System.Linq;

+using System.Net;

+using System.Threading.Tasks;

+

+namespace MediaBrowser.Api.HttpHandlers

+{

+    /// <summary>

+    /// This handler retrieves special features for movies

+    /// </summary>

+    [Export(typeof(BaseHandler))]

+    public class MovieSpecialFeaturesHandler : BaseSerializationHandler<DTOBaseItem[]>

+    {

+        public override bool HandlesRequest(HttpListenerRequest request)

+        {

+            return ApiService.IsApiUrlMatch("MovieSpecialFeatures", request);

+        }

+

+        protected override Task<DTOBaseItem[]> GetObjectToSerialize()

+        {

+            User user = ApiService.GetUserById(QueryString["userid"], true);

+

+            Movie movie = ApiService.GetItemById(ItemId) as Movie;

+

+            // If none

+            if (movie.SpecialFeatures == null)

+            {

+                return Task.FromResult<DTOBaseItem[]>(new DTOBaseItem[] { });

+            }

+

+            return Task.WhenAll<DTOBaseItem>(movie.SpecialFeatures.Select(i =>

+            {

+                return ApiService.GetDTOBaseItem(i, user, includeChildren: false, includePeople: true);

+            }));

+        }

+

+        protected string ItemId

+        {

+            get

+            {

+                return QueryString["id"];

+            }

+        }

+    }

+}

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index bedb8d62e..9c9e32359 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -61,6 +61,7 @@
     <Compile Include="HttpHandlers\AudioHandler.cs" />

     <Compile Include="HttpHandlers\BaseMediaHandler.cs" />

     <Compile Include="HttpHandlers\FavoriteStatusHandler.cs" />

+    <Compile Include="HttpHandlers\MovieSpecialFeaturesHandler.cs" />

     <Compile Include="HttpHandlers\UserHandler.cs" />

     <Compile Include="HttpHandlers\GenreHandler.cs" />

     <Compile Include="HttpHandlers\GenresHandler.cs" />

diff --git a/MediaBrowser.ApiInteraction.Portable/ApiClient.cs b/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
index 5c79a04ed..a49c0f7cf 100644
--- a/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction.Portable/ApiClient.cs
@@ -368,6 +368,17 @@ namespace MediaBrowser.ApiInteraction.Portable
         }

 

         /// <summary>

+        /// Gets special features for a Movie

+        /// </summary>

+        public void GetMovieSpecialFeaturesAsync(Guid itemId, Guid userId, Action<DTOBaseItem[]> callback)

+        {

+            string url = ApiUrl + "/MovieSpecialFeatures?id=" + itemId;

+            url += "&userid=" + userId;

+

+            GetDataAsync(url, callback);

+        }

+

+        /// <summary>

         /// Authenticates a user and returns the result

         /// </summary>

         public void AuthenticateUserAsync(Guid userId, string password, Action<AuthenticationResult> callback)

diff --git a/MediaBrowser.ApiInteraction/BaseHttpApiClient.cs b/MediaBrowser.ApiInteraction/BaseHttpApiClient.cs
index 0fa9465e1..ca29f8ff4 100644
--- a/MediaBrowser.ApiInteraction/BaseHttpApiClient.cs
+++ b/MediaBrowser.ApiInteraction/BaseHttpApiClient.cs
@@ -451,6 +451,20 @@ namespace MediaBrowser.ApiInteraction
         }

 

         /// <summary>

+        /// Gets special features for a Movie

+        /// </summary>

+        public async Task<DTOBaseItem[]> GetMovieSpecialFeaturesAsync(Guid itemId, Guid userId)

+        {

+            string url = ApiUrl + "/MovieSpecialFeatures?id=" + itemId;

+            url += "&userid=" + userId;

+

+            using (Stream stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))

+            {

+                return DeserializeFromStream<DTOBaseItem[]>(stream);

+            }

+        }

+

+        /// <summary>

         /// Updates a user's favorite status for an item and returns the updated UserItemData object.

         /// </summary>

         public async Task<DTOUserItemData> UpdateFavoriteStatusAsync(Guid itemId, Guid userId, bool isFavorite)

diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs
index c84133524..8d2cadd87 100644
--- a/MediaBrowser.Model/DTO/DTOBaseItem.cs
+++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs
@@ -160,6 +160,9 @@ namespace MediaBrowser.Model.DTO
         public SeriesInfo SeriesInfo { get; set; }

 

         [ProtoMember(45)]

+        public MovieInfo MovieInfo { get; set; }

+

+        [ProtoMember(46)]

         public bool IsNew { get; set; }

         

         public bool IsType(Type type)

diff --git a/MediaBrowser.Model/DTO/MovieInfo.cs b/MediaBrowser.Model/DTO/MovieInfo.cs
new file mode 100644
index 000000000..192c80565
--- /dev/null
+++ b/MediaBrowser.Model/DTO/MovieInfo.cs
@@ -0,0 +1,11 @@
+using ProtoBuf;

+

+namespace MediaBrowser.Model.DTO

+{

+    [ProtoContract]

+    public class MovieInfo

+    {

+        [ProtoMember(1)]

+        public int SpecialFeatureCount { get; set; }

+    }

+}

diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index b6fc3c981..e39f59cf5 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -37,6 +37,7 @@
     <Compile Include="DTO\AudioInfo.cs" />

     <Compile Include="DTO\AudioOutputFormats.cs" />

     <Compile Include="DTO\DTOUserItemData.cs" />

+    <Compile Include="DTO\MovieInfo.cs" />

     <Compile Include="DTO\SeriesInfo.cs" />

     <Compile Include="Authentication\AuthenticationResult.cs" />

     <Compile Include="DTO\DTOBaseItem.cs" />