From a2cc23b351c4a568c44e6c855f94db9f71ad084a Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 4 Jan 2023 16:26:41 +0000 Subject: [PATCH] fix(plex-watchlist): Lookup the ID from different sources when Plex doesn't contain the metadata (#4843) --- .../PlexWatchlistImportTests.cs | 206 +++++++++++++++++- .../Jobs/Plex/PlexWatchlistImport.cs | 60 ++++- 2 files changed, 252 insertions(+), 14 deletions(-) diff --git a/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs b/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs index 9537710a37..c1550e52c1 100644 --- a/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs +++ b/src/Ombi.Schedule.Tests/PlexWatchlistImportTests.cs @@ -4,6 +4,8 @@ using NUnit.Framework; using Ombi.Api.Plex; using Ombi.Api.Plex.Models; +using Ombi.Api.TheMovieDb; +using Ombi.Api.TheMovieDb.Models; using Ombi.Core.Engine; using Ombi.Core.Engine.Interfaces; using Ombi.Core.Models.Requests; @@ -55,7 +57,7 @@ public async Task TerminatesWhenPlexIsNotEnabled() [Test] public async Task TerminatesWhenWatchlistIsNotEnabled() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = false }); await _subject.Execute(null); _mocker.Verify(x => x.RequestMovie(It.IsAny()), Times.Never); @@ -145,7 +147,7 @@ public async Task FailedWatchListUser_OldToken_ShouldSkip() [Test] public async Task NoPlexUsersWithToken() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); var um = MockHelper.MockUserManager(new List { @@ -170,7 +172,7 @@ public async Task NoPlexUsersWithToken() [Test] public async Task MultipleUsers() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); var um = MockHelper.MockUserManager(new List { @@ -194,7 +196,7 @@ public async Task MultipleUsers() [Test] public async Task MovieRequestFromWatchList_NoGuid() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { @@ -245,7 +247,7 @@ public async Task MovieRequestFromWatchList_NoGuid() [Test] public async Task TvRequestFromWatchList_NoGuid() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { @@ -295,7 +297,7 @@ public async Task TvRequestFromWatchList_NoGuid() [Test] public async Task MovieRequestFromWatchList_AlreadyRequested() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { @@ -394,7 +396,7 @@ public async Task TvRequestFromWatchList_AlreadyRequested() [Test] public async Task MovieRequestFromWatchList_NoTmdbGuid() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { @@ -433,6 +435,7 @@ public async Task MovieRequestFromWatchList_NoTmdbGuid() }); _mocker.Setup>(x => x.RequestMovie(It.IsAny())) .ReturnsAsync(new RequestEngineResult { RequestId = 1 }); + await _subject.Execute(_context.Object); _mocker.Verify(x => x.RequestMovie(It.IsAny()), Times.Never); _mocker.Verify(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny()), Times.Once); @@ -441,10 +444,195 @@ public async Task MovieRequestFromWatchList_NoTmdbGuid() _mocker.Verify>(x => x.GetAll(), Times.Never); } + [Test] + public async Task MovieRequestFromWatchList_NoTmdbGuid_LookupFromTdb() + { + + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); + _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer + { + MediaContainer = new PlexWatchlist + { + Metadata = new List + { + new Metadata + { + type = "movie", + ratingKey = "abc" + } + } + } + }); + _mocker.Setup>(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny())) + .ReturnsAsync(new PlexWatchlistMetadataContainer + { + MediaContainer = new PlexWatchlistMetadata + { + Metadata = new WatchlistMetadata[] + { + new WatchlistMetadata + { + Guid = new List + { + new PlexGuids + { + Id = "imdb://123" + } + } + } + } + + } + }); + _mocker.Setup>(x => x.RequestMovie(It.IsAny())) + .ReturnsAsync(new RequestEngineResult { RequestId = 1 }); + _mocker.Setup>(x => x.Find("123", ExternalSource.imdb_id)).ReturnsAsync(new FindResult + { + movie_results = new Movie_Results[] + { + new Movie_Results + { + id = 333 + } + } + }); + + await _subject.Execute(_context.Object); + _mocker.Verify(x => x.RequestMovie(It.Is(x => x.TheMovieDbId == 333)), Times.Once); + _mocker.Verify(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny()), Times.Once); + _mocker.Verify(x => x.SetUser(It.Is(x => x.Id == "abc")), Times.Once); + _mocker.Verify>(x => x.GetAll(), Times.Once); + _mocker.Verify>(x => x.Add(It.IsAny()), Times.Once); + _mocker.Verify(x => x.Find("123", ExternalSource.imdb_id), Times.Once); + } + + + [Test] + public async Task TvRequestFromWatchList_NoTmdbGuid_LookupFromTdb() + { + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true, MonitorAll = true }); + _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer + { + MediaContainer = new PlexWatchlist + { + Metadata = new List + { + new Metadata + { + type = "show", + ratingKey = "abc" + } + } + } + }); + _mocker.Setup>(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny())) + .ReturnsAsync(new PlexWatchlistMetadataContainer + { + MediaContainer = new PlexWatchlistMetadata + { + Metadata = new WatchlistMetadata[] + { + new WatchlistMetadata + { + Guid = new List + { + new PlexGuids + { + Id = "imdbid://123" + } + } + } + } + + } + }); + + _mocker.Setup>(x => x.Find("123", ExternalSource.imdb_id)).ReturnsAsync(new FindResult + { + tv_results = new TvResults[] + { + new TvResults + { + id = 333 + } + } + }); + _mocker.Setup>(x => x.RequestTvShow(It.IsAny())) + .ReturnsAsync(new RequestEngineResult { RequestId = 1 }); + await _subject.Execute(_context.Object); + _mocker.Verify(x => x.RequestTvShow(It.Is(x => x.TheMovieDbId == 333 && x.LatestSeason == false && x.RequestAll == true)), Times.Once); + _mocker.Verify(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny()), Times.Once); + _mocker.Verify(x => x.SetUser(It.Is(x => x.Id == "abc")), Times.Once); + _mocker.Verify>(x => x.GetAll(), Times.Once); + _mocker.Verify>(x => x.Add(It.IsAny()), Times.Once); + _mocker.Verify(x => x.Find("123", ExternalSource.imdb_id), Times.Once); + } + + [Test] + public async Task TvRequestFromWatchList_NoTmdbGuid_LookupFromTdb_ViaTvDb() + { + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true, MonitorAll = true }); + _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer + { + MediaContainer = new PlexWatchlist + { + Metadata = new List + { + new Metadata + { + type = "show", + ratingKey = "abc" + } + } + } + }); + _mocker.Setup>(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny())) + .ReturnsAsync(new PlexWatchlistMetadataContainer + { + MediaContainer = new PlexWatchlistMetadata + { + Metadata = new WatchlistMetadata[] + { + new WatchlistMetadata + { + Guid = new List + { + new PlexGuids + { + Id = "thetvdb://123" + } + } + } + } + + } + }); + + _mocker.Setup>(x => x.Find("123", ExternalSource.tvdb_id)).ReturnsAsync(new FindResult + { + tv_results = new TvResults[] + { + new TvResults + { + id = 333 + } + } + }); + _mocker.Setup>(x => x.RequestTvShow(It.IsAny())) + .ReturnsAsync(new RequestEngineResult { RequestId = 1 }); + await _subject.Execute(_context.Object); + _mocker.Verify(x => x.RequestTvShow(It.Is(x => x.TheMovieDbId == 333 && x.LatestSeason == false && x.RequestAll == true)), Times.Once); + _mocker.Verify(x => x.GetWatchlistMetadata("abc", It.IsAny(), It.IsAny()), Times.Once); + _mocker.Verify(x => x.SetUser(It.Is(x => x.Id == "abc")), Times.Once); + _mocker.Verify>(x => x.GetAll(), Times.Once); + _mocker.Verify>(x => x.Add(It.IsAny()), Times.Once); + _mocker.Verify(x => x.Find("123", ExternalSource.tvdb_id), Times.Once); + } + [Test] public async Task TvRequestFromWatchList_NoTmdbGuid() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { @@ -494,7 +682,7 @@ public async Task TvRequestFromWatchList_NoTmdbGuid() [Test] public async Task MovieRequestFromWatchList_AlreadyImported() { - + _mocker.Setup, Task>(x => x.GetSettingsAsync()).ReturnsAsync(new PlexSettings { Enable = true, EnableWatchlistImport = true }); _mocker.Setup>(x => x.GetWatchlist(It.IsAny(), It.IsAny())).ReturnsAsync(new PlexWatchlistContainer { diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs b/src/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs index 326cf35f99..4b7ea96aa8 100644 --- a/src/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs +++ b/src/Ombi.Schedule/Jobs/Plex/PlexWatchlistImport.cs @@ -2,6 +2,8 @@ using Microsoft.Extensions.Logging; using Ombi.Api.Plex; using Ombi.Api.Plex.Models; +using Ombi.Api.TheMovieDb; +using Ombi.Api.TheMovieDb.Models; using Ombi.Core.Authentication; using Ombi.Core.Engine; using Ombi.Core.Engine.Interfaces; @@ -14,6 +16,7 @@ using Ombi.Store.Entities.Requests; using Ombi.Store.Repository; using Quartz; +using Serilog; using System; using System.Collections.Generic; using System.Linq; @@ -30,13 +33,15 @@ public class PlexWatchlistImport : IPlexWatchlistImport private readonly IMovieRequestEngine _movieRequestEngine; private readonly ITvRequestEngine _tvRequestEngine; private readonly INotificationHubService _notificationHubService; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IExternalRepository _watchlistRepo; private readonly IRepository _userError; + private readonly IMovieDbApi _movieDbApi; public PlexWatchlistImport(IPlexApi plexApi, ISettingsService settings, OmbiUserManager ombiUserManager, IMovieRequestEngine movieRequestEngine, ITvRequestEngine tvRequestEngine, INotificationHubService notificationHubService, - ILogger logger, IExternalRepository watchlistRepo, IRepository userError) + ILogger logger, IExternalRepository watchlistRepo, IRepository userError, + IMovieDbApi movieDbApi) { _plexApi = plexApi; _settings = settings; @@ -47,6 +52,7 @@ public PlexWatchlistImport(IPlexApi plexApi, ISettingsService sett _logger = logger; _watchlistRepo = watchlistRepo; _userError = userError; + _movieDbApi = movieDbApi; } public async Task Execute(IJobExecutionContext context) @@ -109,9 +115,16 @@ await _userError.Add(new PlexWatchlistUserError var providerIds = await GetProviderIds(user.MediaServerToken, item, context?.CancellationToken ?? CancellationToken.None); if (!providerIds.TheMovieDb.HasValue()) { - _logger.LogWarning($"No TheMovieDb Id found for {item.title}, could not import via Plex WatchList"); - // We need a MovieDbId to support this; - continue; + // Try and use another Id to figure out TheMovieDB + var movieDbId = await FindTmdbIdFromAlternateSources(providerIds, item.type); + if (string.IsNullOrEmpty(movieDbId)) + { + _logger.LogWarning($"No TheMovieDb Id found for {item.title} for user {user.UserName}, could not import via Plex WatchList"); + // We need a MovieDbId to support this; + continue; + } + + providerIds.TheMovieDb = movieDbId; } // Check to see if we have already imported this item @@ -143,6 +156,43 @@ await _userError.Add(new PlexWatchlistUserError await NotifyClient("Finished Watchlist Import"); } + private async Task FindTmdbIdFromAlternateSources(ProviderId providerId, string type) + { + FindResult result = null; + var hasResult = false; + var movie = type == "movie"; + if (!string.IsNullOrEmpty(providerId.TheTvDb)) + { + result = await _movieDbApi.Find(providerId.TheTvDb, ExternalSource.tvdb_id); + hasResult = result?.tv_results?.Length > 0; + } + if (!string.IsNullOrEmpty(providerId.ImdbId) && !hasResult) + { + result = await _movieDbApi.Find(providerId.ImdbId, ExternalSource.imdb_id); + if (movie) + { + hasResult = result?.movie_results?.Length > 0; + } + else + { + hasResult = result?.tv_results?.Length > 0; + } + } + if (hasResult) + { + if (movie) + { + return result.movie_results?[0]?.id.ToString() ?? string.Empty; + } + else + { + + return result.tv_results?[0]?.id.ToString() ?? string.Empty; + } + } + return string.Empty; + } + private async Task ProcessMovie(int theMovieDbId, OmbiUser user) { _movieRequestEngine.SetUser(user);