pass requested fields to data layer

sjww233 · Oct 8, 2016 · 5cd3276 · 5cd3276
1 parent 1591b16
commit 5cd3276
Show file tree

Hide file tree

Showing 64 changed files with 739 additions and 633 deletions.
diff --git a/MediaBrowser.Api/FilterService.cs b/MediaBrowser.Api/FilterService.cs
@@ -4,6 +4,7 @@
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -104,7 +105,8 @@ private InternalItemsQuery GetItemsQuery(GetQueryFilters request, User user)
                 MediaTypes = request.GetMediaTypes(),
                 IncludeItemTypes = request.GetIncludeItemTypes(),
                 Recursive = true,
-                EnableTotalRecordCount = false
+                EnableTotalRecordCount = false,
+                Fields = new List<ItemFields> { ItemFields.Genres, ItemFields.Tags }
             };
 
             return query;

diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs
@@ -200,19 +200,20 @@ private async Task<QueryResult<BaseItemDto>> GetSimilarItemsResult(BaseGetSimila
                 (!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
 
+            var dtoOptions = GetDtoOptions(request);
+
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 Limit = request.Limit,
                 IncludeItemTypes = new[]
                 {
                         typeof(Game).Name
                 },
-                SimilarTo = item
+                SimilarTo = item,
+                Fields = dtoOptions.Fields
 
             }).ToList();
 
-            var dtoOptions = GetDtoOptions(request);
-
             var result = new QueryResult<BaseItemDto>
             {
                 Items = (await _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user).ConfigureAwait(false)).ToArray(),

diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
@@ -274,10 +274,9 @@ private void UpdateItem(BaseItemDto request, BaseItem item)
 
             item.Tags = request.Tags;
 
-            var hasTaglines = item as IHasTaglines;
-            if (hasTaglines != null)
+            if (request.Taglines != null)
             {
-                hasTaglines.Taglines = request.Taglines;
+                item.Tagline = request.Taglines.FirstOrDefault();
             }
 
             var hasShortOverview = item as IHasShortOverview;
@@ -304,8 +303,6 @@ private void UpdateItem(BaseItemDto request, BaseItem item)
             item.OfficialRating = string.IsNullOrWhiteSpace(request.OfficialRating) ? null : request.OfficialRating;
             item.CustomRating = request.CustomRating;
 
-            SetProductionLocations(item, request);
-
             item.PreferredMetadataCountryCode = request.PreferredMetadataCountryCode;
             item.PreferredMetadataLanguage = request.PreferredMetadataLanguage;
 
@@ -413,23 +410,5 @@ private void UpdateItem(BaseItemDto request, BaseItem item)
                 series.AirTime = request.AirTime;
             }
         }
-
-        private void SetProductionLocations(BaseItem item, BaseItemDto request)
-        {
-            var hasProductionLocations = item as IHasProductionLocations;
-
-            if (hasProductionLocations != null)
-            {
-                hasProductionLocations.ProductionLocations = request.ProductionLocations;
-            }
-
-            var person = item as Person;
-            if (person != null)
-            {
-                person.PlaceOfBirth = request.ProductionLocations == null
-                    ? null
-                    : request.ProductionLocations.FirstOrDefault();
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,9 +11,10 @@
     <AssemblyName>MediaBrowser.Api</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <ReleaseVersion>
     </ReleaseVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -156,18 +156,19 @@ private async Task<QueryResult<BaseItemDto>> GetSimilarItemsResult(BaseGetSimila
                 itemTypes.Add(typeof(LiveTvProgram).Name);
             }
 
+            var dtoOptions = GetDtoOptions(request);
+
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 Limit = request.Limit,
                 IncludeItemTypes = itemTypes.ToArray(),
                 IsMovie = true,
                 SimilarTo = item,
-                EnableGroupByMetadataKey = true
+                EnableGroupByMetadataKey = true,
+                Fields = dtoOptions.Fields
 
             }).ToList();
 
-            var dtoOptions = GetDtoOptions(request);
-
             var result = new QueryResult<BaseItemDto>
             {
                 Items = (await _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user).ConfigureAwait(false)).ToArray(),
@@ -198,7 +199,8 @@ private IEnumerable<RecommendationDto> GetRecommendationCategories(User user, st
                 Limit = 7,
                 ParentId = parentIdGuid,
                 Recursive = true,
-                IsPlayed = true
+                IsPlayed = true,
+                Fields = dtoOptions.Fields
             };
 
             var recentlyPlayedMovies = _libraryManager.GetItemList(query).ToList();
@@ -221,7 +223,8 @@ private IEnumerable<RecommendationDto> GetRecommendationCategories(User user, st
                 ExcludeItemIds = recentlyPlayedMovies.Select(i => i.Id.ToString("N")).ToArray(),
                 EnableGroupByMetadataKey = true,
                 ParentId = parentIdGuid,
-                Recursive = true
+                Recursive = true,
+                Fields = dtoOptions.Fields
 
             }).ToList();
 
