From d74bb70ae6e69e01fd76dcf2ad5f238609af484f Mon Sep 17 00:00:00 2001 From: Henry Asbridge Date: Wed, 17 Jan 2024 01:16:26 +0000 Subject: [PATCH] Fix macOS requiring staging directory to be selected. Also places eboots on Desktop on macos, to avoid them being inside the app bundle. --- UnionPatcher.Gui/Forms/ModeSelectionForm.cs | 13 +++- UnionPatcher/OSUtil.cs | 11 +++ UnionPatcher/RemotePatch.cs | 81 +++++++++++++-------- 3 files changed, 73 insertions(+), 32 deletions(-) diff --git a/UnionPatcher.Gui/Forms/ModeSelectionForm.cs b/UnionPatcher.Gui/Forms/ModeSelectionForm.cs index ce45984..8116896 100644 --- a/UnionPatcher.Gui/Forms/ModeSelectionForm.cs +++ b/UnionPatcher.Gui/Forms/ModeSelectionForm.cs @@ -1,5 +1,8 @@ using System; using System.IO; +using System.Reflection; +using System.Text; +using Eto; using Eto.Drawing; using Eto.Forms; @@ -29,12 +32,18 @@ public class ModeSelectionForm : Form { private void openRemotePatcher(object sender, EventArgs e) { + // If we're on macOS then set the CWD to the app bundle MacOS folder, so that SCETool can be found. + if (OSUtil.GetPlatform() == OSPlatform.OSX) Directory.SetCurrentDirectory(OSUtil.GetExecutablePath()); + if (!Directory.Exists("scetool")) { // This will always occur on macOS, so don't show this message for macOS users. if (OSUtil.GetPlatform() != OSPlatform.OSX) Gui.CreateOkDialog("Workaround Triggered", ".NET could not locate the required files, triggering workaround."); - - Gui.CreateOkDialog("Workaround", "UnionPatcher RemotePatcher requires a staging folder on macOS or in special circumstances on Windows, please set this to the directory of the UnionPatcher app or executable!"); + + + + Gui.CreateOkDialog("Workaround", + $"UnionPatcher RemotePatcher requires a staging folder on macOS or in special circumstances on Windows, please set this to the directory of the UnionPatcher app or executable! {EtoEnvironment.GetFolderPath(EtoSpecialFolder.ApplicationResources)}"); SelectFolderDialog dialog = new SelectFolderDialog(); if (dialog.ShowDialog(this) != DialogResult.Ok) { diff --git a/UnionPatcher/OSUtil.cs b/UnionPatcher/OSUtil.cs index b4eb0da..30e6a90 100644 --- a/UnionPatcher/OSUtil.cs +++ b/UnionPatcher/OSUtil.cs @@ -1,6 +1,9 @@ using System; using System.Collections.Generic; +using System.Diagnostics; +using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.InteropServices; namespace LBPUnion.UnionPatcher @@ -29,6 +32,14 @@ namespace LBPUnion.UnionPatcher return EnumeratePlatforms().FirstOrDefault(p => RuntimeInformation.IsOSPlatform(p.Value.RuntimePlatform))?.Platform ?? default; } + + public static string GetExecutablePath() + { + var path = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); + if (string.IsNullOrEmpty(path)) + path = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName); + return path; + } } } diff --git a/UnionPatcher/RemotePatch.cs b/UnionPatcher/RemotePatch.cs index 8642559..676b9dd 100644 --- a/UnionPatcher/RemotePatch.cs +++ b/UnionPatcher/RemotePatch.cs @@ -91,16 +91,23 @@ public class RemotePatch { Console.WriteLine("Restoring original EBOOT.BIN from EBOOT.BIN.BAK"); + string workingDir = "."; + if (OSUtil.GetPlatform() == OSPlatform.OSX) + { + workingDir = "~/Documents/UnionPatcher"; + Directory.CreateDirectory(workingDir); + } + // Create a simple directory structure - Directory.CreateDirectory(@"eboot"); - Directory.CreateDirectory($@"eboot/{gameID}"); - Directory.CreateDirectory($@"eboot/{gameID}/original"); + Directory.CreateDirectory($@"{workingDir}/eboot"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original"); // Now we'll check and see if a backup exists on the server, if so download it and then upload it back as EBOOT.BIN if (FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass)) { - FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", @$"eboot/{gameID}/original/EBOOT.BIN.BAK", user, pass); - FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN.BAK", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass); + FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN.BAK", user, pass); + FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN.BAK", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass); } else { @@ -111,6 +118,13 @@ public class RemotePatch public void PSNEBOOTRemotePatch(string ps3ip, string gameID, string serverURL, string user, string pass) { Console.WriteLine("Detected Digital Copy - Running in Full Mode"); + + string workingDir = "."; + if (OSUtil.GetPlatform() == OSPlatform.OSX) + { + workingDir = "~/Documents/UnionPatcher"; + Directory.CreateDirectory(workingDir); + } string idps = ""; string contentID = ""; @@ -121,25 +135,25 @@ public class RemotePatch this._ps3Mapi.PS3.Notify("UnionRemotePatcher Connected! Patching..."); // Create simple directory structure - Directory.CreateDirectory(@"rifs"); - Directory.CreateDirectory(@"eboot"); - Directory.CreateDirectory($@"eboot/{gameID}"); - Directory.CreateDirectory($@"eboot/{gameID}/original"); - Directory.CreateDirectory($@"eboot/{gameID}/patched"); + Directory.CreateDirectory($@"{workingDir}/rifs"); + Directory.CreateDirectory($@"{workingDir}/eboot"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/patched"); // Let's grab and backup our EBOOT FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", - @$"eboot/{gameID}/original/EBOOT.BIN", user, pass); + @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", user, pass); // Now we'll check and see if a backup exists on the server or not, if we don't have one on the server, then upload one if (!FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass)) - FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN", + FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass); // Start getting idps and act.dat - these will help us decrypt a PSN eboot idps = PS3MAPI.PS3MAPIClientServer.PS3_GetIDPS(); - File.WriteAllBytes(@"data/idps", IDPSHelper.StringToByteArray(idps)); + File.WriteAllBytes($@"{workingDir}/data/idps", IDPSHelper.StringToByteArray(idps)); // Scan the users on the system users = GetUsers(ps3ip, user, pass); @@ -153,12 +167,12 @@ public class RemotePatch $"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/", user, pass)) if (fileName.Contains(gameID)) { - FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/act.dat", @"data/act.dat", + FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/act.dat", $@"{workingDir}/data/act.dat", user, pass); FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/home/{currentUser}/exdata/{fileName}", - @$"rifs/{fileName}", user, pass); + @$"{workingDir}/rifs/{fileName}", user, pass); contentID = fileName.Substring(0, fileName.Length - 4); @@ -168,10 +182,10 @@ public class RemotePatch } // Finally, let's decrypt the EBOOT.BIN - LaunchSCETool($" -v -d \"{Path.GetFullPath(@$"eboot/{gameID}/original/EBOOT.BIN")}\" \"{Path.GetFullPath(@$"eboot/{gameID}/original/EBOOT.ELF")}\""); + LaunchSCETool($" -v -d \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN")}\" \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/original/EBOOT.ELF")}\""); // Now, patch the EBOOT; - Patcher.PatchFile($"eboot/{gameID}/original/EBOOT.ELF", serverURL, $"eboot/{gameID}/patched/EBOOT.ELF"); + Patcher.PatchFile($"{workingDir}/eboot/{gameID}/original/EBOOT.ELF", serverURL, $"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF"); // Encrypt the EBOOT (PSN) LaunchSCETool($"--verbose " + @@ -191,10 +205,10 @@ public class RemotePatch $" --np-app-type=SPRX" + $" --np-content-id={contentID}" + $" --np-real-fname=EBOOT.BIN" + - $" --encrypt eboot/{gameID}/patched/EBOOT.ELF eboot/{gameID}/patched/EBOOT.BIN"); + $" --encrypt {workingDir}/eboot/{gameID}/patched/EBOOT.ELF {workingDir}/eboot/{gameID}/patched/EBOOT.BIN"); // And upload the encrypted, patched EBOOT to the system. - FTP.UploadFile(@$"eboot/{gameID}/patched/EBOOT.BIN", + FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass); } @@ -203,38 +217,45 @@ public class RemotePatch { Console.WriteLine("Detected Disc Copy - Running in Simplified Mode"); + string workingDir = "."; + if (OSUtil.GetPlatform() == OSPlatform.OSX) + { + workingDir = "~/Documents/UnionPatcher"; + Directory.CreateDirectory(workingDir); + } + // Create a simple directory structure - Directory.CreateDirectory(@"eboot"); - Directory.CreateDirectory($@"eboot/{gameID}"); - Directory.CreateDirectory($@"eboot/{gameID}/original"); - Directory.CreateDirectory($@"eboot/{gameID}/patched"); + Directory.CreateDirectory($@"{workingDir}/eboot"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/original"); + Directory.CreateDirectory($@"{workingDir}/eboot/{gameID}/patched"); // Let's grab and backup our EBOOT FTP.DownloadFile($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", - @$"eboot/{gameID}/original/EBOOT.BIN", user, pass); + @$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", user, pass); // Now we'll check and see if a backup exists on the server or not, if we don't have one on the server, then upload one if (!FTP.FileExists($"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass)) - FTP.UploadFile(@$"eboot/{gameID}/original/EBOOT.BIN", + FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/original/EBOOT.BIN", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN.BAK", user, pass); // Check for keys in the data directory - if (!File.Exists("data/keys")) + if (!File.Exists($"{workingDir}/data/keys")) throw new FileNotFoundException( "UnionRemotePatcher cannot find the keys, ldr_curves, or vsh_curves files required to continue. Please make sure you have copies of these files placed in the data directory where you found the executable to run UnionRemotePatcher. Without them, we can't patch your game."); // Decrypt the EBOOT - LaunchSCETool($"-v -d eboot/{gameID}/original/EBOOT.BIN eboot/{gameID}/original/EBOOT.ELF"); + LaunchSCETool($"-v -d {workingDir}/eboot/{gameID}/original/EBOOT.BIN {workingDir}/eboot/{gameID}/original/EBOOT.ELF"); // Now, patch the EBOOT; - Patcher.PatchFile($"eboot/{gameID}/original/EBOOT.ELF", serverURL, $"eboot/{gameID}/patched/EBOOT.ELF"); + Patcher.PatchFile($"{workingDir}/eboot/{gameID}/original/EBOOT.ELF", serverURL, $"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF"); // Encrypt the EBOOT (Disc) LaunchSCETool( - $" -v --sce-type=SELF --skip-sections=FALSE --key-revision=0A --self-app-version=0001000000000000 --self-auth-id=1010000001000003 --self-vendor-id=01000002 --self-ctrl-flags=0000000000000000000000000000000000000000000000000000000000000000 --self-cap-flags=00000000000000000000000000000000000000000000003B0000000100040000 --self-type=APP --self-fw-version=0003005500000000 --compress-data true --encrypt \"{Path.GetFullPath(@$"eboot/{gameID}/patched/EBOOT.ELF")}\" \"{Path.GetFullPath(@$"eboot/{gameID}/patched/EBOOT.BIN")}\""); + $" -v --sce-type=SELF --skip-sections=FALSE --key-revision=0A --self-app-version=0001000000000000 --self-auth-id=1010000001000003 --self-vendor-id=01000002 --self-ctrl-flags=0000000000000000000000000000000000000000000000000000000000000000 --self-cap-flags=00000000000000000000000000000000000000000000003B0000000100040000 --self-type=APP --self-fw-version=0003005500000000 --compress-data true --encrypt \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.ELF")}\" \"{Path.GetFullPath(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN")}\""); // And upload the encrypted, patched EBOOT to the system. - FTP.UploadFile(@$"eboot/{gameID}/patched/EBOOT.BIN", + FTP.UploadFile(@$"{workingDir}/eboot/{gameID}/patched/EBOOT.BIN", $"ftp://{ps3ip}/dev_hdd0/game/{gameID}/USRDIR/EBOOT.BIN", user, pass); } }