Add more retry resiliency to CreatePackageBundle

clowd · Jul 3, 2022 · 1294211 · 1294211
1 parent 26f55e9
commit 1294211
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Squirrel.CommandLine/Windows/SetupBundle.cs b/src/Squirrel.CommandLine/Windows/SetupBundle.cs
@@ -21,6 +21,7 @@ public static bool IsBundle(string setupPath, out long bundleOffset, out long bu
 
             long offset = 0;
             long length = 0;
+
             void FindBundleHeader()
             {
                 using (var memoryMappedFile = MemoryMappedFile.CreateFromFile(setupPath, FileMode.Open, null, 0, MemoryMappedFileAccess.Read))
@@ -46,11 +47,17 @@ void FindBundleHeader()
         public static long CreatePackageBundle(string setupPath, string packagePath)
         {
             long bundleOffset, bundleLength;
-            using (var pkgStream = File.OpenRead(packagePath))
-            using (var setupStream = File.Open(setupPath, FileMode.Append, FileAccess.Write)) {
+            Stream pkgStream = null, setupStream = null;
+
+            try {
+                pkgStream = Utility.Retry(() => File.OpenRead(packagePath), retries: 10);
+                setupStream = Utility.Retry(() => File.Open(setupPath, FileMode.Append, FileAccess.Write), retries: 10);
                 bundleOffset = setupStream.Position;
                 bundleLength = pkgStream.Length;
                 pkgStream.CopyTo(setupStream);
+            } finally {
+                if (pkgStream != null) pkgStream.Dispose();
+                if (setupStream != null) setupStream.Dispose();
             }
 
             byte[] placeholder = {
@@ -83,4 +90,4 @@ public static long CreatePackageBundle(string setupPath, string packagePath)
             return bundleOffset;
         }
     }
-}
+}