diff --git a/Trakt/Helpers/LibraryManagerEventsHelper.cs b/Trakt/Helpers/LibraryManagerEventsHelper.cs index b34f1ff6..39ce8d28 100644 --- a/Trakt/Helpers/LibraryManagerEventsHelper.cs +++ b/Trakt/Helpers/LibraryManagerEventsHelper.cs @@ -6,6 +6,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using Microsoft.Extensions.Logging; using Trakt.Api; @@ -19,6 +20,7 @@ internal sealed class LibraryManagerEventsHelper : IDisposable private readonly List _queuedEvents; private readonly ILogger _logger; private readonly TraktApi _traktApi; + private readonly ILibraryManager _libraryManager; private Timer _queueTimer; /// @@ -26,11 +28,13 @@ internal sealed class LibraryManagerEventsHelper : IDisposable /// /// The logger. /// The . - public LibraryManagerEventsHelper(ILogger logger, TraktApi traktApi) + /// The . + public LibraryManagerEventsHelper(ILogger logger, TraktApi traktApi, ILibraryManager libraryManager) { _queuedEvents = new List(); _logger = logger; _traktApi = traktApi; + _libraryManager = libraryManager; } /// @@ -112,6 +116,8 @@ private async Task OnQueueTimerCallbackInternal() _queuedEvents.Clear(); } + queue = ReloadQueuedItems(queue); + var queuedMovieDeletes = new List(); var queuedMovieAdds = new List(); var queuedMovieUpdates = new List(); @@ -187,6 +193,60 @@ private async Task OnQueueTimerCallbackInternal() } } + /// + /// Reloads the queued movies and episodes to add or update from the library database, once per item and user. + /// + /// The queued list. + /// The events to process. + private List ReloadQueuedItems(List queue) + { + var events = new List(); + var queuedItems = new HashSet<(Guid ItemId, Guid UserId)>(); + + // Add and Update send the same request, so an item that was added and then updated is sent once, as an Add (Adds go first) + foreach (var ev in queue.OrderBy(e => e.EventType != EventType.Add)) + { + if (ev.EventType == EventType.Remove || ev.Item is not Movie and not Episode) + { + // A removed item is no longer in the library, and shows are sent as queued + events.Add(ev); + continue; + } + + var key = (ev.Item.Id, ev.TraktUser.LinkedMbUserId); + if (!queuedItems.Add(key)) + { + continue; + } + + // The item from the ItemAdded event can be the copy from before the metadata refresh (a library scan refreshes + // another copy): folder name as title, no imdb id and no default video stream. Read the item as last saved. + BaseItem item; + try + { + item = _libraryManager.RetrieveItem(ev.Item.Id); + } + catch (Exception ex) + { + // Rather than lose the whole batch, send this event as queued and try the item's next event again + _logger.LogWarning(ex, "Could not reload {Item} from the library, syncing it as queued", ev.Item.Path); + queuedItems.Remove(key); + events.Add(ev); + continue; + } + + if (item == null) + { + _logger.LogDebug("Not syncing {Item}: it is no longer in the library", ev.Item.Path); + continue; + } + + events.Add(new LibraryEvent { Item = item, TraktUser = ev.TraktUser, EventType = ev.EventType }); + } + + return events; + } + private async Task ProcessQueuedShowEvents(IReadOnlyCollection events, TraktUser traktUser, EventType eventType) { if (events.Count == 0) diff --git a/Trakt/ServerMediator.cs b/Trakt/ServerMediator.cs index 52591f11..01a68b1d 100644 --- a/Trakt/ServerMediator.cs +++ b/Trakt/ServerMediator.cs @@ -62,7 +62,7 @@ public ServerMediator( _playbackState = new Dictionary(); _traktApi = new TraktApi(loggerFactory.CreateLogger(), httpClientFactory, appHost, userDataManager, userManager); - _libraryManagerEventsHelper = new LibraryManagerEventsHelper(loggerFactory.CreateLogger(), _traktApi); + _libraryManagerEventsHelper = new LibraryManagerEventsHelper(loggerFactory.CreateLogger(), _traktApi, libraryManager); _userDataManagerEventsHelper = new UserDataManagerEventsHelper(loggerFactory.CreateLogger(), _traktApi); }