From e1958e3902ae81931c82a31f355cefc2b02a8a2d Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sun, 5 Apr 2020 15:56:08 -0400
Subject: Miscellaneous code cleanup

---
 MediaBrowser.Api/Library/LibraryService.cs | 75 +++++++-----------------------
 1 file changed, 17 insertions(+), 58 deletions(-)

(limited to 'MediaBrowser.Api/Library/LibraryService.cs')

diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 291242e45..9251343e8 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -544,8 +544,7 @@ namespace MediaBrowser.Api.Library
 
             foreach (var type in types)
             {
-                ImageOption[] defaultImageOptions = null;
-                TypeOptions.DefaultImageOptions.TryGetValue(type, out defaultImageOptions);
+                TypeOptions.DefaultImageOptions.TryGetValue(type, out var defaultImageOptions);
 
                 typeOptions.Add(new LibraryTypeOptions
                 {
@@ -592,8 +591,6 @@ namespace MediaBrowser.Api.Library
 
         public object Get(GetSimilarItems request)
         {
-            var user = !request.UserId.Equals(Guid.Empty) ? _userManager.GetUserById(request.UserId) : null;
-
             var item = string.IsNullOrEmpty(request.Id) ?
                 (!request.UserId.Equals(Guid.Empty) ? _libraryManager.GetUserRootFolder() :
                 _libraryManager.RootFolder) : _libraryManager.GetItemById(request.Id);
@@ -651,7 +648,7 @@ namespace MediaBrowser.Api.Library
             // ExcludeArtistIds
             if (!string.IsNullOrEmpty(request.ExcludeArtistIds))
             {
-                query.ExcludeArtistIds = BaseApiService.GetGuids(request.ExcludeArtistIds);
+                query.ExcludeArtistIds = GetGuids(request.ExcludeArtistIds);
             }
 
             List<BaseItem> itemsResult;
@@ -672,7 +669,6 @@ namespace MediaBrowser.Api.Library
             var result = new QueryResult<BaseItemDto>
             {
                 Items = returnList,
-
                 TotalRecordCount = itemsResult.Count
             };
 
@@ -1075,36 +1071,18 @@ namespace MediaBrowser.Api.Library
                 throw new ResourceNotFoundException("Item not found.");
             }
 
-            BaseItem[] themeItems = Array.Empty<BaseItem>();
+            IEnumerable<BaseItem> themeItems = item.GetThemeSongs();
 
-            while (true)
+            while (!themeItems.Any() && request.InheritFromParent && item.GetParent() != null)
             {
-                themeItems = item.GetThemeSongs().ToArray();
-
-                if (themeItems.Length > 0)
-                {
-                    break;
-                }
-
-                if (!request.InheritFromParent)
-                {
-                    break;
-                }
-
-                var parent = item.GetParent();
-                if (parent == null)
-                {
-                    break;
-                }
-                item = parent;
+                item = item.GetParent();
+                themeItems = item.GetThemeSongs();
             }
 
             var dtoOptions = GetDtoOptions(_authContext, request);
-
-            var dtos = themeItems
-                            .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
-
-            var items = dtos.ToArray();
+            var items = themeItems
+                .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item))
+                .ToArray();
 
             return new ThemeMediaResult
             {
@@ -1121,9 +1099,7 @@ namespace MediaBrowser.Api.Library
         /// <returns>System.Object.</returns>
         public object Get(GetThemeVideos request)
         {
-            var result = GetThemeVideos(request);
-
-            return ToOptimizedResult(result);
+            return ToOptimizedResult(GetThemeVideos(request));
         }
 
         public ThemeMediaResult GetThemeVideos(GetThemeVideos request)
@@ -1141,36 +1117,19 @@ namespace MediaBrowser.Api.Library
                 throw new ResourceNotFoundException("Item not found.");
             }
 
-            BaseItem[] themeItems = Array.Empty<BaseItem>();
+            IEnumerable<BaseItem> themeItems = item.GetThemeVideos();
 
-            while (true)
+            while (!themeItems.Any() && request.InheritFromParent && item.GetParent() != null)
             {
-                themeItems = item.GetThemeVideos().ToArray();
-
-                if (themeItems.Length > 0)
-                {
-                    break;
-                }
-
-                if (!request.InheritFromParent)
-                {
-                    break;
-                }
-
-                var parent = item.GetParent();
-                if (parent == null)
-                {
-                    break;
-                }
-                item = parent;
+                item = item.GetParent();
+                themeItems = item.GetThemeVideos();
             }
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
-            var dtos = themeItems
-                            .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
-
-            var items = dtos.ToArray();
+            var items = themeItems
+                .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item))
+                .ToArray();
 
             return new ThemeMediaResult
             {
-- 
cgit v1.2.3