From a515ecbada489bb79e8bcce6fd1aabe6d81ce235 Mon Sep 17 00:00:00 2001 From: crobibero Date: Mon, 14 Dec 2020 07:53:56 -0700 Subject: [PATCH] Use range operator to get subarray --- Jellyfin.Data/Entities/User.cs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs index cc85a0b85d..725531a7d8 100644 --- a/Jellyfin.Data/Entities/User.cs +++ b/Jellyfin.Data/Entities/User.cs @@ -430,14 +430,17 @@ namespace Jellyfin.Data.Entities // Convert array of {string} to array of {T} var converter = TypeDescriptor.GetConverter(typeof(T)); var stringValues = val.Split(Delimiter); - var parsedValues = new object[stringValues.Length]; var convertedCount = 0; + var parsedValues = new T[stringValues.Length]; for (var i = 0; i < stringValues.Length; i++) { try { - parsedValues[i] = converter.ConvertFromString(stringValues[i].Trim()); - convertedCount++; + var parsedValue = converter.ConvertFromString(stringValues[i].Trim()); + if (parsedValue != null) + { + parsedValues.SetValue(parsedValue, convertedCount++); + } } catch (FormatException) { @@ -445,18 +448,7 @@ namespace Jellyfin.Data.Entities } } - var typedValues = new T[convertedCount]; - var typedValueIndex = 0; - for (var i = 0; i < parsedValues.Length; i++) - { - if (parsedValues[i] != null) - { - typedValues.SetValue(parsedValues[i], typedValueIndex); - typedValueIndex++; - } - } - - return typedValues; + return parsedValues[..convertedCount]; } ///