stuff blah

Patcher/PatchClient/PatchClient.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.12.0</AssemblyVersion>
+    <AssemblyVersion>2.15.0</AssemblyVersion>
-    <FileVersion>2.12.0</FileVersion>
+    <FileVersion>2.15.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />

Patcher/PatchGenerator/PatchGenerator.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.12.0</AssemblyVersion>
+    <AssemblyVersion>2.15.0</AssemblyVersion>
-    <FileVersion>2.12.0</FileVersion>
+    <FileVersion>2.15.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

Patcher/PatchGenerator/ViewModels/PatchGenerationViewModel.cs

@@ -113,14 +113,16 @@ namespace PatchGenerator.ViewModels
 
                 var message = patcher.GeneratePatches();
                 
-                if(message.ExitCode != PatcherExitCode.Success && generationInfo.AutoClose)
-                {
-                    Environment.Exit((int)message.ExitCode);
-                }
-
                 patchGenStopwatch.Stop();
                 updateElapsedTimeTimer.Stop();
 
+                if(message.ExitCode != PatcherExitCode.Success && generationInfo.AutoClose)
+                {
+                    PatchLogger.LogInfo("Exiting: Auto close on failure");
+                    Environment.Exit((int)message.ExitCode);
+                }
+
+                PatchLogger.LogInfo("Printing summary info ...");
                 PrintSummary();
 
                 StringBuilder sb = new StringBuilder()
@@ -133,8 +135,11 @@ namespace PatchGenerator.ViewModels
 
                 File.Copy(LazyOperations.PatcherClientPath, $"{generationInfo.PatchName.FromCwd()}\\patcher.exe", true);
                 
+                PatchLogger.LogInfo("Copied patcher.exe to output folder");
+                
                 if (generationInfo.AutoZip)
                 {
+                    PatchLogger.LogInfo("AutoZipping");
                     IndeterminateProgress = true;
 
                     PatchItemCollection.Add(new PatchItem("Allowing Time for files to unlock ..."));
@@ -149,6 +154,7 @@ namespace PatchGenerator.ViewModels
 
                     var progress = new Progress<int>(p =>
                     {
+                        PatchLogger.LogInfo($"compressing directory @ {p}%");
                         PatchPercent = p;
                     });
 

Patcher/PatcherUtils/LazyOperations.cs

@@ -102,9 +102,15 @@ namespace PatcherUtils
 
         public static void CompressDirectory(string SourceDirectoryPath, string DestinationFilePath, IProgress<int> progress)
         {
+            try
+            {
+                PatchLogger.LogInfo($"Compressing: {SourceDirectoryPath}");
+                PatchLogger.LogInfo($"Output file: {DestinationFilePath}");
                 var outputFile = new FileInfo(DestinationFilePath);
-            
                 SevenZipBase.SetLibraryPath(SevenZDllPath);
+                
+                PatchLogger.LogInfo($"7z.dll set: {SevenZDllPath}");
+                
                 var compressor = new SevenZipCompressor()
                 {
                     ArchiveFormat = OutArchiveFormat.SevenZip,
@@ -112,21 +118,27 @@ namespace PatcherUtils
                     CompressionLevel = CompressionLevel.Normal
                 };
 
-            compressor.Compressing += (_, args) =>
+                compressor.Compressing += (_, args) => { progress.Report(args.PercentDone); };
-            {
-                progress.Report(args.PercentDone);
-            };
 
                 using var outputStream = outputFile.OpenWrite();
 
+                PatchLogger.LogInfo("Starting compression");
+                
                 compressor.CompressDirectory(SourceDirectoryPath, outputStream);
                 
+                PatchLogger.LogInfo("Compression complete");
+
                 outputFile.Refresh();
 
                 // failed to compress data
                 if (!outputFile.Exists || outputFile.Length == 0)
                 {
-                Logger.LogError("Failed to compress patcher");
+                    PatchLogger.LogError("Failed to compress patcher");
+                }
+            }
+            catch (Exception ex)
+            {
+                PatchLogger.LogException(ex);
             }
         }
 
@@ -140,7 +152,7 @@ namespace PatcherUtils
             if (dir.Exists)
             {
                 dir.Delete(true);
-                PatchLogger.LogInfo("Temp directory delted");
+                PatchLogger.LogInfo("Temp directory deleted");
             }
         }
     }

Patcher/PatcherUtils/PatchHelper.cs

@@ -1,11 +1,14 @@
 using PatchClient.Models;
 using PatcherUtils.Model;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
 using PatcherUtils.Helpers;
 
 namespace PatcherUtils
