Merge pull request #17370 from zerafachris/fix/item-update-null-optional-fields
fix: don't throw ArgumentNullException on partial UpdateItem payloads (#17366)
This commit is contained in:
@@ -236,7 +236,7 @@ public class ItemUpdateController : BaseJellyfinApiController
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
private async Task UpdateItem(BaseItemDto request, BaseItem item)
|
||||
internal async Task UpdateItem(BaseItemDto request, BaseItem item)
|
||||
{
|
||||
item.Name = request.Name;
|
||||
item.ForcedSortName = request.ForcedSortName;
|
||||
@@ -250,7 +250,11 @@ public class ItemUpdateController : BaseJellyfinApiController
|
||||
item.IndexNumber = request.IndexNumber;
|
||||
item.ParentIndexNumber = request.ParentIndexNumber;
|
||||
item.Overview = request.Overview;
|
||||
item.Genres = request.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
|
||||
if (request.Genres is not null)
|
||||
{
|
||||
item.Genres = request.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
}
|
||||
|
||||
if (item is Episode episode)
|
||||
{
|
||||
@@ -293,10 +297,20 @@ public class ItemUpdateController : BaseJellyfinApiController
|
||||
item.CustomRating = request.CustomRating;
|
||||
|
||||
var currentTags = item.Tags;
|
||||
var newTags = request.Tags.Select(t => t.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
var removedTags = currentTags.Except(newTags).ToList();
|
||||
var addedTags = newTags.Except(currentTags).ToList();
|
||||
item.Tags = newTags;
|
||||
List<string> removedTags;
|
||||
List<string> addedTags;
|
||||
if (request.Tags is not null)
|
||||
{
|
||||
var newTags = request.Tags.Select(t => t.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
removedTags = currentTags.Except(newTags).ToList();
|
||||
addedTags = newTags.Except(currentTags).ToList();
|
||||
item.Tags = newTags;
|
||||
}
|
||||
else
|
||||
{
|
||||
removedTags = [];
|
||||
addedTags = [];
|
||||
}
|
||||
|
||||
if (item is Series rseries)
|
||||
{
|
||||
@@ -412,15 +426,18 @@ public class ItemUpdateController : BaseJellyfinApiController
|
||||
item.RunTimeTicks = request.RunTimeTicks;
|
||||
}
|
||||
|
||||
foreach (var pair in request.ProviderIds.ToList())
|
||||
if (request.ProviderIds is not null)
|
||||
{
|
||||
if (string.IsNullOrEmpty(pair.Value))
|
||||
foreach (var pair in request.ProviderIds.ToList())
|
||||
{
|
||||
request.ProviderIds.Remove(pair.Key);
|
||||
if (string.IsNullOrEmpty(pair.Value))
|
||||
{
|
||||
request.ProviderIds.Remove(pair.Key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
item.ProviderIds = request.ProviderIds;
|
||||
item.ProviderIds = request.ProviderIds;
|
||||
}
|
||||
|
||||
if (item is Video video)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user