From f6769b73f2a82273e67689e8bc1c9d7b005ee866 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 20 Sep 2014 11:48:23 -0400
Subject: add MediaInfo to improve media analysis for video files

---
 MediaBrowser.Api/UserLibrary/ItemsService.cs       | 11 +-------
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs | 29 ++++++++++------------
 2 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'MediaBrowser.Api/UserLibrary')

diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 25821c2132..2ac4f5e636 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -1008,7 +1008,7 @@ namespace MediaBrowser.Api.UserLibrary
 
                 items = items.Where(i =>
                 {
-                    var movie = i as Movie;
+                    var movie = i as IHasSpecialFeatures;
 
                     if (movie != null)
                     {
@@ -1017,15 +1017,6 @@ namespace MediaBrowser.Api.UserLibrary
                                    : movie.SpecialFeatureIds.Count == 0;
                     }
 
-                    var series = i as Series;
-
-                    if (series != null)
-                    {
-                        return filterValue
-                                   ? series.SpecialFeatureIds.Count > 0
-                                   : series.SpecialFeatureIds.Count == 0;
-                    }
-
                     return false;
                 });
             }
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 8414241d5e..b156b68d1a 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -443,22 +443,6 @@ namespace MediaBrowser.Api.UserLibrary
             // Get everything
             var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
 
-            var movie = item as Movie;
-
-            // Get them from the db
-            if (movie != null)
-            {
-                // Avoid implicitly captured closure
-                var movie1 = movie;
-
-                var dtos = movie.SpecialFeatureIds
-                    .Select(_libraryManager.GetItemById)
-                    .OrderBy(i => i.SortName)
-                    .Select(i => _dtoService.GetBaseItemDto(i, fields, user, movie1));
-
-                return dtos.ToList();
-            }
-
             var series = item as Series;
 
             // Get them from the child tree
@@ -486,6 +470,19 @@ namespace MediaBrowser.Api.UserLibrary
                 return dtos.ToList();
             }
 
+            var movie = item as IHasSpecialFeatures;
+
+            // Get them from the db
+            if (movie != null)
+            {
+                var dtos = movie.SpecialFeatureIds
+                    .Select(_libraryManager.GetItemById)
+                    .OrderBy(i => i.SortName)
+                    .Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
+
+                return dtos.ToList();
+            }
+
             return new List<BaseItemDto>();
         }
 
-- 
cgit v1.2.3