mirror of https://github.com/jellyfin/jellyfin.git
rename to SplitEnumerator and fix test
This commit is contained in:
parent
b9d18f0fa7
commit
c0feb3694b
|
@ -1082,7 +1082,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ItemImageInfo ItemImageInfoFromValueString(ReadOnlySpan<char> value)
|
internal ItemImageInfo ItemImageInfoFromValueString(ReadOnlySpan<char> value)
|
||||||
{
|
{
|
||||||
var nextSegment = value.IndexOf('*');
|
var nextSegment = value.IndexOf('*');
|
||||||
if (nextSegment == -1)
|
if (nextSegment == -1)
|
||||||
|
@ -1103,7 +1103,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
nextSegment = value.IndexOf('*');
|
nextSegment = value.IndexOf('*');
|
||||||
if (nextSegment == -1)
|
if (nextSegment == -1)
|
||||||
{
|
{
|
||||||
return null;
|
nextSegment = value.Length;
|
||||||
}
|
}
|
||||||
|
|
||||||
ReadOnlySpan<char> imageType = value[..nextSegment];
|
ReadOnlySpan<char> imageType = value[..nextSegment];
|
||||||
|
@ -1128,13 +1128,18 @@ namespace Emby.Server.Implementations.Data
|
||||||
{
|
{
|
||||||
value = value[(nextSegment + 1)..];
|
value = value[(nextSegment + 1)..];
|
||||||
nextSegment = value.IndexOf('*');
|
nextSegment = value.IndexOf('*');
|
||||||
|
if (nextSegment == -1 || nextSegment == value.Length)
|
||||||
|
{
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
ReadOnlySpan<char> widthSpan = value[..nextSegment];
|
ReadOnlySpan<char> widthSpan = value[..nextSegment];
|
||||||
|
|
||||||
value = value[(nextSegment + 1)..];
|
value = value[(nextSegment + 1)..];
|
||||||
nextSegment = value.IndexOf('*');
|
nextSegment = value.IndexOf('*');
|
||||||
if (nextSegment == -1)
|
if (nextSegment == -1)
|
||||||
{
|
{
|
||||||
return image;
|
nextSegment = value.Length;
|
||||||
}
|
}
|
||||||
|
|
||||||
ReadOnlySpan<char> heightSpan = value[..nextSegment];
|
ReadOnlySpan<char> heightSpan = value[..nextSegment];
|
||||||
|
@ -1146,10 +1151,9 @@ namespace Emby.Server.Implementations.Data
|
||||||
image.Height = height;
|
image.Height = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
nextSegment += 1;
|
|
||||||
if (nextSegment < value.Length - 1)
|
if (nextSegment < value.Length - 1)
|
||||||
{
|
{
|
||||||
value = value[nextSegment..];
|
value = value[(nextSegment + 1)..];
|
||||||
var length = value.Length;
|
var length = value.Length;
|
||||||
|
|
||||||
Span<char> blurHashSpan = stackalloc char[length];
|
Span<char> blurHashSpan = stackalloc char[length];
|
||||||
|
|
|
@ -33,33 +33,33 @@ namespace MediaBrowser.Common.Extensions
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Extension class for splitting lines without unnecessary allocations.
|
/// Extension class for splitting lines without unnecessary allocations.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class SplitLinesStringExtensions
|
public static class SplitStringExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates a new line split enumerator.
|
/// Creates a new string split enumerator.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="str">The string to split.</param>
|
/// <param name="str">The string to split.</param>
|
||||||
/// <param name="separator">The separator to split on.</param>
|
/// <param name="separator">The separator to split on.</param>
|
||||||
/// <returns>The enumerator struct.</returns>
|
/// <returns>The enumerator struct.</returns>
|
||||||
[Pure]
|
[Pure]
|
||||||
public static LineSplitEnumerator SpanSplit(this string str, char separator) => new (str.AsSpan(), separator);
|
public static SplitEnumerator SpanSplit(this string str, char separator) => new (str.AsSpan(), separator);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates a new line split enumerator.
|
/// Creates a new span split enumerator.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="str">The span to split.</param>
|
/// <param name="str">The span to split.</param>
|
||||||
/// <param name="separator">The separator to split on.</param>
|
/// <param name="separator">The separator to split on.</param>
|
||||||
/// <returns>The enumerator struct.</returns>
|
/// <returns>The enumerator struct.</returns>
|
||||||
[Pure]
|
[Pure]
|
||||||
public static LineSplitEnumerator Split(this ReadOnlySpan<char> str, char separator) => new (str, separator);
|
public static SplitEnumerator Split(this ReadOnlySpan<char> str, char separator) => new (str, separator);
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Auto)]
|
[StructLayout(LayoutKind.Auto)]
|
||||||
public ref struct LineSplitEnumerator
|
public ref struct SplitEnumerator
|
||||||
{
|
{
|
||||||
private readonly char _separator;
|
private readonly char _separator;
|
||||||
private ReadOnlySpan<char> _str;
|
private ReadOnlySpan<char> _str;
|
||||||
|
|
||||||
public LineSplitEnumerator(ReadOnlySpan<char> str, char separator)
|
public SplitEnumerator(ReadOnlySpan<char> str, char separator)
|
||||||
{
|
{
|
||||||
_str = str;
|
_str = str;
|
||||||
_separator = separator;
|
_separator = separator;
|
||||||
|
@ -68,7 +68,7 @@ namespace MediaBrowser.Common.Extensions
|
||||||
|
|
||||||
public ReadOnlySpan<char> Current { get; private set; }
|
public ReadOnlySpan<char> Current { get; private set; }
|
||||||
|
|
||||||
public readonly LineSplitEnumerator GetEnumerator() => this;
|
public readonly SplitEnumerator GetEnumerator() => this;
|
||||||
|
|
||||||
public bool MoveNext()
|
public bool MoveNext()
|
||||||
{
|
{
|
|
@ -37,7 +37,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
|
||||||
yield return new object[]
|
yield return new object[]
|
||||||
{
|
{
|
||||||
"/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg*637452096478512963*Primary*1920*1080*WjQbtJtSO8nhNZ%L_Io#R/oaS6o}-;adXAoIn7j[%hW9s:WGw[nN",
|
"/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg*637452096478512963*Primary*1920*1080*WjQbtJtSO8nhNZ%L_Io#R/oaS6o}-;adXAoIn7j[%hW9s:WGw[nN",
|
||||||
new ItemImageInfo()
|
new ItemImageInfo
|
||||||
{
|
{
|
||||||
Path = "/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg",
|
Path = "/mnt/series/Family Guy/Season 1/Family Guy - S01E01-thumb.jpg",
|
||||||
Type = ImageType.Primary,
|
Type = ImageType.Primary,
|
||||||
|
@ -51,7 +51,27 @@ namespace Jellyfin.Server.Implementations.Tests.Data
|
||||||
yield return new object[]
|
yield return new object[]
|
||||||
{
|
{
|
||||||
"https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary*0*0",
|
"https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary*0*0",
|
||||||
new ItemImageInfo()
|
new ItemImageInfo
|
||||||
|
{
|
||||||
|
Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
|
||||||
|
Type = ImageType.Primary,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
yield return new object[]
|
||||||
|
{
|
||||||
|
"https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary",
|
||||||
|
new ItemImageInfo
|
||||||
|
{
|
||||||
|
Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
|
||||||
|
Type = ImageType.Primary,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
yield return new object[]
|
||||||
|
{
|
||||||
|
"https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0*Primary*600",
|
||||||
|
new ItemImageInfo
|
||||||
{
|
{
|
||||||
Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
|
Path = "https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg",
|
||||||
Type = ImageType.Primary,
|
Type = ImageType.Primary,
|
||||||
|
@ -61,7 +81,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
|
||||||
yield return new object[]
|
yield return new object[]
|
||||||
{
|
{
|
||||||
"%MetadataPath%/library/68/68578562b96c80a7ebd530848801f645/poster.jpg*637264380567586027*Primary*600*336",
|
"%MetadataPath%/library/68/68578562b96c80a7ebd530848801f645/poster.jpg*637264380567586027*Primary*600*336",
|
||||||
new ItemImageInfo()
|
new ItemImageInfo
|
||||||
{
|
{
|
||||||
Path = "/meta/data/path/library/68/68578562b96c80a7ebd530848801f645/poster.jpg",
|
Path = "/meta/data/path/library/68/68578562b96c80a7ebd530848801f645/poster.jpg",
|
||||||
Type = ImageType.Primary,
|
Type = ImageType.Primary,
|
||||||
|
@ -76,7 +96,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
|
||||||
[MemberData(nameof(ItemImageInfoFromValueString_Valid_TestData))]
|
[MemberData(nameof(ItemImageInfoFromValueString_Valid_TestData))]
|
||||||
public void ItemImageInfoFromValueString_Valid_Success(string value, ItemImageInfo expected)
|
public void ItemImageInfoFromValueString_Valid_Success(string value, ItemImageInfo expected)
|
||||||
{
|
{
|
||||||
var result = _sqliteItemRepository.ItemImageInfoFromValueString(value);
|
var result = _sqliteItemRepository.ItemImageInfoFromValueString(value.AsSpan());
|
||||||
Assert.Equal(expected.Path, result.Path);
|
Assert.Equal(expected.Path, result.Path);
|
||||||
Assert.Equal(expected.Type, result.Type);
|
Assert.Equal(expected.Type, result.Type);
|
||||||
Assert.Equal(expected.DateModified, result.DateModified);
|
Assert.Equal(expected.DateModified, result.DateModified);
|
||||||
|
@ -88,9 +108,10 @@ namespace Jellyfin.Server.Implementations.Tests.Data
|
||||||
[Theory]
|
[Theory]
|
||||||
[InlineData("")]
|
[InlineData("")]
|
||||||
[InlineData("*")]
|
[InlineData("*")]
|
||||||
|
[InlineData("https://image.tmdb.org/t/p/original/zhB5CHEgqqh4wnEqDNJLfWXJlcL.jpg*0")]
|
||||||
public void ItemImageInfoFromValueString_Invalid_Null(string value)
|
public void ItemImageInfoFromValueString_Invalid_Null(string value)
|
||||||
{
|
{
|
||||||
Assert.Null(_sqliteItemRepository.ItemImageInfoFromValueString(value));
|
Assert.Null(_sqliteItemRepository.ItemImageInfoFromValueString(value.AsSpan()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEnumerable<object[]> DeserializeImages_Valid_TestData()
|
public static IEnumerable<object[]> DeserializeImages_Valid_TestData()
|
||||||
|
|
Loading…
Reference in New Issue