From 04b15f21786c7d8bbe87552aeec9597714bbef37 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 7 Oct 2023 14:46:07 -0500 Subject: [PATCH] Revert cover mapping for collections --- .../Collections/CollectionController.cs | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/Radarr.Api.V3/Collections/CollectionController.cs b/src/Radarr.Api.V3/Collections/CollectionController.cs index c204bd9d9..4e24dfbde 100644 --- a/src/Radarr.Api.V3/Collections/CollectionController.cs +++ b/src/Radarr.Api.V3/Collections/CollectionController.cs @@ -1,12 +1,9 @@ -using System; using System.Collections.Generic; -using System.IO; using System.Linq; using Microsoft.AspNetCore.Mvc; using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Datastore.Events; -using NzbDrone.Core.MediaCover; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Movies; @@ -32,7 +29,6 @@ namespace Radarr.Api.V3.Collections private readonly IMovieMetadataService _movieMetadataService; private readonly IBuildFileNames _fileNameBuilder; private readonly INamingConfigService _namingService; - private readonly IMapCoversToLocal _coverMapper; private readonly IManageCommandQueue _commandQueueManager; private readonly Logger _logger; @@ -42,7 +38,6 @@ namespace Radarr.Api.V3.Collections IMovieMetadataService movieMetadataService, IBuildFileNames fileNameBuilder, INamingConfigService namingService, - IMapCoversToLocal coverMapper, IManageCommandQueue commandQueueManager, Logger logger) : base(signalRBroadcaster) @@ -52,7 +47,6 @@ namespace Radarr.Api.V3.Collections _movieMetadataService = movieMetadataService; _fileNameBuilder = fileNameBuilder; _namingService = namingService; - _coverMapper = coverMapper; _commandQueueManager = commandQueueManager; _logger = logger; } @@ -67,10 +61,6 @@ namespace Radarr.Api.V3.Collections { var collectionResources = new List(); - _logger.Trace("Fetch Cover File Infos"); - var coverFileInfos = _coverMapper.GetCoverFileInfos(); - _logger.Trace("Finished fetching Cover File Infos"); - if (tmdbId.HasValue) { var collection = _collectionService.FindByTmdbId(tmdbId.Value); @@ -82,7 +72,7 @@ namespace Radarr.Api.V3.Collections } else { - collectionResources = MapToResource(_collectionService.GetAllCollections(), coverFileInfos).ToList(); + collectionResources = MapToResource(_collectionService.GetAllCollections()).ToList(); } _logger.Trace("Returning Collections"); @@ -146,15 +136,13 @@ namespace Radarr.Api.V3.Collections return Accepted(updated); } - private IEnumerable MapToResource(List collections, Dictionary coverFileInfos) + private IEnumerable MapToResource(List collections) { // Avoid calling for naming spec on every movie in filenamebuilder var namingConfig = _namingService.GetConfig(); var collectionMovies = _movieMetadataService.GetMoviesWithCollections(); var existingMoviesTmdbIds = _movieService.AllMovieWithCollectionsTmdbIds(); - MapCoversToLocal(collectionMovies, coverFileInfos); - foreach (var collection in collections) { var resource = collection.ToResource(); @@ -187,8 +175,6 @@ namespace Radarr.Api.V3.Collections var movieResource = movie.ToResource(); movieResource.Folder = _fileNameBuilder.GetMovieFolder(new Movie { MovieMetadata = movie }, namingConfig); - _coverMapper.ConvertToLocalUrls(0, movieResource.Images); - if (!existingMoviesTmdbIds.Contains(movie.TmdbId)) { resource.MissingMovies++; @@ -200,11 +186,6 @@ namespace Radarr.Api.V3.Collections return resource; } - private void MapCoversToLocal(IEnumerable movies, Dictionary coverFileInfos) - { - _coverMapper.ConvertToLocalUrls(movies.Select(x => Tuple.Create(0, x.Images.AsEnumerable())), coverFileInfos); - } - [NonAction] public void Handle(CollectionAddedEvent message) {