@@ -34,7 +37,8 @@ namespace PatcherUtils
         /// <remarks>Includes an array of <see cref="LineItem"/> with details for each type of patch</remarks>
         public event ProgressChangedHandler ProgressChanged;
 
-        protected virtual void RaiseProgressChanged(int progress, int total, string Message = "", params LineItem[] AdditionalLineItems)
+        protected virtual void RaiseProgressChanged(int progress, int total, string Message = "",
+            params LineItem[] AdditionalLineItems)
         {
             int percent = (int)Math.Floor((double)progress / total * 100);
 
@@ -88,7 +92,8 @@ namespace PatcherUtils
 
                 bool matched = Enumerable.SequenceEqual(sourceHash, targetHash);
 
-                PatchLogger.LogInfo($"Hash Check: S({sourceInfo.Name}|{Convert.ToBase64String(sourceHash)}) - T({targetInfo.Name}|{Convert.ToBase64String(targetHash)}) - Match:{matched}");
+                PatchLogger.LogInfo(
+                    $"Hash Check: S({sourceInfo.Name}|{Convert.ToBase64String(sourceHash)}) - T({targetInfo.Name}|{Convert.ToBase64String(targetHash)}) - Match:{matched}");
 
                 return matched;
             }
@@ -153,7 +158,7 @@ namespace PatcherUtils
             {
                 Directory.CreateDirectory(deltaPath.Replace(sourceFileInfo.Name + ".delta", ""));
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 PatchLogger.LogException(ex);
             }
@@ -191,7 +196,7 @@ namespace PatcherUtils
             {
                 Directory.CreateDirectory(deltaPath.Replace(sourceFileInfo.Name + ".del", ""));
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 PatchLogger.LogException(ex);
             }
@@ -201,7 +206,7 @@ namespace PatcherUtils
                 File.Create(deltaPath);
                 PatchLogger.LogInfo($"File Created [DEL]: {deltaPath}");
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 PatchLogger.LogException(ex);
             }
@@ -222,7 +227,7 @@ namespace PatcherUtils
             {
                 Directory.CreateDirectory(deltaPath.Replace(targetSourceInfo.Name + ".new", ""));
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 PatchLogger.LogException(ex);
             }
@@ -232,7 +237,7 @@ namespace PatcherUtils
                 targetSourceInfo.CopyTo(deltaPath, true);
                 PatchLogger.LogInfo($"File Created [NEW]: {deltaPath}");
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 PatchLogger.LogException(ex);
             }
@@ -276,6 +281,7 @@ namespace PatcherUtils
             LazyOperations.ExtractResourcesToTempDir();
 
             List<FileInfo> SourceFiles = sourceDir.GetFiles("*", SearchOption.AllDirectories).ToList();
+            ConcurrentQueue<FileInfo> foundFilesQueue = new ConcurrentQueue<FileInfo>();
 
             fileCountTotal = SourceFiles.Count;
 
@@ -291,10 +297,16 @@ namespace PatcherUtils
 
             RaiseProgressChanged(0, fileCountTotal, "Generating deltas...");
             
