Skip to content

Commit

Permalink
Fixed invalidated repack sessions
Browse files Browse the repository at this point in the history
	modified:   Sonic-06-Toolkit/Properties/AssemblyInfo.cs
	modified:   Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs
  • Loading branch information
HyperPolygon64 committed Dec 5, 2019
1 parent af27893 commit 13c0323
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Sonic-06-Toolkit/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
12 changes: 8 additions & 4 deletions Sonic-06-Toolkit/src/Sonic-06-Toolkit/ToolkitEnvironmentX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> sessionLog = new List<string>();
public static string repackBuildSession = string.Empty;
public static string serverStatus = string.Empty;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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))}\"",
Expand Down Expand Up @@ -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"))) {
Expand All @@ -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) {
Expand Down

0 comments on commit 13c0323

Please sign in to comment.