Browse Source

removed dead code

Luke Pulverenti 9 years ago
parent
commit
6db7f381dc

+ 6 - 12
MediaBrowser.Api/Movies/MoviesService.cs

@@ -135,12 +135,9 @@ namespace MediaBrowser.Api.Movies
                 IncludeItemTypes = new[] { typeof(Movie).Name }
             };
 
-            if (user.Configuration.IncludeTrailersInSuggestions)
-            {
-                var includeList = query.IncludeItemTypes.ToList();
-                includeList.Add(typeof(Trailer).Name);
-                query.IncludeItemTypes = includeList.ToArray();
-            }
+            var includeList = query.IncludeItemTypes.ToList();
+            includeList.Add(typeof(Trailer).Name);
+            query.IncludeItemTypes = includeList.ToArray();
 
             var parentIds = string.IsNullOrWhiteSpace(request.ParentId) ? new string[] { } : new[] { request.ParentId };
             var movies = _libraryManager.GetItemList(query, parentIds)
@@ -188,12 +185,9 @@ namespace MediaBrowser.Api.Movies
                 IncludeItemTypes = new[] { typeof(Movie).Name }
             };
 
-            if (user == null || user.Configuration.IncludeTrailersInSuggestions)
-            {
-                var includeList = query.IncludeItemTypes.ToList();
-                includeList.Add(typeof(Trailer).Name);
-                query.IncludeItemTypes = includeList.ToArray();
-            }
+            var includeList = query.IncludeItemTypes.ToList();
+            includeList.Add(typeof(Trailer).Name);
+            query.IncludeItemTypes = includeList.ToArray();
 
             var list = _libraryManager.GetItemList(query)
                 .OrderBy(i => (int)i.SourceType)

+ 0 - 4
MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -39,8 +39,6 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] OrderedViews { get; set; }
 
-        public bool IncludeTrailersInSuggestions { get; set; }
-
         public string[] LatestItemsExcludes { get; set; }
         public string[] PlainFolderViews { get; set; }
 
@@ -68,8 +66,6 @@ namespace MediaBrowser.Model.Configuration
 
             PlainFolderViews = new string[] { };
 
-            IncludeTrailersInSuggestions = true;
-
             GroupedFolders = new string[] { };
         }
     }