alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

do not throw ArgumentNullException in TryCleanString

Browse Source
This commit is contained in:
cvium
2021-03-07 22:49:31 +01:00
parent 8615847a8a
commit e0db17a935
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Emby.Naming/Video/CleanStringParser.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text.RegularExpressions;
namespace Emby.Naming.Video
@@ -16,7 +17,7 @@ namespace Emby.Naming.Video
/// <param name="expressions">List of regex to parse name and year from.</param>
/// <param name="newName">Parsing result string.</param>
/// <returns>True if parsing was successful.</returns>
public static bool TryClean(string name, IReadOnlyList<Regex> expressions, out ReadOnlySpan<char> newName)
public static bool TryClean(string name, IReadOnlyList<Regex> expressions, [NotNullWhen(true)] out ReadOnlySpan<char> newName)
{
var len = expressions.Count;
for (int i = 0; i < len; i++)
@@ -31,8 +32,14 @@ namespace Emby.Naming.Video
return false;
}
private static bool TryClean(string name, Regex expression, out ReadOnlySpan<char> newName)
private static bool TryClean(string name, Regex expression, [NotNullWhen(true)] out ReadOnlySpan<char> newName)
{
if (string.IsNullOrEmpty(name))
{
newName = null;
return false;
}
var match = expression.Match(name);
int index = match.Index;
if (match.Success && index != 0)