The Free Software Media System - Server Backend & API
Fix DeleteItemsUnsafeFast usage
Shadowghosta8a029de73db
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.csindex 8b715d3786..b8a0397b9e 100644--- a/Emby.Server.Implementations/Library/LibraryManager.cs+++ b/Emby.Server.Implementations/Library/LibraryManager.cs@@ -34,14 +34,11 @@ using MediaBrowser.Controller.IO;using MediaBrowser.Controller.Library;using MediaBrowser.Controller.LiveTv;using MediaBrowser.Controller.MediaEncoding;-using MediaBrowser.Controller.MediaSegments;using MediaBrowser.Controller.Persistence;using MediaBrowser.Controller.Providers;using MediaBrowser.Controller.Resolvers;using MediaBrowser.Controller.Sorting;-using MediaBrowser.Controller.Trickplay;using MediaBrowser.Model.Configuration;-using MediaBrowser.Model.Dlna;using MediaBrowser.Model.Drawing;using MediaBrowser.Model.Dto;using MediaBrowser.Model.Entities;@@ -343,9 +340,12 @@ namespace Emby.Server.Implementations.LibraryDeleteItem(item, options, parent, notifyParentItem);}- public void DeleteItemsUnsafeFast(IEnumerable<BaseItem> items)+ public void DeleteItemsUnsafeFast(IReadOnlyCollection<BaseItem> items, bool deleteSourceFiles = false){- var pathMaps = items.Select(e => (Item: e, InternalPath: GetInternalMetadataPaths(e), DeletePaths: e.GetDeletePaths())).ToArray();+ var pathMaps = items.Select(e =>+ (Item: e,+ InternalPath: GetInternalMetadataPaths(e),+ DeletePaths: deleteSourceFiles ? e.GetDeletePaths() : [])).ToArray();foreach (var (item, internalPaths, pathsToDelete) in pathMaps){diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.csindex b196b1e038..02998cbff7 100644--- a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs@@ -104,26 +104,17 @@ public class ArtistsValidatorIncludeItemTypes = [BaseItemKind.MusicArtist],IsDeadArtist = true,IsLocked = false- }).Cast<MusicArtist>().ToList();+ }).Cast<MusicArtist>()+ .Where(item => item.IsAccessedByName)+ .ToList();foreach (var item in deadEntities){- if (!item.IsAccessedByName)- {- continue;- }-_logger.LogInformation("Deleting dead {ItemType} {ItemId} {ItemName}", item.GetType().Name, item.Id.ToString("N", CultureInfo.InvariantCulture), item.Name);-- _libraryManager.DeleteItem(- item,- new DeleteOptions- {- DeleteFileLocation = false- },- false);}+ _libraryManager.DeleteItemsUnsafeFast(deadEntities, deleteSourceFiles: true);+progress.Report(100);}}diff --git a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs b/Emby.Server.Implementations/Library/Validators/GenresValidator.csindex badd6f1183..fc5a2fa0c5 100644--- a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/GenresValidator.cs@@ -114,16 +114,10 @@ public class GenresValidatorforeach (var item in deadEntities){_logger.LogInformation("Deleting dead {ItemType} {ItemId} {ItemName}", item.GetType().Name, item.Id.ToString("N", CultureInfo.InvariantCulture), item.Name);-- _libraryManager.DeleteItem(- item,- new DeleteOptions- {- DeleteFileLocation = false- },- false);}+ _libraryManager.DeleteItemsUnsafeFast(deadEntities, deleteSourceFiles: true);+progress.Report(100);}}diff --git a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs b/Emby.Server.Implementations/Library/Validators/PeopleValidator.csindex f9a6f0d19e..dacef102dd 100644--- a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs@@ -109,7 +109,7 @@ public class PeopleValidatorvar i = 0;foreach (var item in deadEntities.Chunk(500)){- _libraryManager.DeleteItemsUnsafeFast(item);+ _libraryManager.DeleteItemsUnsafeFast(item, true);subProgress.Report(100f / deadEntities.Count * (i++ * 100));}diff --git a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs b/Emby.Server.Implementations/Library/Validators/StudiosValidator.csindex 9fb6869171..88f86ae6ca 100644--- a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs@@ -115,16 +115,10 @@ public class StudiosValidatorforeach (var item in deadEntities){_logger.LogInformation("Deleting dead {ItemType} {ItemId} {ItemName}", item.GetType().Name, item.Id.ToString("N", CultureInfo.InvariantCulture), item.Name);-- _libraryManager.DeleteItem(- item,- new DeleteOptions- {- DeleteFileLocation = false- },- false);}+ _libraryManager.DeleteItemsUnsafeFast(deadEntities, deleteSourceFiles: true);+progress.Report(100);}}diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.csindex bcabfff772..5c391098d3 100644--- a/MediaBrowser.Controller/Library/ILibraryManager.cs+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs@@ -391,8 +391,9 @@ namespace MediaBrowser.Controller.Library/// Deletes items that are not having any children like Actors./// </summary>/// <param name="items">Items to delete.</param>+ /// <param name="deleteSourceFiles">Whether to delete source media files on disk. Defaults to false.</param>/// <remarks>In comparison to <see cref="DeleteItem(BaseItem, DeleteOptions, BaseItem, bool)"/> this method skips a lot of steps assuming there are no children to recusively delete nor does it define the special handling for channels and alike.</remarks>- public void DeleteItemsUnsafeFast(IEnumerable<BaseItem> items);+ public void DeleteItemsUnsafeFast(IReadOnlyCollection<BaseItem> items, bool deleteSourceFiles = false);/// <summary>/// Deletes the item.