moveepisode is less side-effecty!

NzbDrone.Core.Test/MediaFileTests/ImportApprovedEpisodesFixture.cs

@@ -53,8 +53,7 @@ namespace NzbDrone.Core.Test.MediaFileTests
             }
 
             Mocker.GetMock<IUpgradeMediaFiles>()
-                  .Setup(s => s.UpgradeEpisodeFile(It.IsAny<EpisodeFile>(), It.IsAny<LocalEpisode>()))
-                  .Returns(new EpisodeFile());
+                  .Setup(s => s.UpgradeEpisodeFile(It.IsAny<EpisodeFile>(), It.IsAny<LocalEpisode>()));
         }
             
         [Test]

NzbDrone.Core.Test/MediaFileTests/RenameEpisodeFileServiceFixture.cs

@@ -60,8 +60,7 @@ namespace NzbDrone.Core.Test.MediaFileTests
         private void GivenMovedFiles()
         {
             Mocker.GetMock<IMoveEpisodeFiles>()
-                  .Setup(s => s.MoveEpisodeFile(It.IsAny<EpisodeFile>(), _series))
-                  .Returns(_episodeFiles.First());
+                  .Setup(s => s.MoveEpisodeFile(It.IsAny<EpisodeFile>(), _series));
         }
 
         [Test]

NzbDrone.Core/History/HistoryService.cs

@@ -93,7 +93,8 @@ namespace NzbDrone.Core.History
                         EpisodeId = episode.Id
                     };
 
-                history.Data.Add("FileId", message.ImportedEpisode.Id.ToString());
+                //Won't have a value since we publish this event before saving to DB.
+                //history.Data.Add("FileId", message.ImportedEpisode.Id.ToString());
                 history.Data.Add("DroppedPath", message.DroppedEpisode.Path);
                 history.Data.Add("ImportedPath", message.ImportedEpisode.Path);
 

NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs

@@ -13,8 +13,8 @@ namespace NzbDrone.Core.MediaFiles
 {
     public interface IMoveEpisodeFiles
     {
-        EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, Series series);
-        EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode);
+        string MoveEpisodeFile(EpisodeFile episodeFile, Series series);
+        string MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode);
     }
 
     public class MoveEpisodeFiles : IMoveEpisodeFiles
@@ -38,27 +38,24 @@ namespace NzbDrone.Core.MediaFiles
             _logger = logger;
         }
 
-        public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, Series series)
+        public string MoveEpisodeFile(EpisodeFile episodeFile, Series series)
         {
             var episodes = _episodeService.GetEpisodesByFileId(episodeFile.Id);
             var newFileName = _buildFileNames.BuildFilename(episodes, series, episodeFile);
-            var destinationFilename = _buildFileNames.BuildFilePath(series, episodes.First().SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
+            var filePath = _buildFileNames.BuildFilePath(series, episodes.First().SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
 
-            return MoveFile(episodeFile, destinationFilename);
+            return filePath;
         }
 
-        public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode)
+        public string MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode)
         {
             var newFileName = _buildFileNames.BuildFilename(localEpisode.Episodes, localEpisode.Series, episodeFile);
-            var destinationFilename = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
-            episodeFile = MoveFile(episodeFile, destinationFilename);
-
-            _messageAggregator.PublishEvent(new EpisodeDownloadedEvent(localEpisode));
-
-            return episodeFile;
+            var filePath = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
+             MoveFile(episodeFile, filePath);
+            return filePath;
         }
 
-        private EpisodeFile MoveFile(EpisodeFile episodeFile, string destinationFilename)
+        private void MoveFile(EpisodeFile episodeFile, string destinationFilename)
         {
             if (!_diskProvider.FileExists(episodeFile.Path))
             {
@@ -85,10 +82,6 @@ namespace NzbDrone.Core.MediaFiles
                 _logger.Debug("Unable to apply folder permissions to: ", destinationFilename);
                 _logger.TraceException(ex.Message, ex);
             }
-
-            episodeFile.Path = destinationFilename;
-            
-            return episodeFile;
         }
     }
 }

NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
     {
         List<ImportDecision> Import(List<ImportDecision> decisions, bool newDownloads = false);
     }
-    
+
     public class ImportApprovedEpisodes : IImportApprovedEpisodes
     {
         private readonly IUpgradeMediaFiles _episodeFileUpgrader;
@@ -68,10 +68,10 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
 
                     if (newDownload)
                     {
-                        episodeFile = _episodeFileUpgrader.UpgradeEpisodeFile(episodeFile, localEpisode);
+                        episodeFile.Path = _episodeFileUpgrader.UpgradeEpisodeFile(episodeFile, localEpisode);
                         _messageAggregator.PublishEvent(new EpisodeImportedEvent(localEpisode, episodeFile));
+                        _messageAggregator.PublishEvent(new EpisodeDownloadedEvent(localEpisode));
                     }
-               
 
                     _mediaFileService.Add(episodeFile);
                     imported.Add(importDecision);

NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs

@@ -7,7 +7,7 @@ namespace NzbDrone.Core.MediaFiles
 {
     public interface IUpgradeMediaFiles
     {
-        EpisodeFile UpgradeEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode);
+        string UpgradeEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode);
     }
 
     public class UpgradeMediaFileService : IUpgradeMediaFiles
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.MediaFiles
             _logger = logger;
         }
 
-        public EpisodeFile UpgradeEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode)
+        public string UpgradeEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode)
         {
             var existingFiles = localEpisode.Episodes
                                             .Where(e => e.EpisodeFileId > 0)