Fix: Fixed an issue where the conflicts dialog didn't append numbers when pasting files (#15267)

Author: ashrafmansuri

src/Files.App/Utils/Storage/Operations/FileOperationsHelpers.cs

@@ -580,9 +580,10 @@ public static Task SetClipboard(string[] filesToCopy, DataPackageOperation opera
 					{
 						using ShellItem shi = new(fileToCopyPath[i]);
 						using ShellFolder shd = new(Path.GetDirectoryName(copyDestination[i]));
-
-						// Performa copy operation
-						op.QueueCopyOperation(shi, shd, Path.GetFileName(copyDestination[i]));
+						
+						var fileName = GetIncrementalName(overwriteOnCopy, copyDestination[i], fileToCopyPath[i]);
+						// Perform a copy operation
+						op.QueueCopyOperation(shi, shd, fileName);						
 					}))
 					{
 						shellOperationResult.Items.Add(new ShellOperationItemResult()
@@ -1018,5 +1019,26 @@ protected override void Dispose(bool disposing)
 				}
 			}
 		}
+
+		private static string GetIncrementalName(bool overWriteOnCopy, string? filePathToCheck, string? filePathToCopy)
+		{
+			if (filePathToCheck == null)
+				return null;			
+
+			if ((!Path.Exists(filePathToCheck)) || overWriteOnCopy || filePathToCheck == filePathToCopy)
+				return Path.GetFileName(filePathToCheck);
+
+			var index = 2;
+			var filePath = filePathToCheck;
+			if (Path.HasExtension(filePathToCheck))
+				filePath = filePathToCheck.Substring(0, filePathToCheck.LastIndexOf("."));
+
+			Func<int, string> genFilePath = x => string.Concat([filePath, " (", x.ToString(), ")", Path.GetExtension(filePathToCheck)]);
+
+			while (Path.Exists(genFilePath(index)))
+				index++;
+
+			return Path.GetFileName(genFilePath(index));
+		}		
 	}
 }

src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs

@@ -325,7 +325,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
 				{
 					foreach (var item2 in itemsResult)
 					{
-						if (!string.IsNullOrEmpty(item2.CustomName) && item2.SourcePath == item.Key.Path)
+						if (!string.IsNullOrEmpty(item2.CustomName) && item2.SourcePath == item.Key.Path && Path.GetFileName(item2.SourcePath) != item2.CustomName)
 						{
 							var renameHistory = await filesystemOperations.RenameAsync(item.Value, item2.CustomName, NameCollisionOption.FailIfExists, banner.ProgressEventSource, token);
 							history.Destination[history.Source.IndexOf(item.Key)] = renameHistory.Destination[0];