-            foreach (FileInfo targetFile in targetDir.GetFiles("*", SearchOption.AllDirectories))
+            // use 5 threads to process source files / create deltas
+            Parallel.ForEach(targetDir.GetFiles("*", SearchOption.AllDirectories),
+                new ParallelOptions() { MaxDegreeOfParallelism = 5 },
+                targetFile =>
                 {
                     //find a matching source file based on the relative path of the file
-                FileInfo sourceFile = SourceFiles.Find(f => f.FullName.Replace(sourceDir.FullName, "") == targetFile.FullName.Replace(targetDir.FullName, ""));
+
+                    FileInfo sourceFile = SourceFiles.Find(f =>
+                        f.FullName.Replace(sourceDir.FullName, "") ==
+                        targetFile.FullName.Replace(targetDir.FullName, ""));
 
                     //if the target file doesn't exist in the source files, the target file needs to be added.
                     if (sourceFile == null)
@@ -305,16 +317,19 @@ namespace PatcherUtils
                         newCount++;
                         filesProcessed++;
 
-                    RaiseProgressChanged(filesProcessed, fileCountTotal, $"{targetFile.FullName.Replace(TargetFolder, "...")}.new", AdditionalInfo.ToArray());
+                        RaiseProgressChanged(filesProcessed, fileCountTotal,
+                            $"{targetFile.FullName.Replace(TargetFolder, "...")}.new", AdditionalInfo.ToArray());
 
-                    continue;
+                        return;
                     }
 
                     string extension = "";
 
-                //if a matching source file was found, check the file hashes and get the delta.
+                    // if a matching source file was found, check the file hashes and get the delta.
+                    // add it to the bag for removal later
                     if (!CompareFileHashes(sourceFile.FullName, targetFile.FullName))
                     {
+                        foundFilesQueue.Enqueue(sourceFile);
                         PatchLogger.LogInfo("::: Creating .delta file :::");
                         CreateDelta(sourceFile.FullName, targetFile.FullName);
                         extension = ".delta";
@@ -322,26 +337,38 @@ namespace PatcherUtils
                     }
                     else
                     {
+                        foundFilesQueue.Enqueue(sourceFile);
                         PatchLogger.LogInfo("::: File Exists :::");
                         existCount++;
                     }
 
-                try
-                {
-                    SourceFiles.Remove(sourceFile);
-                }
-                catch(Exception ex)
-                {
-                    PatchLogger.LogException(ex);
-                }
-
                     filesProcessed++;
 
                     AdditionalInfo[0].ItemValue = deltaCount;
                     AdditionalInfo[1].ItemValue = newCount;
                     AdditionalInfo[3].ItemValue = existCount;
 
-                RaiseProgressChanged(filesProcessed, fileCountTotal, $"{targetFile.FullName.Replace(TargetFolder, "...")}{extension}", AdditionalInfo.ToArray());
+                    RaiseProgressChanged(filesProcessed, fileCountTotal,
+                        $"{targetFile.FullName.Replace(TargetFolder, "...")}{extension}", AdditionalInfo.ToArray());
+                });
+
+            // remove all queued files that were found in the source files list
+            PatchLogger.LogInfo(":: Updating Source List ::");
+            try
+            {
+                int processedQueueCount = 0;
+                int queueTotal = foundFilesQueue.Count;
+
+                foreach (var queuedFile in foundFilesQueue)
+                {
+                    RaiseProgressChanged(processedQueueCount, queueTotal, $"Queued file removed: {queuedFile.Name}",
+                        AdditionalInfo.ToArray());
+                    SourceFiles.Remove(queuedFile);
+                }
+            }
+            catch (Exception ex)
+            {
+                PatchLogger.LogException(ex);
             }
 
             //Any remaining source files do not exist in the target folder and can be removed.
@@ -368,7 +395,8 @@ namespace PatcherUtils
                 AdditionalInfo[2].ItemValue = delCount;
 
                 filesProcessed++;
-                RaiseProgressChanged(filesProcessed, fileCountTotal, $"{delFile.FullName.Replace(SourceFolder, "...")}.del", AdditionalInfo.ToArray());
+                RaiseProgressChanged(filesProcessed, fileCountTotal,
+                    $"{delFile.FullName.Replace(SourceFolder, "...")}.del", AdditionalInfo.ToArray());
             }
 
             PatchLogger.LogInfo("::: Patch Generation Complete :::");
@@ -398,7 +426,7 @@ namespace PatcherUtils
                 return new PatchMessage(message, PatcherExitCode.MissingDir);
             }
 
-            if(!deltaDir.Exists)
+            if (!deltaDir.Exists)
             {
                 string message = $"Could not find delta directory: {deltaDir.FullName}";
                 PatchLogger.LogError(message);
@@ -424,30 +452,43 @@ namespace PatcherUtils
                 new LineItem("Files to Delete", delCount)
             };
 
+            ConcurrentQueue<PatchMessage> errorsQueue = new ConcurrentQueue<PatchMessage>();
             filesProcessed = 0;
 
             fileCountTotal = deltaFiles.Count;
+            var patchingTokenSource = new CancellationTokenSource();
 
