From d03a6486d31421e7124465aeb923fa1b0ef6d75a Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Thu, 14 May 2020 21:01:23 +0100
Subject: [PATCH] Fixed: NET Core not deleting source when moving across drives

This reverts commit 10fc0b071fae9807fa456144b0708d95574d17ff.  Use the
mono fix from 43a35c84477fd194eaa816f1b3e4ade6cb4af42a in NET Core also
---
 .../DiskTests/DiskProviderFixtureBase.cs        | 17 -----------------
 src/NzbDrone.Common/Disk/DiskProviderBase.cs    | 15 +++------------
 src/NzbDrone.Mono/Disk/DiskProvider.cs          | 14 ++++++++------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs b/src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs
index 73df8d847..16842e92e 100644
--- a/src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs
+++ b/src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs
@@ -81,23 +81,6 @@ public void MoveFile_should_overwrite_existing_file()
             File.Exists(destination).Should().BeTrue();
         }
 
-        [Test]
-        [Retry(5)]
-        public void MoveFile_should_not_overwrite_existing_file()
-        {
-            var source1 = GetTempFilePath();
-            var source2 = GetTempFilePath();
-            var destination = GetTempFilePath();
-
-            File.WriteAllText(source1, "SourceFile1");
-            File.WriteAllText(source2, "SourceFile2");
-
-            Subject.MoveFile(source1, destination);
-            Assert.Throws<IOException>(() => Subject.MoveFile(source2, destination, false));
-
-            File.ReadAllText(destination).Should().Be("SourceFile1");
-        }
-
         [Test]
         public void MoveFile_should_not_move_overwrite_itself()
         {
diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
index 6ac2eb4d8..2b8c32208 100644
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -227,18 +227,13 @@ public void MoveFile(string source, string destination, bool overwrite = false)
                 throw new IOException(string.Format("Source and destination can't be the same {0}", source));
             }
 
-            var destExists = FileExists(destination);
-
-            if (destExists && overwrite)
+            if (FileExists(destination) && overwrite)
             {
                 DeleteFile(destination);
             }
 
             RemoveReadOnly(source);
-
-            // NET Core is too eager to copy/delete if overwrite is false
-            // Therefore we also set overwrite if we know destination doesn't exist
-            MoveFileInternal(source, destination, overwrite || !destExists);
+            MoveFileInternal(source, destination);
         }
 
         public void MoveFolder(string source, string destination, bool overwrite = false)
@@ -260,13 +255,9 @@ public void MoveFolder(string source, string destination, bool overwrite = false
             Directory.Move(source, destination);
         }
 
-        protected virtual void MoveFileInternal(string source, string destination, bool overwrite)
+        protected virtual void MoveFileInternal(string source, string destination)
         {
-#if NETCOREAPP
-            File.Move(source, destination, overwrite);
-#else
             File.Move(source, destination);
-#endif
         }
 
         public abstract bool TryCreateHardLink(string source, string destination);
diff --git a/src/NzbDrone.Mono/Disk/DiskProvider.cs b/src/NzbDrone.Mono/Disk/DiskProvider.cs
index 99052c507..249f3e31c 100644
--- a/src/NzbDrone.Mono/Disk/DiskProvider.cs
+++ b/src/NzbDrone.Mono/Disk/DiskProvider.cs
@@ -179,7 +179,7 @@ protected override void CopyFileInternal(string source, string destination, bool
             }
         }
 
-        protected override void MoveFileInternal(string source, string destination, bool overwrite)
+        protected override void MoveFileInternal(string source, string destination)
         {
             var sourceInfo = UnixFileSystemInfo.GetFileSystemEntry(source);
 
@@ -217,11 +217,11 @@ protected override void MoveFileInternal(string source, string destination, bool
             else if ((PlatformInfo.Platform == PlatformType.Mono && PlatformInfo.GetVersion() >= new Version(6, 0)) ||
                      PlatformInfo.Platform == PlatformType.NetCore)
             {
-                TransferFilePatched(source, destination, overwrite, true);
+                TransferFilePatched(source, destination, false, true);
             }
             else
             {
-                base.MoveFileInternal(source, destination, overwrite);
+                base.MoveFileInternal(source, destination);
             }
         }
 
@@ -233,7 +233,9 @@ private void TransferFilePatched(string source, string destination, bool overwri
             // Catch the exception and attempt to handle these edgecases
 
             // Mono 6.x till 6.10 doesn't properly try use rename first.
-            if (move && PlatformInfo.Platform == PlatformType.Mono && PlatformInfo.GetVersion() < new Version(6, 10))
+            if (move &&
+                ((PlatformInfo.Platform == PlatformType.Mono && PlatformInfo.GetVersion() < new Version(6, 10)) ||
+                 (PlatformInfo.Platform == PlatformType.NetCore)))
             {
                 if (Syscall.lstat(source, out var sourcestat) == 0 &&
                     Syscall.lstat(destination, out var deststat) != 0 &&
@@ -248,11 +250,11 @@ private void TransferFilePatched(string source, string destination, bool overwri
             {
                 if (move)
                 {
-                    base.MoveFileInternal(source, destination, overwrite);
+                    base.MoveFileInternal(source, destination);
                 }
                 else
                 {
-                    base.CopyFileInternal(source, destination, overwrite);
+                    base.CopyFileInternal(source, destination);
                 }
             }
             catch (UnauthorizedAccessException)