Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

add image safeguards

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-25 13:17:26 -05:00
parent f9702672f4
commit d54c11fb74
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -1122,7 +1122,9 @@ namespace Emby.Server.Implementations.Data
return null; return null;
} }
return string.Join("|", images.Select(ToValueString).ToArray()); var imageStrings = images.Where(i => !string.IsNullOrWhiteSpace(i.Path)).Select(ToValueString).ToArray();
return string.Join("|", imageStrings);
} }
private void DeserializeImages(string value, BaseItem item) private void DeserializeImages(string value, BaseItem item)
@ -1141,7 +1143,12 @@ namespace Emby.Server.Implementations.Data
foreach (var part in parts) foreach (var part in parts)
{ {
item.ImageInfos.Add(ItemImageInfoFromValueString(part)); var image = ItemImageInfoFromValueString(part);
if (image != null)
{
item.ImageInfos.Add(image);
}
} }
} }
@ -1149,7 +1156,14 @@ namespace Emby.Server.Implementations.Data
{ {
var delimeter = "*"; var delimeter = "*";
return (image.Path ?? string.Empty) + var path = image.Path;
if (path == null)
{
path = string.Empty;
}
return path +
delimeter + delimeter +
image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) +
delimeter + delimeter +
@ -1162,6 +1176,11 @@ namespace Emby.Server.Implementations.Data
{ {
var parts = value.Split(new[] { '*' }, StringSplitOptions.None); var parts = value.Split(new[] { '*' }, StringSplitOptions.None);
if (parts.Length != 4)
{
return null;
}
var image = new ItemImageInfo(); var image = new ItemImageInfo();
image.Path = parts[0]; image.Path = parts[0];