1 files changed, 16 insertions, 19 deletions
diff --git a/MediaBrowser.Controller/Entities/PeopleHelper.cs b/MediaBrowser.Controller/Entities/PeopleHelper.cs
index 8571bfcea..5292bd772 100644
--- a/MediaBrowser.Controller/Entities/PeopleHelper.cs
+++ b/MediaBrowser.Controller/Entities/PeopleHelper.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
@@ -12,48 +13,44 @@ namespace MediaBrowser.Controller.Entities
         public static void AddPerson(List<PersonInfo> people, PersonInfo person)
         {
             ArgumentNullException.ThrowIfNull(person);
-
-            if (string.IsNullOrEmpty(person.Name))
-            {
-                throw new ArgumentException("The person's name was empty or null.", nameof(person));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(person.Name);
 
             // Normalize
             if (string.Equals(person.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
             {
-                person.Type = PersonType.GuestStar;
+                person.Type = PersonKind.GuestStar;
             }
             else if (string.Equals(person.Role, PersonType.Director, StringComparison.OrdinalIgnoreCase))
             {
-                person.Type = PersonType.Director;
+                person.Type = PersonKind.Director;
             }
             else if (string.Equals(person.Role, PersonType.Producer, StringComparison.OrdinalIgnoreCase))
             {
-                person.Type = PersonType.Producer;
+                person.Type = PersonKind.Producer;
             }
             else if (string.Equals(person.Role, PersonType.Writer, StringComparison.OrdinalIgnoreCase))
             {
-                person.Type = PersonType.Writer;
+                person.Type = PersonKind.Writer;
             }
 
             // If the type is GuestStar and there's already an Actor entry, then update it to avoid dupes
-            if (string.Equals(person.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
+            if (person.Type == PersonKind.GuestStar)
             {
-                var existing = people.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase));
+                var existing = people.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type == PersonKind.Actor);
 
-                if (existing != null)
+                if (existing is not null)
                 {
-                    existing.Type = PersonType.GuestStar;
+                    existing.Type = PersonKind.GuestStar;
                     MergeExisting(existing, person);
                     return;
                 }
             }
 
-            if (string.Equals(person.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase))
+            if (person.Type == PersonKind.Actor)
             {
                 // If the actor already exists without a role and we have one, fill it in
-                var existing = people.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && (p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase) || p.Type.Equals(PersonType.GuestStar, StringComparison.OrdinalIgnoreCase)));
-                if (existing == null)
+                var existing = people.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && (p.Type == PersonKind.Actor || p.Type == PersonKind.GuestStar));
+                if (existing is null)
                 {
                     // Wasn't there - add it
                     people.Add(person);
@@ -72,11 +69,11 @@ namespace MediaBrowser.Controller.Entities
             else
             {
                 var existing = people.FirstOrDefault(p =>
-                            string.Equals(p.Name, person.Name, StringComparison.OrdinalIgnoreCase) &&
-                            string.Equals(p.Type, person.Type, StringComparison.OrdinalIgnoreCase));
+                    string.Equals(p.Name, person.Name, StringComparison.OrdinalIgnoreCase)
+                    && p.Type == person.Type);
 
                 // Check for dupes based on the combination of Name and Type
-                if (existing == null)
+                if (existing is null)
                 {
                     people.Add(person);
                 }