Merge pull request #753 from leotsarev/log-file-copying-errors

File copying errors
aspnet · May 24, 2024 · 8ede78d · 8ede78d
2 parents 419abd9 + ff78e14
commit 8ede78d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/LibraryManager.Build/Contracts/HostInteraction.cs b/src/LibraryManager.Build/Contracts/HostInteraction.cs
@@ -83,7 +83,7 @@ public async Task<bool> CopyFileAsync(string sourcePath, string destinationPath,
                 throw new UnauthorizedAccessException();
             }
 
-            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, cancellationToken);
+            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, Logger, cancellationToken);
             if (result)
             {
                 Logger.Log(string.Format(Resources.Text.FileWrittenToDisk, destinationPath.Replace('\\', '/')), LogLevel.Operation);

diff --git a/src/LibraryManager.Contracts/FileHelpers.cs b/src/LibraryManager.Contracts/FileHelpers.cs
@@ -136,23 +136,28 @@ public static Task<Stream> ReadFileAsStreamAsync(string fileName, CancellationTo
         /// </summary>
         /// <param name="sourceFile">Full path to the source file</param>
         /// <param name="destinationFile">Full path to the destination file</param>
+        /// <param name="logger">Pass logger to log errors.</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>A boolean indicating whether the file was copied successfully</returns>
-        public static async Task<bool> CopyFileAsync(string sourceFile, string destinationFile, CancellationToken cancellationToken)
+        public static async Task<bool> CopyFileAsync(string sourceFile, string destinationFile, ILogger logger, CancellationToken cancellationToken)
         {
-            try
+            //Sometimes it flaky. Let's retry
+            for (int i=0; i<2;i++)
             {
-                using (FileStream sourceStream = File.Open(sourceFile, FileMode.Open, FileAccess.Read))
+                try
                 {
+                    using FileStream sourceStream = File.Open(sourceFile, FileMode.Open, FileAccess.Read);
+
                     await WriteToFileAsync(destinationFile, sourceStream, cancellationToken);
-                }
 
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
+                    return true;
+                }
+                catch (Exception exception)
+                {
+                    logger.Log($"Error during copying file {exception}", LogLevel.Error);
+                }
             }
+            return false;
         }
 
         /// <summary>

diff --git a/src/LibraryManager.Vsix/Contracts/HostInteraction.cs b/src/LibraryManager.Vsix/Contracts/HostInteraction.cs
@@ -121,7 +121,7 @@ public async Task<bool> CopyFileAsync(string sourcePath, string destinationPath,
             }
 
             await VsHelpers.CheckFileOutOfSourceControlAsync(absoluteDestinationPath);
-            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, cancellationToken);
+            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, Logger, cancellationToken);
 
             if (result)
             {

diff --git a/src/libman/Contracts/HostInteraction.cs b/src/libman/Contracts/HostInteraction.cs
@@ -108,7 +108,7 @@ public async Task<bool> CopyFileAsync(string sourcePath, string destinationPath,
                 throw new UnauthorizedAccessException();
             }
 
-            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, cancellationToken);
+            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, Logger, cancellationToken);
             if(result)
             {
                 Logger.Log(string.Format(Resources.Text.FileWrittenToDisk, destinationPath.Replace('\\', '/')), LogLevel.Operation);

diff --git a/test/LibraryManager.Mocks/HostInteraction.cs b/test/LibraryManager.Mocks/HostInteraction.cs
@@ -152,7 +152,7 @@ public async Task<bool> CopyFileAsync(string sourcePath, string destinationPath,
                 throw new UnauthorizedAccessException();
             }
 
-            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, cancellationToken);
+            bool result = await FileHelpers.CopyFileAsync(sourcePath, absoluteDestinationPath, Logger, cancellationToken);
 
             return result;
         }