Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

NzbDrone.Common.Test/DiskProviderTests.cs

@@ -34,6 +34,20 @@ namespace NzbDrone.Common.Test
             }
         }
 
+        [Test]
+        public void moveFile_should_overwrite_existing_file()
+        {
+            var diskProvider = new DiskProvider();
+            diskProvider.CopyDirectory(BinFolder.FullName, BinFolderCopy.FullName);
+
+            var targetPath = Path.Combine(BinFolderCopy.FullName, "file.move");
+
+            diskProvider.MoveFile(BinFolderCopy.GetFiles("*.dll", SearchOption.AllDirectories).First().FullName, targetPath);
+            diskProvider.MoveFile(BinFolderCopy.GetFiles("*.dll", SearchOption.AllDirectories).First().FullName, targetPath);
+
+            File.Exists(targetPath).Should().BeTrue();
+        }
+
         [Test]
         public void CopyFolder_should_copy_folder()
         {
@@ -45,6 +59,7 @@ namespace NzbDrone.Common.Test
             VerifyCopy();
         }
 
+
         [Test]
         public void CopyFolder_should_overright_existing_folder()
         {

NzbDrone.Common/DiskProvider.cs

@@ -98,24 +98,20 @@ namespace NzbDrone.Common
                 TransferDirectory(subDir.FullName, Path.Combine(target, subDir.Name), transferAction);
             }
 
-            foreach (var file in sourceFolder.GetFiles("*.*", SearchOption.TopDirectoryOnly))
+            foreach (var sourceFile in sourceFolder.GetFiles("*.*", SearchOption.TopDirectoryOnly))
             {
-                var destFile = Path.Combine(target, file.Name);
+                var destFile = Path.Combine(target, sourceFile.Name);
 
                 switch (transferAction)
                 {
                     case TransferAction.Copy:
                         {
-                            file.CopyTo(destFile, true);
+                            sourceFile.CopyTo(destFile, true);
                             break;
                         }
                     case TransferAction.Move:
                         {
-                            if (FileExists(destFile))
+                            MoveFile(sourceFile.FullName, destFile);
-                            {
-                                File.Delete(destFile);
-                            }
-                            file.MoveTo(destFile);
                             break;
                         }
                 }
@@ -130,6 +126,11 @@ namespace NzbDrone.Common
 
         public virtual void MoveFile(string sourcePath, string destinationPath)
         {
+            if (FileExists(destinationPath))
+            {
+                DeleteFile(destinationPath);
+            }
+
             File.Move(sourcePath, destinationPath);
         }
 

NzbDrone.Update.Test/UpdateProviderStartFixture.cs

@@ -130,7 +130,7 @@ namespace NzbDrone.Update.Test
         public void should_copy_update_package_to_target()
         {
             Mocker.GetMock<DiskProvider>()
-                .Setup(c => c.CopyDirectory(UPDATE_FOLDER, TARGET_FOLDER));
+                .Setup(c => c.MoveDirectory(UPDATE_FOLDER, TARGET_FOLDER));
 
             Mocker.Resolve<UpdateProvider>().Start(TARGET_FOLDER);
         }
@@ -139,7 +139,7 @@ namespace NzbDrone.Update.Test
         public void should_restore_if_update_fails()
         {
             Mocker.GetMock<DiskProvider>()
-                .Setup(c => c.CopyDirectory(UPDATE_FOLDER, TARGET_FOLDER))
+                .Setup(c => c.MoveDirectory(UPDATE_FOLDER, TARGET_FOLDER))
                 .Throws(new IOException());
 
             //Act
@@ -184,7 +184,7 @@ namespace NzbDrone.Update.Test
             WithServiceRunning(true);
 
             Mocker.GetMock<DiskProvider>()
-                .Setup(c => c.CopyDirectory(UPDATE_FOLDER, TARGET_FOLDER))
+                .Setup(c => c.MoveDirectory(UPDATE_FOLDER, TARGET_FOLDER))
                 .Throws(new IOException());
 
             //Act
@@ -202,7 +202,7 @@ namespace NzbDrone.Update.Test
             WithServiceRunning(false);
 
             Mocker.GetMock<DiskProvider>()
-                .Setup(c => c.CopyDirectory(UPDATE_FOLDER, TARGET_FOLDER))
+                .Setup(c => c.MoveDirectory(UPDATE_FOLDER, TARGET_FOLDER))
                 .Throws(new IOException());
 
             //Act

NzbDrone.Update/Providers/UpdateProvider.cs

@@ -68,11 +68,11 @@ namespace NzbDrone.Update.Providers
             _diskProvider.CopyDirectory(targetFolder, _enviromentProvider.GetUpdateBackUpFolder());
 
 
-            logger.Info("Copying update package to target");
+            logger.Info("Moving update package to target");
 
             try
             {
-                _diskProvider.CopyDirectory(_enviromentProvider.GetUpdatePackageFolder(), targetFolder);
+                _diskProvider.MoveDirectory(_enviromentProvider.GetUpdatePackageFolder(), targetFolder);
             }
             catch (Exception e)
             {