-            foreach (FileInfo deltaFile in deltaDir.GetFiles("*", SearchOption.AllDirectories))
+            // foreach (FileInfo deltaFile in deltaDir.GetFiles("*", SearchOption.AllDirectories))
+            Parallel.ForEach(deltaDir.GetFiles("*", SearchOption.AllDirectories).ToList(), 
+                new ParallelOptions() { MaxDegreeOfParallelism = 5, CancellationToken = patchingTokenSource.Token},
+                deltaFile => 
             {
                 switch (deltaFile.Extension)
                 {
                     case ".delta":
                     {
                         //apply delta
-                            FileInfo sourceFile = SourceFiles.Find(f => f.FullName.Replace(sourceDir.FullName, "") == deltaFile.FullName.Replace(deltaDir.FullName, "").Replace(".delta", ""));
+                        FileInfo sourceFile = SourceFiles.Find(f =>
+                            f.FullName.Replace(sourceDir.FullName, "") == deltaFile.FullName
+                                .Replace(deltaDir.FullName, "").Replace(".delta", ""));
 
                         if (sourceFile == null)
                         {
-                                return new PatchMessage($"Failed to find matching source file for '{deltaFile.FullName}'", PatcherExitCode.MissingFile);
+                            patchingTokenSource.Cancel();
+                            errorsQueue.Enqueue(new PatchMessage(
+                                $"Failed to find matching source file for '{deltaFile.FullName}'",
+                                PatcherExitCode.MissingFile));
+                            return;
                         }
 
                         PatchLogger.LogInfo("::: Applying Delta :::");
                         var result = ApplyDelta(sourceFile.FullName, deltaFile.FullName);
 
-                            if(!result.Item1)
+                        if (!result.Item1)
                         {
-                                return new PatchMessage(result.Item2, PatcherExitCode.PatchFailed);
+                            patchingTokenSource.Cancel();
+                            errorsQueue.Enqueue(new PatchMessage(result.Item2, PatcherExitCode.PatchFailed));
+                            return;
                         }
 
                         deltaCount--;
@@ -457,7 +498,8 @@ namespace PatcherUtils
                     case ".new":
                     {
                         //copy new file
-                            string destination = Path.Join(sourceDir.FullName, deltaFile.FullName.Replace(deltaDir.FullName, "").Replace(".new", ""));
+                        string destination = Path.Join(sourceDir.FullName,
+                            deltaFile.FullName.Replace(deltaDir.FullName, "").Replace(".new", ""));
 
                         PatchLogger.LogInfo("::: Adding New File :::");
 
@@ -467,10 +509,12 @@ namespace PatcherUtils
                             File.Copy(deltaFile.FullName, destination, true);
                             PatchLogger.LogInfo($"File added: {destination}");
                         }
-                            catch(Exception ex)
+                        catch (Exception ex)
                         {
+                            patchingTokenSource.Cancel();
                             PatchLogger.LogException(ex);
-                                return new PatchMessage(ex.Message, PatcherExitCode.PatchFailed);
+                            errorsQueue.Enqueue(new PatchMessage(ex.Message, PatcherExitCode.PatchFailed));
+                            return;
                         }
 
                         newCount--;
@@ -480,7 +524,8 @@ namespace PatcherUtils
                     case ".del":
                     {
                         //remove unneeded file
-                            string delFilePath = Path.Join(sourceDir.FullName, deltaFile.FullName.Replace(deltaDir.FullName, "").Replace(".del", ""));
+                        string delFilePath = Path.Join(sourceDir.FullName,
+                            deltaFile.FullName.Replace(deltaDir.FullName, "").Replace(".del", ""));
 
                         PatchLogger.LogInfo("::: Removing Uneeded File :::");
 
@@ -489,10 +534,12 @@ namespace PatcherUtils
                             File.Delete(delFilePath);
                             PatchLogger.LogInfo($"File removed: {delFilePath}");
                         }
-                            catch(Exception ex)
+                        catch (Exception ex)
                         {
+                            patchingTokenSource.Cancel();
                             PatchLogger.LogException(ex);
-                                return new PatchMessage(ex.Message, PatcherExitCode.PatchFailed);
+                            errorsQueue.Enqueue(new PatchMessage(ex.Message, PatcherExitCode.PatchFailed));
+                            return;
                         }
 
                         delCount--;
@@ -507,10 +554,21 @@ namespace PatcherUtils
 
                 ++filesProcessed;
                 RaiseProgressChanged(filesProcessed, fileCountTotal, deltaFile.Name, AdditionalInfo.ToArray());
+            });
+
+            if (errorsQueue.Count > 0)
+            {
+                if (!errorsQueue.TryDequeue(out PatchMessage error))
+                {
+                    return new PatchMessage("Errors occurred during patching, but we couldn't dequeue them :(\n\nThere may be more information in the log", PatcherExitCode.PatchFailed);
+                }
+
+                return error;
             }
 
             PatchLogger.LogInfo("::: Patching Complete :::");
-            return new PatchMessage($"Patching Complete. You can delete the patcher.exe file.", PatcherExitCode.Success);
+            return new PatchMessage($"Patching Complete. You can delete the patcher.exe file.",
+                PatcherExitCode.Success);
         }
     }
 }