From a962de776b21095a98463421d120bed7e02a34cb Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 29 Mar 2025 17:46:54 +0200 Subject: [PATCH] Movie updates already done in MovieControllerWithSignalR --- .../Events/MovieFileImportedEvent.cs | 1 + src/Radarr.Api.V3/Movies/MovieController.cs | 26 +------------------ .../Movies/MovieControllerWithSignalR.cs | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs b/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs index ae31af4aca..c2c3797868 100644 --- a/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs +++ b/src/NzbDrone.Core/MediaFiles/Events/MovieFileImportedEvent.cs @@ -20,6 +20,7 @@ public MovieFileImportedEvent(LocalMovie movieInfo, MovieFile importedMovie, Lis ImportedMovie = importedMovie; OldFiles = oldFiles; NewDownload = newDownload; + if (downloadClientItem != null) { DownloadClientInfo = downloadClientItem.DownloadClientInfo; diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs index 4f48fe66d4..5d5a308c36 100644 --- a/src/Radarr.Api.V3/Movies/MovieController.cs +++ b/src/Radarr.Api.V3/Movies/MovieController.cs @@ -5,14 +5,12 @@ using System.Threading.Tasks; using FluentValidation; using Microsoft.AspNetCore.Mvc; -using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; using NzbDrone.Core.Datastore.Events; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Languages; using NzbDrone.Core.MediaCover; -using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; @@ -33,8 +31,6 @@ namespace Radarr.Api.V3.Movies { [V3ApiController] public class MovieController : RestControllerWithSignalR, - IHandle, - IHandle, IHandle, IHandle, IHandle, @@ -51,7 +47,6 @@ public class MovieController : RestControllerWithSignalR, private readonly IRootFolderService _rootFolderService; private readonly IUpgradableSpecification _qualityUpgradableSpecification; private readonly IConfigService _configService; - private readonly Logger _logger; public MovieController(IBroadcastSignalRMessage signalRBroadcaster, IMovieService moviesService, @@ -72,8 +67,7 @@ public MovieController(IBroadcastSignalRMessage signalRBroadcaster, SystemFolderValidator systemFolderValidator, QualityProfileExistsValidator qualityProfileExistsValidator, RootFolderExistsValidator rootFolderExistsValidator, - MovieFolderAsRootFolderValidator movieFolderAsRootFolderValidator, - Logger logger) + MovieFolderAsRootFolderValidator movieFolderAsRootFolderValidator) : base(signalRBroadcaster) { _moviesService = moviesService; @@ -85,7 +79,6 @@ public MovieController(IBroadcastSignalRMessage signalRBroadcaster, _coverMapper = coverMapper; _commandQueueManager = commandQueueManager; _rootFolderService = rootFolderService; - _logger = logger; SharedValidator.RuleFor(s => s.Path).Cascade(CascadeMode.Stop) .IsValidPath() @@ -327,23 +320,6 @@ private void LinkMovieStatistics(MovieResource resource, MovieStatistics movieSt resource.SizeOnDisk = movieStatistics.SizeOnDisk; } - [NonAction] - public void Handle(MovieFileImportedEvent message) - { - BroadcastResourceChange(ModelAction.Updated, message.MovieInfo.Movie.Id); - } - - [NonAction] - public void Handle(MovieFileDeletedEvent message) - { - if (message.Reason == DeleteMediaFileReason.Upgrade) - { - return; - } - - BroadcastResourceChange(ModelAction.Updated, message.MovieFile.MovieId); - } - [NonAction] public void Handle(MovieUpdatedEvent message) { diff --git a/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs b/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs index 28b2bdb92d..54c7e55c45 100644 --- a/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs +++ b/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs @@ -153,7 +153,7 @@ public void Handle(MovieGrabbedEvent message) [NonAction] public void Handle(MovieFileImportedEvent message) { - BroadcastResourceChange(ModelAction.Updated, message.MovieInfo.Movie.Id); + BroadcastResourceChange(ModelAction.Updated, message.ImportedMovie.Movie.Id); } [NonAction]