From 39d7320a75a9f88fcd40af2840c972692e1e9015 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 17 Sep 2023 19:44:33 -0500 Subject: [PATCH] Test mapping before collections loop --- .../Collections/CollectionController.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Radarr.Api.V3/Collections/CollectionController.cs b/src/Radarr.Api.V3/Collections/CollectionController.cs index f9be01132..c204bd9d9 100644 --- a/src/Radarr.Api.V3/Collections/CollectionController.cs +++ b/src/Radarr.Api.V3/Collections/CollectionController.cs @@ -150,18 +150,15 @@ namespace Radarr.Api.V3.Collections { // Avoid calling for naming spec on every movie in filenamebuilder var namingConfig = _namingService.GetConfig(); - - _logger.Trace("Fetching Movies with Collections"); var collectionMovies = _movieMetadataService.GetMoviesWithCollections(); var existingMoviesTmdbIds = _movieService.AllMovieWithCollectionsTmdbIds(); - _logger.Trace("Mapping Collections"); + MapCoversToLocal(collectionMovies, coverFileInfos); + foreach (var collection in collections) { - _logger.Trace("Mapping Collection {0}", collection.Title); var resource = collection.ToResource(); - _logger.Trace("Mapping Collection Movies for {0}", collection.Title); foreach (var movie in collectionMovies.Where(m => m.CollectionTmdbId == collection.TmdbId)) { var movieResource = movie.ToResource(); @@ -175,9 +172,6 @@ namespace Radarr.Api.V3.Collections resource.Movies.Add(movieResource); } - _logger.Trace("Mapping Collection Covers for {0}", collection.Title); - MapCoversToLocal(resource.Movies, coverFileInfos); - yield return resource; } } @@ -206,7 +200,7 @@ namespace Radarr.Api.V3.Collections return resource; } - private void MapCoversToLocal(IEnumerable movies, Dictionary coverFileInfos) + private void MapCoversToLocal(IEnumerable movies, Dictionary coverFileInfos) { _coverMapper.ConvertToLocalUrls(movies.Select(x => Tuple.Create(0, x.Images.AsEnumerable())), coverFileInfos); }