Merge pull request #7346 from Bond-009/guid

Optimize Guid comparisons

1 files changed, 13 insertions, 14 deletions

diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.cs
index 37e6ae184..e28a50750 100644
--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -95,7 +95,9 @@ namespace Jellyfin.Api.Controllers
                 .AddClientFields(Request)
                 .AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);
 
-            User? user = userId.HasValue && userId != Guid.Empty ? _userManager.GetUserById(userId.Value) : null;
+            User? user = userId is null || userId.Value.Equals(default)
+                ? null
+                : _userManager.GetUserById(userId.Value);
 
             var parentItem = _libraryManager.GetParentItem(parentId, userId);
 
@@ -157,29 +159,26 @@ namespace Jellyfin.Api.Controllers
             var dtoOptions = new DtoOptions()
                 .AddClientFields(Request);
 
-            Genre item = new Genre();
-            if (genreName.IndexOf(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase) != -1)
+            Genre? item;
+            if (genreName.Contains(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase))
             {
-                var result = GetItemFromSlugName<Genre>(_libraryManager, genreName, dtoOptions, BaseItemKind.Genre);
-
-                if (result != null)
-                {
-                    item = result;
-                }
+                item = GetItemFromSlugName<Genre>(_libraryManager, genreName, dtoOptions, BaseItemKind.Genre);
             }
             else
             {
                 item = _libraryManager.GetGenre(genreName);
             }
 
-            if (userId.HasValue && !userId.Equals(Guid.Empty))
-            {
-                var user = _userManager.GetUserById(userId.Value);
+            item ??= new Genre();
 
-                return _dtoService.GetBaseItemDto(item, dtoOptions, user);
+            if (userId is null || userId.Value.Equals(default))
+            {
+                return _dtoService.GetBaseItemDto(item, dtoOptions);
             }
 
-            return _dtoService.GetBaseItemDto(item, dtoOptions);
+            var user = _userManager.GetUserById(userId.Value);
+
+            return _dtoService.GetBaseItemDto(item, dtoOptions, user);
         }
 
         private T? GetItemFromSlugName<T>(ILibraryManager libraryManager, string name, DtoOptions dtoOptions, BaseItemKind baseItemKind)