Patcher/PatcherUtils/PatchHelper.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
-using PleOps.XdeltaSharp.Decoder;
+using PatcherUtils.Helpers;
 
 namespace PatcherUtils
 {
@@ -114,30 +114,37 @@ namespace PatcherUtils
         {
             string decodedPath = SourceFilePath + ".decoded";
 
-            try
+            var xdeltaArgs = $"-d {(debugOutput ? "-v -v" : "")} -f -s";
+
+            var xdeltaHelper =
+                new XdeltaProcessHelper(xdeltaArgs, SourceFilePath, DeltaFilePath, decodedPath, debugOutput);
+
+            if (!xdeltaHelper.Run())
             {
-                using var inputFile = new FileStream(SourceFilePath, FileMode.Open);
+                return (false, "something went wrong during the xdelta3 process");
-                using var patchFile = new FileStream(DeltaFilePath, FileMode.Open);
-                using var decodedFile = new FileStream(decodedPath, FileMode.Create);
-                using var decoder = new Decoder(inputFile, patchFile, decodedFile);
-                decoder.Run();
-            }
-            catch (Exception ex)
-            {
-                PatchLogger.LogException(ex);
-                return (false, ex.Message);
             }
 
-            try
+            if (File.Exists(decodedPath))
             {
-                File.Move(decodedPath, SourceFilePath, true);
+                PatchLogger.LogInfo($"File delta decoded: {SourceFilePath}");
-                PatchLogger.LogInfo($"Delta applied: {DeltaFilePath}");
+
-                return (true, "");
+                try
+                {
+                    File.Move(decodedPath, SourceFilePath, true);
+                    PatchLogger.LogInfo($"Delta applied: {DeltaFilePath}");
+                    return (true, "");
+                }
+                catch (Exception ex)
+                {
+                    PatchLogger.LogException(ex);
+                    return (false, ex.Message);
+                }
             }
-            catch (Exception ex)
+            else
             {
-                PatchLogger.LogException(ex);
+                string error = $"Failed to decode file delta: {SourceFilePath}";
-                return (false, ex.Message);
+                PatchLogger.LogError(error);
+                return (false, error);
             }
         }
 

Patcher/PatcherUtils/PatcherUtils.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -22,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PleOps.XdeltaSharp" Version="1.3.0" />
     <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.2.24" />
   </ItemGroup>