From 1dd6442e89ee93127b475e820cca64c804f178ea Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Fri, 6 Oct 2023 16:43:50 -0400
Subject: [PATCH] Use extension methods in GetPersonFromXmlNode

---
 .../Extensions/XmlReaderExtensions.cs         | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs b/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
index 1b3fa9d239..6be760b2fa 100644
--- a/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
@@ -122,16 +122,11 @@ public static class XmlReaderExtensions
             {
                 case "name":
                 case "Name":
-                    name = subtree.ReadElementContentAsString();
+                    name = subtree.ReadNormalizedString();
                     break;
                 case "role":
                 case "Role":
-                    var roleValue = subtree.ReadElementContentAsString();
-                    if (!string.IsNullOrWhiteSpace(roleValue))
-                    {
-                        role = roleValue;
-                    }
-
+                    role = subtree.ReadNormalizedString();
                     break;
                 case "type":
                 case "Type":
@@ -140,23 +135,14 @@ public static class XmlReaderExtensions
                 case "order":
                 case "sortorder":
                 case "SortOrder":
-                    if (int.TryParse(
-                        subtree.ReadElementContentAsString(),
-                        NumberStyles.Integer,
-                        CultureInfo.InvariantCulture,
-                        out var intVal))
+                    if (subtree.TryReadInt(out var sortOrderVal))
                     {
-                        sortOrder = intVal;
+                        sortOrder = sortOrderVal;
                     }
 
                     break;
                 case "thumb":
-                    var thumb = subtree.ReadElementContentAsString();
-                    if (!string.IsNullOrWhiteSpace(thumb))
-                    {
-                        imageUrl = thumb;
-                    }
-
+                    imageUrl = subtree.ReadNormalizedString();
                     break;
                 default:
                     subtree.Skip();