Replaced xdelta3 lib with exe

TekkaGB · Mar 28, 2023 · bcb367f · bcb367f
1 parent ba92352
commit bcb367f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/PizzaOven/Dependencies/xdelta.exe b/PizzaOven/Dependencies/xdelta.exe
diff --git a/PizzaOven/ModLoader.cs b/PizzaOven/ModLoader.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
-using xdelta3.net;
 
 namespace PizzaOven
 {
@@ -39,6 +38,13 @@ public static bool Build(string mod)
             var successes = 0;
             var FilesToPatch = Directory.GetFiles($"{Global.config.ModsFolder}{Global.s}sound{Global.s}Desktop").ToList();
             FilesToPatch.Insert(0, $"{Global.config.ModsFolder}{Global.s}data.win");
+            var xdelta = $"{Global.assemblyLocation}{Global.s}Dependencies{Global.s}xdelta.exe";
+            if (!File.Exists(xdelta))
+            {
+
+                Global.logger.WriteLine($"{xdelta} is not found. Please try redownloading Pizza Oven", LoggerType.Error);
+                return false;
+            }
             foreach (var modFile in Directory.GetFiles(mod, "*", SearchOption.AllDirectories))
             {
                 var extension = Path.GetExtension(modFile);
@@ -57,7 +63,7 @@ public static bool Build(string mod)
                         {
                             // Attempt to patch file
                             Global.logger.WriteLine($"Attempting to patch {file} with {modFile}...", LoggerType.Info);
-                            Patch(file, modFile, $"{Path.GetDirectoryName(file)}{Global.s}temp");
+                            Patch(file, modFile, $"{Path.GetDirectoryName(file)}{Global.s}temp", xdelta);
                             if (Path.GetFileName(file).Equals("data.win", StringComparison.InvariantCultureIgnoreCase))
                                 File.Move($"{Path.GetDirectoryName(file)}{Global.s}temp", $"{Path.GetDirectoryName(file)}{Global.s}PizzaOven.win", true);
                             else
@@ -142,12 +148,21 @@ public static bool Build(string mod)
             return errors == 0 && successes > 0;
         }
 
-        private static void Patch(string file, string patch, string output)
+        private static void Patch(string file, string patch, string output, string xdelta)
         {
-            var fileBytes = File.ReadAllBytes(file);
-            var patchBytes = File.ReadAllBytes(patch);
-            var decoded = Xdelta3Lib.Decode(fileBytes, patchBytes);
-            File.WriteAllBytes(output, decoded.ToArray());
+            ProcessStartInfo startInfo = new ProcessStartInfo();
+            startInfo.CreateNoWindow = true;
+            startInfo.UseShellExecute = false;
+            startInfo.FileName = xdelta;
+            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            startInfo.WorkingDirectory = Path.GetDirectoryName(xdelta);
+            startInfo.Arguments = $@"-d -s ""{file}"" ""{patch}"" ""{output}""";
+            using (Process process = new Process())
+            {
+                process.StartInfo = startInfo;
+                process.Start();
+                process.WaitForExit();
+            }
             Global.logger.WriteLine($"Applied {patch} to {file}.", LoggerType.Info);
         }
         private static void RestoreDirectory(string path)

diff --git a/PizzaOven/PizzaOven.csproj b/PizzaOven/PizzaOven.csproj
@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Assets\PizzaOvenIcon.ico</ApplicationIcon>
     <AssemblyName>PizzaOven</AssemblyName>
-    <AssemblyVersion>1.0.2.0</AssemblyVersion>
+    <AssemblyVersion>1.0.3.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,7 +28,6 @@
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="WindowsAPICodePack-Core" Version="1.1.2" />
     <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
-    <PackageReference Include="xdelta3.net" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,6 +43,12 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Dependencies\xdelta.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="UI\ChoiceWindow.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
@@ -58,8 +63,4 @@
     </Page>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Dependencies\" />
-  </ItemGroup>
-
 </Project>
diff --git a/PizzaOven/Setup.cs b/PizzaOven/Setup.cs
@@ -7,7 +7,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using xdelta3.net;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using System.Windows;
 

diff --git a/PizzaOven/UI/MainWindow.xaml.cs b/PizzaOven/UI/MainWindow.xaml.cs
@@ -20,7 +20,6 @@
 using System.Windows.Controls.Primitives;
 using System.Security.Cryptography;
 using Microsoft.Win32;
-using xdelta3.net;
 using System.Windows.Input;
 using System.Windows.Data;
 using SharpCompress.Archives.SevenZip;