From 6705b59b232a794a4d2dae5679a8d41de86bd12b Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Thu, 25 Jul 2019 21:11:12 -0400
Subject: [PATCH] Fixed: Renaming Files Command Doesn't Resolve

---
 .../RenameMovieFileServiceFixture.cs          | 26 +++++++++----------
 .../Commands/RenameMovieFilesCommand.cs       | 26 -------------------
 .../MediaFiles/RenameMovieFileService.cs      |  4 +--
 src/NzbDrone.Core/NzbDrone.Core.csproj        |  1 -
 4 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs

diff --git a/src/NzbDrone.Core.Test/MediaFiles/RenameMovieFileServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/RenameMovieFileServiceFixture.cs
index 91632a2e5..b08954388 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/RenameMovieFileServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/RenameMovieFileServiceFixture.cs
@@ -34,14 +34,14 @@ public void Setup()
                   .Returns(_movie);
         }
 
-        private void GivenNoEpisodeFiles()
+        private void GivenNoMovieFiles()
         {
             Mocker.GetMock<IMediaFileService>()
                   .Setup(s => s.GetMovies(It.IsAny<IEnumerable<int>>()))
                   .Returns(new List<MovieFile>());
         }
 
-        private void GivenEpisodeFiles()
+        private void GivenMovieFiles()
         {
             Mocker.GetMock<IMediaFileService>()
                   .Setup(s => s.GetMovies(It.IsAny<IEnumerable<int>>()))
@@ -57,9 +57,9 @@ private void GivenMovedFiles()
         [Test]
         public void should_not_publish_event_if_no_files_to_rename()
         {
-            GivenNoEpisodeFiles();
+            GivenNoMovieFiles();
 
-            Subject.Execute(new RenameMovieFilesCommand(_movie.Id, new List<int>{1}));
+            Subject.Execute(new RenameFilesCommand(_movie.Id, new List<int>{1}));
 
             Mocker.GetMock<IEventAggregator>()
                   .Verify(v => v.PublishEvent(It.IsAny<MovieRenamedEvent>()), Times.Never());
@@ -68,13 +68,13 @@ public void should_not_publish_event_if_no_files_to_rename()
         [Test]
         public void should_not_publish_event_if_no_files_are_renamed()
         {
-            GivenEpisodeFiles();
+            GivenMovieFiles();
 
             Mocker.GetMock<IMoveMovieFiles>()
                   .Setup(s => s.MoveMovieFile(It.IsAny<MovieFile>(), It.IsAny<Movie>()))
                   .Throws(new SameFilenameException("Same file name", "Filename"));
 
-            Subject.Execute(new RenameMovieFilesCommand(_movie.Id, new List<int> { 1 }));
+            Subject.Execute(new RenameFilesCommand(_movie.Id, new List<int> { 1 }));
 
             Mocker.GetMock<IEventAggregator>()
                   .Verify(v => v.PublishEvent(It.IsAny<MovieRenamedEvent>()), Times.Never());
@@ -83,10 +83,10 @@ public void should_not_publish_event_if_no_files_are_renamed()
         [Test]
         public void should_publish_event_if_files_are_renamed()
         {
-            GivenEpisodeFiles();
+            GivenMovieFiles();
             GivenMovedFiles();
 
-            Subject.Execute(new RenameMovieFilesCommand(_movie.Id, new List<int> { 1 }));
+            Subject.Execute(new RenameFilesCommand(_movie.Id, new List<int> { 1 }));
 
             Mocker.GetMock<IEventAggregator>()
                   .Verify(v => v.PublishEvent(It.IsAny<MovieRenamedEvent>()), Times.Once());
@@ -95,24 +95,24 @@ public void should_publish_event_if_files_are_renamed()
         [Test]
         public void should_update_moved_files()
         {
-            GivenEpisodeFiles();
+            GivenMovieFiles();
             GivenMovedFiles();
 
-            Subject.Execute(new RenameMovieFilesCommand(_movie.Id, new List<int> { 1 }));
+            Subject.Execute(new RenameFilesCommand(_movie.Id, new List<int> { 1 }));
 
             Mocker.GetMock<IMediaFileService>()
                   .Verify(v => v.Update(It.IsAny<MovieFile>()), Times.Exactly(2));
         }
 
         [Test]
-        public void should_get_episodefiles_by_ids_only()
+        public void should_get_moviefiles_by_ids_only()
         {
-            GivenEpisodeFiles();
+            GivenMovieFiles();
             GivenMovedFiles();
 
             var files = new List<int> { 1 };
 
-            Subject.Execute(new RenameMovieFilesCommand(_movie.Id, files));
+            Subject.Execute(new RenameFilesCommand(_movie.Id, files));
 
             Mocker.GetMock<IMediaFileService>()
                   .Verify(v => v.GetMovies(files), Times.Once());
diff --git a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs b/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs
deleted file mode 100644
index d2781e3ab..000000000
--- a/src/NzbDrone.Core/MediaFiles/Commands/RenameMovieFilesCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using NzbDrone.Core.Messaging.Commands;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.MediaFiles.Commands
-{
-    public class RenameMovieFilesCommand : Command
-    {
-        public int MovieId { get; set; }
-        public List<int> Files { get; set; }
-
-        public override bool SendUpdatesToClient => true;
-
-        public RenameMovieFilesCommand()
-        {
-        }
-
-        public RenameMovieFilesCommand(int movieId, List<int> files)
-        {
-            MovieId = movieId;
-            Files = files;
-        }
-    }
-}
diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs
index 0b80e7177..2d3473b7a 100644
--- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs
@@ -25,7 +25,7 @@ public interface IRenameMovieFileService
     }
 
     public class RenameMovieFileService : IRenameMovieFileService,
-                                          IExecute<RenameMovieFilesCommand>,
+                                          IExecute<RenameFilesCommand>,
                                           IExecute<RenameMovieCommand>,
 					IExecute<RenameMovieFolderCommand>
     {
@@ -181,7 +181,7 @@ public void RenameMoviePath(Movie movie, bool shouldRenameFiles = true)
             }
 		}
 
-        public void Execute(RenameMovieFilesCommand message)
+        public void Execute(RenameFilesCommand message)
         {
             var movie = _movieService.GetMovie(message.MovieId);
             var movieFiles = _mediaFileService.GetMovies(message.Files);
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index f5fa02689..aed188618 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -850,7 +850,6 @@
     <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
     <Compile Include="MediaFiles\Commands\DownloadedMovieScanCommand.cs" />
     <Compile Include="MediaFiles\Commands\RenameMovieCommand.cs" />
-    <Compile Include="MediaFiles\Commands\RenameMovieFilesCommand.cs" />
     <Compile Include="MediaFiles\Commands\RescanMovieCommand.cs" />
     <Compile Include="MediaFiles\DownloadedMovieCommandService.cs" />
     <Compile Include="MediaFiles\DownloadedMovieImportService.cs" />