From 13c03236e5fa2a895c91e5d96f28a5a4230f7180 Mon Sep 17 00:00:00 2001 From: HyperPolygon64 Date: Thu, 5 Dec 2019 20:14:25 +0000 Subject: [PATCH] Fixed invalidated repack sessions modified: Sonic-06-Toolkit/Properties/AssemblyInfo.cs modified: Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs --- Sonic-06-Toolkit/Properties/AssemblyInfo.cs | 2 +- .../src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Sonic-06-Toolkit/Properties/AssemblyInfo.cs b/Sonic-06-Toolkit/Properties/AssemblyInfo.cs index e3050f42..c09b554a 100644 --- a/Sonic-06-Toolkit/Properties/AssemblyInfo.cs +++ b/Sonic-06-Toolkit/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.1.0.0")] +[assembly: AssemblyFileVersion("3.1.1.0")] diff --git a/Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs b/Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs index 2fcd2dca..b34cb5a3 100644 --- a/Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs +++ b/Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs @@ -48,7 +48,7 @@ namespace Toolkit.EnvironmentX { public partial class Main : Form { - public static readonly string versionNumber = "Version 3.1"; // Defines the version number to be used globally + public static readonly string versionNumber = "Version 3.11"; // Defines the version number to be used globally public static List sessionLog = new List(); public static string repackBuildSession = string.Empty; public static string serverStatus = string.Empty; @@ -351,9 +351,11 @@ void FixMetadata(string repackBuildSession, string filename) { private async void Btn_Repack_Click(object sender, EventArgs e) { string metadata = string.Empty; - + try { if (!unifytb_Main.SelectedTab.ToolTipText.StartsWith("Zm9sZGVy")) { + repackBuildSession = Path.Combine(Program.applicationData, Paths.Archives, Program.sessionID.ToString(), unifytb_Main.SelectedTab.ToolTipText); + metadata = File.ReadAllText(Path.Combine(repackBuildSession, "metadata.ini")); Status = StatusMessages.cmn_Repacking(metadata, false); await ProcessAsyncHelper.ExecuteShellCommand(Paths.Repack, @@ -423,8 +425,9 @@ private async void RepackAs(string filename) { if (filename != string.Empty) { try { if (!unifytb_Main.SelectedTab.ToolTipText.StartsWith("Zm9sZGVy")) { + repackBuildSession = Path.Combine(Program.applicationData, Paths.Archives, Program.sessionID.ToString(), unifytb_Main.SelectedTab.ToolTipText); + metadata = File.ReadAllText(Path.Combine(repackBuildSession, "metadata.ini")); - Status = StatusMessages.cmn_RepackingAs(metadata, filename, false); await ProcessAsyncHelper.ExecuteShellCommand(Paths.Repack, $"\"{Path.Combine(repackBuildSession, Path.GetFileNameWithoutExtension(metadata))}\"", @@ -590,6 +593,7 @@ private void File_NewARC_Click(object sender, EventArgs e) { private void Tm_CheapFix_Tick(object sender, EventArgs e) { try { + RefreshPath(); if (unifytb_Main.SelectedTab.ToolTipText != string.Empty && !unifytb_Main.SelectedTab.ToolTipText.StartsWith("Zm9sZGVy")) { //Reads the metadata to get the original location of the ARC. if (File.Exists(Path.Combine(repackBuildSession, "metadata.ini"))) { @@ -611,7 +615,7 @@ private void Tm_CheapFix_Tick(object sender, EventArgs e) { private void RefreshPath() { try { - //repackBuildSession = Path.Combine(Program.applicationData, Paths.Archives, Program.sessionID.ToString(), unifytb_Main.SelectedTab.ToolTipText); + repackBuildSession = Path.Combine(Program.applicationData, Paths.Archives, Program.sessionID.ToString(), unifytb_Main.SelectedTab.ToolTipText); string getCurrentPath = string.Empty; if (CurrentARC().Url != null) {