lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
David 2021-03-18 11:25:58 +01:00
parent 14cbd22fbe
commit 840eeff2af
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MediaBrowser.Common/Providers/ProviderIdParsers.cs
View File

@ -10,6 +10,9 @@ namespace MediaBrowser.Common.Providers
/// </summary>
public static class ProviderIdParsers
{
private const int ImdbMinNumbers = 7;
private const int ImdbMaxNumbers = 8;
/// <summary>
/// Parses an IMDb id from a string.
/// </summary>
@ -21,7 +24,8 @@ namespace MediaBrowser.Common.Providers
var span = text.AsSpan();
var tt = "tt".AsSpan();
while (true)
// imdb id is at least 9 chars (tt + 7 numbers)
while (span.Length >= 2 + ImdbMinNumbers)
{
var ttPos = span.IndexOf(tt);
if (ttPos == -1)
@ -31,27 +35,28 @@ namespace MediaBrowser.Common.Providers
}
span = span.Slice(ttPos + tt.Length);
int i = 0;
// IMDb id has a maximum of 8 digits
int max = span.Length > 8 ? 8 : span.Length;
for (; i < max; i++)
var i = 0;
for (; i < Math.Min(span.Length, ImdbMaxNumbers); i++)
{
var c = span[i];
if (c < '0' || c > '9')
if (!IsDigit(c))
{
break;
}
}
// IMDb id has a minimum of 7 digits
if (i >= 7)
// skip if more than 8 digits
if (i <= ImdbMaxNumbers && i >= ImdbMinNumbers)
{
imdbId = string.Concat(tt, span.Slice(0, i));
return true;
}
span = span.Slice(i);
}
imdbId = default;
return false;
}
/// <summary>
@ -86,8 +91,6 @@ namespace MediaBrowser.Common.Providers
var span = text.AsSpan();
var searchSpan = searchString.AsSpan();
while (true)
{
var searchPos = span.IndexOf(searchSpan);
if (searchPos == -1)
{
@ -102,7 +105,7 @@ namespace MediaBrowser.Common.Providers
{
var c = span[i];
if (c < '0' || c > '9')
if (!IsDigit(c))
{
break;
}
@ -113,7 +116,14 @@ namespace MediaBrowser.Common.Providers
providerId = span.Slice(0, i).ToString();
return true;
}
}
providerId = default;
return false;
}
private static bool IsDigit(char c)
{
return c >= '0' && c <= '9';
}
}
}

1
tests/Jellyfin.Common.Tests/Providers/ProviderIdParserTests.cs
View File

@ -17,6 +17,7 @@ namespace Jellyfin.Common.Tests.Providers
[InlineData("Jellyfin", false, null)]
[InlineData("tt1234567tt7654321", true, "tt1234567")]
[InlineData("tt12345678tt7654321", true, "tt12345678")]
[InlineData("tt123456789", true, "tt12345678")]
public void Parse_Imdb(string text, bool shouldSucceed, string? imdbId)
{
var succeeded = ProviderIdParsers.TryParseImdbId(text, out string? parsedId);