Merge pull request #5934 from Bond-009/utf8

SqliteItemRepository: Parse ChannelId directly from utf-8 data
This commit is contained in:
Bond-009 2021-05-05 14:04:20 +02:00 committed by GitHub
commit d729a76707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
#pragma warning disable CS1591
using System;
using System.Buffers.Text;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
@ -1351,7 +1352,14 @@ namespace Emby.Server.Implementations.Data
if (!reader.IsDBNull(index))
{
item.ChannelId = new Guid(reader.GetString(index));
if (!Utf8Parser.TryParse(reader[index].ToBlob(), out Guid value, out _, standardFormat: 'N'))
{
var str = reader.GetString(index);
Logger.LogWarning("{ChannelId} isn't in the expected format", str);
value = new Guid(str);
}
item.ChannelId = value;
}
index++;