From b09a41ad1f05664a6099734cb44e068f993a8e93 Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:36:08 +0000
Subject: WIP porting new Repository structure
---
MediaBrowser.Controller/Library/ILibraryManager.cs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'MediaBrowser.Controller/Library/ILibraryManager.cs')
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index b802b7e6ea..47b1cb16e8 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -483,21 +483,21 @@ namespace MediaBrowser.Controller.Library
///
/// The item.
/// List<PersonInfo>.
- List GetPeople(BaseItem item);
+ IReadOnlyList GetPeople(BaseItem item);
///
/// Gets the people.
///
/// The query.
/// List<PersonInfo>.
- List GetPeople(InternalPeopleQuery query);
+ IReadOnlyList GetPeople(InternalPeopleQuery query);
///
/// Gets the people items.
///
/// The query.
/// List<Person>.
- List GetPeopleItems(InternalPeopleQuery query);
+ IReadOnlyList GetPeopleItems(InternalPeopleQuery query);
///
/// Updates the people.
@@ -513,21 +513,21 @@ namespace MediaBrowser.Controller.Library
/// The people.
/// The cancellation token.
/// The async task.
- Task UpdatePeopleAsync(BaseItem item, List people, CancellationToken cancellationToken);
+ Task UpdatePeopleAsync(BaseItem item, IReadOnlyList people, CancellationToken cancellationToken);
///
/// Gets the item ids.
///
/// The query.
/// List<Guid>.
- List GetItemIds(InternalItemsQuery query);
+ IReadOnlyList GetItemIds(InternalItemsQuery query);
///
/// Gets the people names.
///
/// The query.
/// List<System.String>.
- List GetPeopleNames(InternalPeopleQuery query);
+ IReadOnlyList GetPeopleNames(InternalPeopleQuery query);
///
/// Queries the items.
@@ -553,9 +553,9 @@ namespace MediaBrowser.Controller.Library
///
/// The query.
/// QueryResult<BaseItem>.
- List GetItemList(InternalItemsQuery query);
+ IReadOnlyList GetItemList(InternalItemsQuery query);
- List GetItemList(InternalItemsQuery query, bool allowExternalContent);
+ IReadOnlyList GetItemList(InternalItemsQuery query, bool allowExternalContent);
///
/// Gets the items.
@@ -563,7 +563,7 @@ namespace MediaBrowser.Controller.Library
/// The query to use.
/// Items to use for query.
/// List of items.
- List GetItemList(InternalItemsQuery query, List parents);
+ IReadOnlyList GetItemList(InternalItemsQuery query, List parents);
///
/// Gets the items result.
--
cgit v1.2.3
From b39553611d0d6702ef657f76573cefa2ee437745 Mon Sep 17 00:00:00 2001
From: JPVenson
Date: Sun, 17 Nov 2024 11:03:43 +0000
Subject: Applied coding style
---
.../Data/CleanDatabaseScheduledTask.cs | 4 ++--
Emby.Server.Implementations/Data/ItemTypeLookup.cs | 6 ------
Emby.Server.Implementations/Library/LibraryManager.cs | 7 ++++---
Emby.Server.Implementations/Library/MediaSourceManager.cs | 2 +-
Jellyfin.Api/Controllers/InstantMixController.cs | 2 +-
Jellyfin.Api/Controllers/YearsController.cs | 4 ++--
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs | 12 ++++++------
Jellyfin.Server.Implementations/Item/ChapterRepository.cs | 2 +-
.../Item/MediaAttachmentRepository.cs | 2 +-
.../Item/MediaStreamRepository.cs | 2 +-
Jellyfin.Server.Implementations/Item/PeopleRepository.cs | 4 ++--
.../MediaSegments/MediaSegmentManager.cs | 2 +-
MediaBrowser.Controller/Entities/BaseItem.cs | 2 +-
MediaBrowser.Controller/Entities/Folder.cs | 10 +++++-----
MediaBrowser.Controller/Entities/Movies/BoxSet.cs | 4 ++--
MediaBrowser.Controller/Library/ILibraryManager.cs | 2 +-
MediaBrowser.Providers/Music/ArtistMetadataService.cs | 2 +-
src/Jellyfin.LiveTv/Guide/GuideManager.cs | 2 +-
18 files changed, 33 insertions(+), 38 deletions(-)
(limited to 'MediaBrowser.Controller/Library/ILibraryManager.cs')
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 6ea7d91970..aceff8b53f 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -28,9 +28,9 @@ namespace Emby.Server.Implementations.Data
_dbProvider = dbProvider;
}
- public Task Run(IProgress progress, CancellationToken cancellationToken)
+ public async Task Run(IProgress progress, CancellationToken cancellationToken)
{
- return CleanDeadItems(cancellationToken, progress);
+ await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
}
private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress progress)
diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index f5db28c7ac..82c0a8b6c5 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -1,12 +1,8 @@
-using System;
using System.Collections.Frozen;
using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
using System.Threading.Channels;
using Emby.Server.Implementations.Playlists;
using Jellyfin.Data.Enums;
-using Jellyfin.Server.Implementations;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Movies;
@@ -14,7 +10,6 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.Querying;
namespace Emby.Server.Implementations.Data;
@@ -23,7 +18,6 @@ public class ItemTypeLookup : IItemTypeLookup
{
///
public IReadOnlyList MusicGenreTypes { get; } = [
-
typeof(Audio).FullName!,
typeof(MusicVideo).FullName!,
typeof(MusicAlbum).FullName!,
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 7e059be232..7b37011cb2 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1810,11 +1810,11 @@ namespace Emby.Server.Implementations.Library
///
public void CreateItem(BaseItem item, BaseItem? parent)
{
- CreateItems(new[] { item }, parent, CancellationToken.None);
+ CreateOrUpdateItems(new[] { item }, parent, CancellationToken.None);
}
///
- public void CreateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken)
+ public void CreateOrUpdateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken)
{
_itemRepository.SaveItems(items, cancellationToken);
@@ -2971,10 +2971,11 @@ namespace Emby.Server.Implementations.Library
{
if (createEntity)
{
- CreateItems([personEntity], null, CancellationToken.None);
+ CreateOrUpdateItems([personEntity], null, CancellationToken.None);
}
await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
+ CreateOrUpdateItems([personEntity], null, CancellationToken.None);
}
}
}
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 2fb571a106..d0f5e60f79 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -218,7 +218,7 @@ namespace Emby.Server.Implementations.Library
list.Add(source);
}
- return SortMediaSources(list).ToImmutableArray();
+ return SortMediaSources(list).ToArray();
}
/// >
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index e89e7ce26c..87a856d38e 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -397,7 +397,7 @@ public class InstantMixController : BaseJellyfinApiController
if (limit.HasValue && limit < items.Count)
{
- items = items.Take(limit.Value).ToImmutableArray();
+ items = items.Take(limit.Value).ToArray();
}
var result = new QueryResult(
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index 907724e040..e709e43e26 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -113,11 +113,11 @@ public class YearsController : BaseJellyfinApiController
if (userId.IsNullOrEmpty())
{
- items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableArray();
+ items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToArray();
}
else
{
- items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableArray();
+ items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToArray();
}
}
else
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 0183685be4..8670b06cc7 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -117,7 +117,7 @@ public sealed class BaseItemRepository(
PrepareFilterQuery(filter);
using var context = dbProvider.CreateDbContext();
- return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToImmutableArray();
+ return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToArray();
}
///
@@ -216,7 +216,7 @@ public sealed class BaseItemRepository(
dbQuery = ApplyGroupingFilter(dbQuery, filter);
dbQuery = ApplyQueryPageing(dbQuery, filter);
- result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
+ result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
result.StartIndex = filter.StartIndex ?? 0;
return result;
}
@@ -235,7 +235,7 @@ public sealed class BaseItemRepository(
dbQuery = ApplyGroupingFilter(dbQuery, filter);
dbQuery = ApplyQueryPageing(dbQuery, filter);
- return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
+ return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
}
private IQueryable ApplyGroupingFilter(IQueryable dbQuery, InternalItemsQuery filter)
@@ -831,7 +831,7 @@ public sealed class BaseItemRepository(
}
// query = query.DistinctBy(e => e.CleanValue);
- return query.Select(e => e.ItemValue.CleanValue).ToImmutableArray();
+ return query.Select(e => e.ItemValue.CleanValue).ToArray();
}
private static bool TypeRequiresDeserialization(Type type)
@@ -976,10 +976,10 @@ public sealed class BaseItemRepository(
});
result.StartIndex = filter.StartIndex ?? 0;
- result.Items = resultQuery.ToImmutableArray().Where(e => e is not null).Select(e =>
+ result.Items = resultQuery.ToArray().Where(e => e is not null).Select(e =>
{
return (DeserialiseBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
- }).ToImmutableArray();
+ }).ToArray();
return result;
}
diff --git a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
index dc55484c9d..16e8c205d6 100644
--- a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
@@ -73,7 +73,7 @@ public class ChapterRepository : IChapterRepository
})
.ToList()
.Select(e => Map(e.chapter, e.baseItemPath!))
- .ToImmutableArray();
+ .ToArray();
}
///
diff --git a/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
index c6488f3210..1557982093 100644
--- a/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
@@ -40,7 +40,7 @@ public class MediaAttachmentRepository(IDbContextFactory dbPr
query = query.Where(e => e.Index == filter.Index);
}
- return query.AsEnumerable().Select(Map).ToImmutableArray();
+ return query.AsEnumerable().Select(Map).ToArray();
}
private MediaAttachment Map(AttachmentStreamInfo attachment)
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index 0617dd81ec..d6bfc1a8f7 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -51,7 +51,7 @@ public class MediaStreamRepository : IMediaStreamRepository
public IReadOnlyList GetMediaStreams(MediaStreamQuery filter)
{
using var context = _dbProvider.CreateDbContext();
- return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToImmutableArray();
+ return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToArray();
}
private string? GetPathToSave(string? path)
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 417212ba4d..d1823514a6 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -36,7 +36,7 @@ public class PeopleRepository(IDbContextFactory dbProvider, I
dbQuery = dbQuery.Take(filter.Limit);
}
- return dbQuery.AsEnumerable().Select(Map).ToImmutableArray();
+ return dbQuery.AsEnumerable().Select(Map).ToArray();
}
///
@@ -51,7 +51,7 @@ public class PeopleRepository(IDbContextFactory dbProvider, I
dbQuery = dbQuery.Take(filter.Limit);
}
- return dbQuery.Select(e => e.Name).ToImmutableArray();
+ return dbQuery.Select(e => e.Name).ToArray();
}
///
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index 151b616f7e..d0f41c6fa8 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -154,7 +154,7 @@ public class MediaSegmentManager : IMediaSegmentManager
return query
.OrderBy(e => e.StartTicks)
.AsNoTracking()
- .ToImmutableArray()
+ .ToArray()
.Select(Map);
}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index d92407a3f4..a6bc35a9f4 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1092,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
return 1;
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
.ThenByDescending(i => i, new MediaSourceWidthComparator())
- .ToImmutableArray();
+ .ToArray();
}
protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 8fff7dbc4d..a13f046142 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -452,7 +452,7 @@ namespace MediaBrowser.Controller.Entities
if (newItems.Count > 0)
{
- LibraryManager.CreateItems(newItems, this, cancellationToken);
+ LibraryManager.CreateOrUpdateItems(newItems, this, cancellationToken);
}
}
else
@@ -1306,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
AddChildren(user, includeLinkedChildren, result, false, query);
- return result.Values.ToImmutableArray();
+ return result.Values.ToArray();
}
protected virtual IEnumerable GetEligibleChildrenForRecursiveChildren(User user)
@@ -1379,7 +1379,7 @@ namespace MediaBrowser.Controller.Entities
AddChildren(user, true, result, true, query);
- return result.Values.ToImmutableArray();
+ return result.Values.ToArray();
}
///
@@ -1407,7 +1407,7 @@ namespace MediaBrowser.Controller.Entities
AddChildrenToList(result, includeLinkedChildren, true, filter);
- return result.Values.ToImmutableArray();
+ return result.Values.ToArray();
}
///
@@ -1563,7 +1563,7 @@ namespace MediaBrowser.Controller.Entities
return LinkedChildren
.Select(i => new Tuple(i, GetLinkedChild(i)))
.Where(i => i.Item2 is not null)
- .ToImmutableArray();
+ .ToArray();
}
protected override async Task RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList fileSystemChildren, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index cb17e3fafd..d0c9f049ab 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -131,13 +131,13 @@ namespace MediaBrowser.Controller.Entities.Movies
public override IReadOnlyList GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
{
var children = base.GetChildren(user, includeLinkedChildren, query);
- return Sort(children, user).ToImmutableArray();
+ return Sort(children, user).ToArray();
}
public override IReadOnlyList GetRecursiveChildren(User user, InternalItemsQuery query)
{
var children = base.GetRecursiveChildren(user, query);
- return Sort(children, user).ToImmutableArray();
+ return Sort(children, user).ToArray();
}
public BoxSetInfo GetLookupInfo()
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 47b1cb16e8..8fcd5f605f 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -258,7 +258,7 @@ namespace MediaBrowser.Controller.Library
/// Items to create.
/// Parent of new items.
/// CancellationToken to use for operation.
- void CreateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken);
+ void CreateOrUpdateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken);
///
/// Updates the item.
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 8af6de9259..c47f9a5006 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.Music
Recursive = true,
IsFolder = false
})
- : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToImmutableArray();
+ : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
}
}
}
diff --git a/src/Jellyfin.LiveTv/Guide/GuideManager.cs b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
index f657422a04..ff31b71233 100644
--- a/src/Jellyfin.LiveTv/Guide/GuideManager.cs
+++ b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
@@ -265,7 +265,7 @@ public class GuideManager : IGuideManager
if (newPrograms.Count > 0)
{
- _libraryManager.CreateItems(newPrograms, null, cancellationToken);
+ _libraryManager.CreateOrUpdateItems(newPrograms, null, cancellationToken);
await PrecacheImages(newPrograms, maxCacheDate).ConfigureAwait(false);
}
--
cgit v1.2.3
From ce76817020ad90fb00b5e98834fcf86c848f3cfb Mon Sep 17 00:00:00 2001
From: Bond_009
Date: Sun, 9 Feb 2025 18:30:53 +0100
Subject: Rename CreateOrUpdateItems back to CreateItems
Reverts the name change of this function made in the EFCore PR. This hopefully
reduces the amount of merge conflicts while backporting and makes it consistent
with the CreateItem function.
---
Emby.Server.Implementations/Library/LibraryManager.cs | 8 ++++----
MediaBrowser.Controller/Entities/Folder.cs | 2 +-
MediaBrowser.Controller/Library/ILibraryManager.cs | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'MediaBrowser.Controller/Library/ILibraryManager.cs')
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index eb045e35e3..c483f3c61f 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1811,11 +1811,11 @@ namespace Emby.Server.Implementations.Library
///
public void CreateItem(BaseItem item, BaseItem? parent)
{
- CreateOrUpdateItems(new[] { item }, parent, CancellationToken.None);
+ CreateItems(new[] { item }, parent, CancellationToken.None);
}
///
- public void CreateOrUpdateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken)
+ public void CreateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken)
{
_itemRepository.SaveItems(items, cancellationToken);
@@ -2972,11 +2972,11 @@ namespace Emby.Server.Implementations.Library
{
if (createEntity)
{
- CreateOrUpdateItems([personEntity], null, CancellationToken.None);
+ CreateItems([personEntity], null, CancellationToken.None);
}
await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
- CreateOrUpdateItems([personEntity], null, CancellationToken.None);
+ CreateItems([personEntity], null, CancellationToken.None);
}
}
}
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index c5d04f6394..957e8b3190 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -452,7 +452,7 @@ namespace MediaBrowser.Controller.Entities
if (newItems.Count > 0)
{
- LibraryManager.CreateOrUpdateItems(newItems, this, cancellationToken);
+ LibraryManager.CreateItems(newItems, this, cancellationToken);
}
}
else
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 8fcd5f605f..47b1cb16e8 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -258,7 +258,7 @@ namespace MediaBrowser.Controller.Library
/// Items to create.
/// Parent of new items.
/// CancellationToken to use for operation.
- void CreateOrUpdateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken);
+ void CreateItems(IReadOnlyList items, BaseItem? parent, CancellationToken cancellationToken);
///
/// Updates the item.
--
cgit v1.2.3