mirror
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid constant arrays as arguments (#14784)

This commit is contained in:
Bond-009 2025-09-12 21:58:28 +02:00 committed by GitHub
parent 8776a447d1
commit 6796b3435d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.editorconfig
View File

@ -294,6 +294,9 @@ dotnet_diagnostic.CA1854.severity = error
# error on CA1860: Avoid using 'Enumerable.Any()' extension method # error on CA1860: Avoid using 'Enumerable.Any()' extension method
dotnet_diagnostic.CA1860.severity = error dotnet_diagnostic.CA1860.severity = error
# error on CA1861: Avoid constant arrays as arguments
dotnet_diagnostic.CA1861.severity = error
# error on CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons # error on CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
dotnet_diagnostic.CA1862.severity = error dotnet_diagnostic.CA1862.severity = error

8
MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
View File

@ -167,12 +167,12 @@ public static class XmlReaderExtensions
// Only split by comma if there is no pipe in the string // Only split by comma if there is no pipe in the string
// We have to be careful to not split names like Matthew, Jr. // We have to be careful to not split names like Matthew, Jr.
var separator = !value.Contains('|', StringComparison.Ordinal) ReadOnlySpan<char> separator = !value.Contains('|', StringComparison.Ordinal)
&& !value.Contains(';', StringComparison.Ordinal) && !value.Contains(';', StringComparison.Ordinal)
? new[] { ',' } ? stackalloc[] { ',' }
: new[] { '|', ';' }; : stackalloc[] { '|', ';' };
foreach (var part in value.Trim().Trim(separator).Split(separator)) foreach (var part in value.AsSpan().Trim().Trim(separator).ToString().Split(separator))
{ {
if (!string.IsNullOrWhiteSpace(part)) if (!string.IsNullOrWhiteSpace(part))
{ {

15
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
@ -22,6 +21,8 @@ namespace MediaBrowser.Controller.MediaEncoding
// For now, a common base class until the API and MediaEncoding classes are unified // For now, a common base class until the API and MediaEncoding classes are unified
public class EncodingJobInfo public class EncodingJobInfo
{ {
private static readonly char[] _separators = ['|', ','];
public int? OutputAudioBitrate; public int? OutputAudioBitrate;
public int? OutputAudioChannels; public int? OutputAudioChannels;
@ -586,7 +587,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (!string.IsNullOrEmpty(BaseRequest.Profile)) if (!string.IsNullOrEmpty(BaseRequest.Profile))
{ {
return BaseRequest.Profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return BaseRequest.Profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
if (!string.IsNullOrEmpty(codec)) if (!string.IsNullOrEmpty(codec))
@ -595,7 +596,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!string.IsNullOrEmpty(profile)) if (!string.IsNullOrEmpty(profile))
{ {
return profile.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return profile.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
} }
@ -606,7 +607,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType)) if (!string.IsNullOrEmpty(BaseRequest.VideoRangeType))
{ {
return BaseRequest.VideoRangeType.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return BaseRequest.VideoRangeType.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
if (!string.IsNullOrEmpty(codec)) if (!string.IsNullOrEmpty(codec))
@ -615,7 +616,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!string.IsNullOrEmpty(rangetype)) if (!string.IsNullOrEmpty(rangetype))
{ {
return rangetype.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return rangetype.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
} }
@ -626,7 +627,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (!string.IsNullOrEmpty(BaseRequest.CodecTag)) if (!string.IsNullOrEmpty(BaseRequest.CodecTag))
{ {
return BaseRequest.CodecTag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return BaseRequest.CodecTag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
if (!string.IsNullOrEmpty(codec)) if (!string.IsNullOrEmpty(codec))
@ -635,7 +636,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (!string.IsNullOrEmpty(codectag)) if (!string.IsNullOrEmpty(codectag))
{ {
return codectag.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); return codectag.Split(_separators, StringSplitOptions.RemoveEmptyEntries);
} }
} }

14
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -30,9 +30,11 @@ namespace MediaBrowser.MediaEncoding.Probing
private const string ArtistReplaceValue = " | "; private const string ArtistReplaceValue = " | ";
private readonly char[] _nameDelimiters = { '/', '|', ';', '\\' }; private static readonly char[] _basicDelimiters = ['/', ';'];
private readonly string[] _webmVideoCodecs = { "av1", "vp8", "vp9" }; private static readonly char[] _nameDelimiters = [.. _basicDelimiters, '|', '\\'];
private readonly string[] _webmAudioCodecs = { "opus", "vorbis" }; private static readonly char[] _genreDelimiters = [.. _basicDelimiters, ','];
private static readonly string[] _webmVideoCodecs = ["av1", "vp8", "vp9"];
private static readonly string[] _webmAudioCodecs = ["opus", "vorbis"];
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ILocalizationManager _localization; private readonly ILocalizationManager _localization;
@ -174,7 +176,7 @@ namespace MediaBrowser.MediaEncoding.Probing
if (tags.TryGetValue("artists", out var artists) && !string.IsNullOrWhiteSpace(artists)) if (tags.TryGetValue("artists", out var artists) && !string.IsNullOrWhiteSpace(artists))
{ {
info.Artists = SplitDistinctArtists(artists, new[] { '/', ';' }, false).ToArray(); info.Artists = SplitDistinctArtists(artists, _basicDelimiters, false).ToArray();
} }
else else
{ {
@ -1552,7 +1554,7 @@ namespace MediaBrowser.MediaEncoding.Probing
if (tags.TryGetValue("WM/Genre", out var genres) && !string.IsNullOrWhiteSpace(genres)) if (tags.TryGetValue("WM/Genre", out var genres) && !string.IsNullOrWhiteSpace(genres))
{ {
var genreList = genres.Split(new[] { ';', '/', ',' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); var genreList = genres.Split(_genreDelimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
// If this is empty then don't overwrite genres that might have been fetched earlier // If this is empty then don't overwrite genres that might have been fetched earlier
if (genreList.Length > 0) if (genreList.Length > 0)
@ -1569,7 +1571,7 @@ namespace MediaBrowser.MediaEncoding.Probing
if (tags.TryGetValue("WM/MediaCredits", out var people) && !string.IsNullOrEmpty(people)) if (tags.TryGetValue("WM/MediaCredits", out var people) && !string.IsNullOrEmpty(people))
{ {
video.People = Array.ConvertAll( video.People = Array.ConvertAll(
people.Split(new[] { ';', '/' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries), people.Split(_basicDelimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries),
i => new BaseItemPerson { Name = i, Type = PersonKind.Actor }); i => new BaseItemPerson { Name = i, Type = PersonKind.Actor });
} }

7
src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
View File

@ -200,8 +200,7 @@ namespace Jellyfin.LiveTv.TunerHosts
var numberIndex = nameInExtInf.IndexOf(' '); var numberIndex = nameInExtInf.IndexOf(' ');
if (numberIndex > 0) if (numberIndex > 0)
{ {
var numberPart = nameInExtInf.Slice(0, numberIndex).Trim(new[] { ' ', '.' }); var numberPart = nameInExtInf[..numberIndex].Trim(stackalloc[] { ' ', '.' });
if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _)) if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _))
{ {
numberString = numberPart.ToString(); numberString = numberPart.ToString();
@ -273,12 +272,12 @@ namespace Jellyfin.LiveTv.TunerHosts
var numberIndex = nameInExtInf.IndexOf(' ', StringComparison.Ordinal); var numberIndex = nameInExtInf.IndexOf(' ', StringComparison.Ordinal);
if (numberIndex > 0) if (numberIndex > 0)
{ {
var numberPart = nameInExtInf.AsSpan(0, numberIndex).Trim(new[] { ' ', '.' }); var numberPart = nameInExtInf.AsSpan(0, numberIndex).Trim(stackalloc[] { ' ', '.' });
if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _)) if (double.TryParse(numberPart, CultureInfo.InvariantCulture, out _))
{ {
// channel.Number = number.ToString(); // channel.Number = number.ToString();
nameInExtInf = nameInExtInf.AsSpan(numberIndex + 1).Trim(new[] { ' ', '-' }).ToString(); nameInExtInf = nameInExtInf.AsSpan(numberIndex + 1).Trim(stackalloc[] { ' ', '-' }).ToString();
} }
} }
} }