@@ -302,7 +305,8 @@ private IEnumerable<RecommendationDto> GetWithDirector(User user, IEnumerable<st
                     PersonTypes = new[] { PersonType.Director },
                     IncludeItemTypes = itemTypes.ToArray(),
                     IsMovie = true,
-                    EnableGroupByMetadataKey = true
+                    EnableGroupByMetadataKey = true,
+                    Fields = dtoOptions.Fields
 
                 }).DistinctBy(i => i.GetProviderId(MetadataProviders.Imdb) ?? Guid.NewGuid().ToString("N"))
                 .Take(itemLimit)
@@ -339,7 +343,8 @@ private IEnumerable<RecommendationDto> GetWithActor(User user, IEnumerable<strin
                     Limit = itemLimit + 2,
                     IncludeItemTypes = itemTypes.ToArray(),
                     IsMovie = true,
-                    EnableGroupByMetadataKey = true
+                    EnableGroupByMetadataKey = true,
+                    Fields = dtoOptions.Fields
 
                 }).DistinctBy(i => i.GetProviderId(MetadataProviders.Imdb) ?? Guid.NewGuid().ToString("N"))
                 .Take(itemLimit)
@@ -375,7 +380,8 @@ private IEnumerable<RecommendationDto> GetSimilarTo(User user, List<BaseItem> ba
                     IncludeItemTypes = itemTypes.ToArray(),
                     IsMovie = true,
                     SimilarTo = item,
-                    EnableGroupByMetadataKey = true
+                    EnableGroupByMetadataKey = true,
+                    Fields = dtoOptions.Fields
 
                 }).ToList();
 

diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
@@ -46,7 +46,7 @@ public class GetPackages : IReturn<List<PackageInfo>>
         /// </summary>
         /// <value>The name.</value>
         [ApiMember(Name = "PackageType", Description = "Optional package type filter (System/UserInstalled)", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public PackageType? PackageType { get; set; }
+        public string PackageType { get; set; }
 
         [ApiMember(Name = "TargetSystems", Description = "Optional. Filter by target system type. Allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET", AllowMultiple = true)]
         public string TargetSystems { get; set; }
@@ -72,7 +72,7 @@ public class GetPackageVersionUpdates : IReturn<List<PackageVersionInfo>>
         /// </summary>
         /// <value>The name.</value>
         [ApiMember(Name = "PackageType", Description = "Package type filter (System/UserInstalled)", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public PackageType PackageType { get; set; }
+        public string PackageType { get; set; }
     }
 
     /// <summary>
@@ -149,12 +149,12 @@ public object Get(GetPackageVersionUpdates request)
         {
             var result = new List<PackageVersionInfo>();
 
-            if (request.PackageType == PackageType.UserInstalled || request.PackageType == PackageType.All)
+            if (string.Equals(request.PackageType, "UserInstalled", StringComparison.OrdinalIgnoreCase) || string.Equals(request.PackageType, "All", StringComparison.OrdinalIgnoreCase))
             {
                 result.AddRange(_installationManager.GetAvailablePluginUpdates(_appHost.ApplicationVersion, false, CancellationToken.None).Result.ToList());
             }
 
-            else if (request.PackageType == PackageType.System || request.PackageType == PackageType.All)
+            else if (string.Equals(request.PackageType, "System", StringComparison.OrdinalIgnoreCase) || string.Equals(request.PackageType, "All", StringComparison.OrdinalIgnoreCase))
             {
                 var updateCheckResult = _appHost.CheckForApplicationUpdate(CancellationToken.None, new Progress<double>()).Result;
 

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1857,9 +1857,6 @@ protected async Task<StreamState> GetState(StreamRequest request, CancellationTo
 
             state.IsInputVideo = string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase);
 
-            var archivable = item as IArchivable;
-            state.IsInputArchive = archivable != null && archivable.IsArchive;
-
             MediaSourceInfo mediaSource = null;
             if (string.IsNullOrWhiteSpace(request.LiveStreamId))
             {

diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
@@ -63,7 +63,6 @@ public bool IsOutputVideo
             get { return Request is VideoStreamRequest; }
         }
         public bool IsInputVideo { get; set; }
-        public bool IsInputArchive { get; set; }
 
         public VideoType VideoType { get; set; }
         public IsoType? IsoType { get; set; }

diff --git a/MediaBrowser.Api/Reports/Data/ReportBuilder.cs b/MediaBrowser.Api/Reports/Data/ReportBuilder.cs
@@ -517,10 +517,6 @@ private ReportOptions<BaseItem> GetOption(HeaderMetadata header, string sortFiel
                     internalHeader = HeaderMetadata.Album;
                     break;
 
-                case HeaderMetadata.Countries:
-                    option.Column = (i, r) => this.GetListAsString(this.GetObject<IHasProductionLocations, List<string>>(i, (x) => x.ProductionLocations));
-                    break;
-
                 case HeaderMetadata.Disc:
                     option.Column = (i, r) => i.ParentIndexNumber;
                     break;

diff --git a/MediaBrowser.Api/Reports/Stat/ReportStatBuilder.cs b/MediaBrowser.Api/Reports/Stat/ReportStatBuilder.cs
@@ -36,7 +36,6 @@ public ReportStatResult GetResult(BaseItem[] items, ReportIncludeItemTypes repor
             result = this.GetResultStudios(result, items, topItem);
             result = this.GetResultPersons(result, items, topItem);
             result = this.GetResultProductionYears(result, items, topItem);
-            result = this.GetResulProductionLocations(result, items, topItem);
             result = this.GetResultCommunityRatings(result, items, topItem);
             result = this.GetResultParentalRatings(result, items, topItem);
 
@@ -100,30 +99,6 @@ private void GetGroups(ReportStatResult result, string header, int topItem, IEnu
             }
         }
 
-        /// <summary> Gets resul production locations. </summary>
-        /// <param name="result"> The result. </param>
-        /// <param name="items"> The items. </param>
-        /// <param name="topItem"> The top item. </param>
-        /// <returns> The resul production locations. </returns>
-        private ReportStatResult GetResulProductionLocations(ReportStatResult result, BaseItem[] items, int topItem = 5)
-        {
-            this.GetGroups(result, GetLocalizedHeader(HeaderMetadata.Countries), topItem,
-                        items.OfType<IHasProductionLocations>()
-                        .Where(x => x.ProductionLocations != null)
-                        .SelectMany(x => x.ProductionLocations)
-                        .GroupBy(x => x)
-                        .OrderByDescending(x => x.Count())
-                        .Take(topItem)
-                        .Select(x => new ReportStatItem
-                        {
-                            Name = x.Key.ToString(),
-                            Value = x.Count().ToString()
-                        })
-            );
-
-            return result;
-        }
-
         /// <summary> Gets result community ratings. </summary>
         /// <param name="result"> The result. </param>
         /// <param name="items"> The items. </param>

diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -81,7 +81,8 @@ internal static async Task<QueryResult<BaseItemDto>> GetSimilarItemsResult(DtoOp
             var query = new InternalItemsQuery(user)
             {
                 IncludeItemTypes = includeTypes.Select(i => i.Name).ToArray(),
-                Recursive = true
+                Recursive = true,
+                Fields = dtoOptions.Fields
             };
 
             // ExcludeArtistIds

diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
@@ -117,6 +117,8 @@ private void SetWizardFinishValues(ServerConfiguration config)
             config.EnableFolderView = true;
             config.SchemaVersion = 109;
             config.EnableSimpleArtistDetection = true;
+            config.SkipDeserializationForBasicTypes = true;
+            config.SkipDeserializationForPrograms = true;
         }
 
         public void Post(UpdateStartupConfiguration request)

diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
@@ -302,19 +302,20 @@ private async Task<QueryResult<BaseItemDto>> GetSimilarItemsResult(BaseGetSimila
                 (!string.IsNullOrWhiteSpace(request.UserId) ? user.RootFolder :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
 
+            var dtoOptions = GetDtoOptions(request);
+
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 Limit = request.Limit,
                 IncludeItemTypes = new[]
                 {
                         typeof(Series).Name
                 },
-                SimilarTo = item
+                SimilarTo = item,
+                Fields = dtoOptions.Fields
 
             }).ToList();
 
-            var dtoOptions = GetDtoOptions(request);
-
             var result = new QueryResult<BaseItemDto>
             {
                 Items = (await _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user).ConfigureAwait(false)).ToArray(),
@@ -333,6 +334,8 @@ public async Task<object> Get(GetUpcomingEpisodes request)
 
             var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
 
+            var options = GetDtoOptions(request);
+
             var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
                 IncludeItemTypes = new[] { typeof(Episode).Name },
@@ -342,12 +345,11 @@ public async Task<object> Get(GetUpcomingEpisodes request)
                 StartIndex = request.StartIndex,
                 Limit = request.Limit,
                 ParentId = parentIdGuid,
-                Recursive = true
+                Recursive = true,
+                Fields = options.Fields
 
             }).ToList();
 
-            var options = GetDtoOptions(request);
-
             var returnItems = (await _dtoService.GetBaseItemDtos(itemsResult, options, user).ConfigureAwait(false)).ToArray();
 
             var result = new ItemsResult