Do not check for duplicates if they are allowed in playlist configuration

pull/2497/head
Mark Monteiro 5 years ago
parent 79413d9f33
commit 9a7875b6f9

@ -8,12 +8,14 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Playlists; using MediaBrowser.Model.Playlists;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using PlaylistsNET.Content; using PlaylistsNET.Content;
using PlaylistsNET.Models; using PlaylistsNET.Models;
@ -28,6 +30,7 @@ namespace Emby.Server.Implementations.Playlists
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IProviderManager _providerManager; private readonly IProviderManager _providerManager;
private readonly IConfiguration _appConfig;
public PlaylistManager( public PlaylistManager(
ILibraryManager libraryManager, ILibraryManager libraryManager,
@ -35,7 +38,8 @@ namespace Emby.Server.Implementations.Playlists
ILibraryMonitor iLibraryMonitor, ILibraryMonitor iLibraryMonitor,
ILogger<PlaylistManager> logger, ILogger<PlaylistManager> logger,
IUserManager userManager, IUserManager userManager,
IProviderManager providerManager) IProviderManager providerManager,
IConfiguration appConfig)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;
_fileSystem = fileSystem; _fileSystem = fileSystem;
@ -43,6 +47,7 @@ namespace Emby.Server.Implementations.Playlists
_logger = logger; _logger = logger;
_userManager = userManager; _userManager = userManager;
_providerManager = providerManager; _providerManager = providerManager;
_appConfig = appConfig;
} }
public IEnumerable<Playlist> GetPlaylists(Guid userId) public IEnumerable<Playlist> GetPlaylists(Guid userId)
@ -177,7 +182,7 @@ namespace Emby.Server.Implementations.Playlists
return Playlist.GetPlaylistItems(playlistMediaType, items, user, options); return Playlist.GetPlaylistItems(playlistMediaType, items, user, options);
} }
public void AddToPlaylist(string playlistId, IEnumerable<Guid> itemIds, Guid userId) public void AddToPlaylist(string playlistId, ICollection<Guid> itemIds, Guid userId)
{ {
var user = userId.Equals(Guid.Empty) ? null : _userManager.GetUserById(userId); var user = userId.Equals(Guid.Empty) ? null : _userManager.GetUserById(userId);
@ -187,42 +192,47 @@ namespace Emby.Server.Implementations.Playlists
}); });
} }
private void AddToPlaylistInternal(string playlistId, IEnumerable<Guid> itemIds, User user, DtoOptions options) private void AddToPlaylistInternal(string playlistId, ICollection<Guid> newItemIds, User user, DtoOptions options)
{ {
// Retrieve the existing playlist // Retrieve the existing playlist
var playlist = _libraryManager.GetItemById(playlistId) as Playlist var playlist = _libraryManager.GetItemById(playlistId) as Playlist
?? throw new ArgumentException("No Playlist exists with Id " + playlistId); ?? throw new ArgumentException("No Playlist exists with Id " + playlistId);
// Retrieve all the items to be added to the playlist // Retrieve all the items to be added to the playlist
var items = GetPlaylistItems(itemIds, playlist.MediaType, user, options) var newItems = GetPlaylistItems(newItemIds, playlist.MediaType, user, options)
.Where(i => i.SupportsAddingToPlaylist) .Where(i => i.SupportsAddingToPlaylist);
.ToList();
// Filter out duplicate items, if necessary
if (!_appConfig.DoPlaylistsAllowDuplicates())
{
var existingIds = playlist.LinkedChildren.Select(c => c.ItemId).ToHashSet();
newItems = newItems
.Where(i => !existingIds.Contains(i.Id))
.Distinct();
}
// Remove duplicates from the new items to be added // Create a list of the new linked children to add to the playlist
var existingIds = playlist.LinkedChildren.Select(c => c.ItemId).ToHashSet(); var childrenToAdd = newItems
var uniqueItems = items
.Where(i => !existingIds.Contains(i.Id))
.Distinct()
.Select(i => LinkedChild.Create(i)) .Select(i => LinkedChild.Create(i))
.ToList(); .ToList();
// Log duplicates that have been ignored, if any // Log duplicates that have been ignored, if any
int numDuplicates = items.Count - uniqueItems.Count; int numDuplicates = newItemIds.Count - childrenToAdd.Count;
if (numDuplicates > 0) if (numDuplicates > 0)
{ {
_logger.LogWarning("Ignored adding {DuplicateCount} duplicate items to playlist {PlaylistName}.", numDuplicates, playlist.Name); _logger.LogWarning("Ignored adding {DuplicateCount} duplicate items to playlist {PlaylistName}.", numDuplicates, playlist.Name);
} }
// Do nothing else if there are no items to add to the playlist // Do nothing else if there are no items to add to the playlist
if (uniqueItems.Count == 0) if (childrenToAdd.Count == 0)
{ {
return; return;
} }
// Create a new array with the updated playlist items // Create a new array with the updated playlist items
var newLinkedChildren = new LinkedChild[playlist.LinkedChildren.Length + uniqueItems.Count]; var newLinkedChildren = new LinkedChild[playlist.LinkedChildren.Length + childrenToAdd.Count];
playlist.LinkedChildren.CopyTo(newLinkedChildren, 0); playlist.LinkedChildren.CopyTo(newLinkedChildren, 0);
uniqueItems.CopyTo(newLinkedChildren, playlist.LinkedChildren.Length); childrenToAdd.CopyTo(newLinkedChildren, playlist.LinkedChildren.Length);
// Update the playlist in the repository // Update the playlist in the repository
playlist.LinkedChildren = newLinkedChildren; playlist.LinkedChildren = newLinkedChildren;

@ -29,7 +29,7 @@ namespace MediaBrowser.Controller.Playlists
/// <param name="itemIds">The item ids.</param> /// <param name="itemIds">The item ids.</param>
/// <param name="userId">The user identifier.</param> /// <param name="userId">The user identifier.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
void AddToPlaylist(string playlistId, IEnumerable<Guid> itemIds, Guid userId); void AddToPlaylist(string playlistId, ICollection<Guid> itemIds, Guid userId);
/// <summary> /// <summary>
/// Removes from playlist. /// Removes from playlist.

Loading…
Cancel
Save