Skip to content

Commit

Permalink
PAK Duplicating Bug Fix
Browse files Browse the repository at this point in the history
This minor fix addresses PAK file duplication as well as adding some addtional prompts to ensure that you are alerted when longer processes are completed.
  • Loading branch information
RadzPrower committed Jul 11, 2020
1 parent 1664b70 commit 83ad6a0
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 18 deletions.
Binary file modified .vs/SM64 NX Launcher/v16/.suo
Binary file not shown.
4 changes: 2 additions & 2 deletions SM64 EX Launcher/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
13 changes: 9 additions & 4 deletions SM64 EX Launcher/SM64 NX Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -27,8 +28,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<ApplicationVersion>1.1.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
Expand All @@ -38,7 +38,8 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand All @@ -48,14 +49,18 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Designcontest-Casino-Star.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="LibGit2Sharp, Version=0.26.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
<HintPath>..\packages\LibGit2Sharp.0.26.2\lib\net46\LibGit2Sharp.dll</HintPath>
Expand Down
Binary file removed SM64 EX Launcher/bin/Release/SM64 NX Launcher.pdb
Binary file not shown.
Binary file not shown.
13 changes: 9 additions & 4 deletions SM64 EX Launcher/mainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ private void mainForm_Shown(object sender, EventArgs e)
return;
}
if (buildBase()) return;
MessageBox.Show("Your repository, dependencies, and !!base.pak have all been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}

Expand All @@ -120,6 +121,7 @@ private void mainForm_Shown(object sender, EventArgs e)
if (answer == DialogResult.Yes)
{
updateRepo();
MessageBox.Show("Your repository has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
Expand Down Expand Up @@ -185,6 +187,7 @@ private void pullJSON()
StreamReader reader = new StreamReader(response.GetResponseStream());
File.WriteAllText(pakJSON, reader.ReadToEnd());
}
MessageBox.Show("Your PAK List has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}

private void pullJSON(object sender, EventArgs e)
Expand All @@ -199,6 +202,7 @@ private void pullJSON(object sender, EventArgs e)
}

populateGrid();
MessageBox.Show("Your PAK list has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}

private void outputText_TextChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -259,19 +263,19 @@ private bool launch()

private void enablePAK(PAK pak)
{
if (Directory.Exists(Path.Combine(pakDir,"~" + modDir)))
if (Directory.Exists(Path.Combine(pakDir,"~" + pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, pak.modDir)))
{
Directory.Move(Path.Combine(pakDir, "~" + modDir), Path.Combine(pakDir, pak.modDir));
Directory.Move(Path.Combine(pakDir, "~" + pak.modDir), Path.Combine(pakDir, pak.modDir));
}
else if (!Directory.Exists(Path.Combine(pakDir, pak.modDir)))
else if (!Directory.Exists(Path.Combine(pakDir, pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, "~" + pak.modDir)))
{
downloadPak(pak);
}
}

private void disablePAK(PAK pak)
{
if (Directory.Exists(Path.Combine(pakDir,pak.modDir)))
if (Directory.Exists(Path.Combine(pakDir, pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, "~" + pak.modDir)))
{
Directory.Move(Path.Combine(pakDir, pak.modDir), Path.Combine(pakDir, "~" + pak.modDir));
}
Expand Down Expand Up @@ -403,6 +407,7 @@ private void updateButton_Click(object sender, EventArgs e)
MessageBox.Show("Unable to update dependencies.\n\nCheck the log output or provide it for support.", "Dependency Update Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
MessageBox.Show("Your repository and dependencies have been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private Boolean checkHash(string file)
{
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c0858cee4b19038ee1be55b31fe6bc13cbfdac86
b5e4498920e16538428bf44a2d793221a3b23168
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Micros
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Microsoft.Scripting.xml
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Microsoft.Scripting.Metadata.xml
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Newtonsoft.Json.xml
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csprojAssemblyReference.cache
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.outputForm.resources
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.mainForm.resources
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.Properties.Resources.resources
Expand All @@ -31,3 +30,4 @@ C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 N
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csproj.CopyComplete
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.exe
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.pdb
C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csprojAssemblyReference.cache
20 changes: 14 additions & 6 deletions SM64 NX Launcher Installer/SM64 NX Launcher Installer.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
{
"Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.7.2"
}
}
}
}
"Release"
Expand Down Expand Up @@ -421,21 +429,21 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:SM64 NX Launcher Installer"
"ProductCode" = "8:{CBEC53D1-F807-4A41-8B23-2F2B0263FDD2}"
"PackageCode" = "8:{76B4121D-440D-41FA-B9CC-39B1147378BC}"
"ProductCode" = "8:{E93C9DFE-1F52-4C7A-9959-17F3E7953D6A}"
"PackageCode" = "8:{13C8C764-CDAC-492E-8C80-7DD7650DB3B5}"
"UpgradeCode" = "8:{E1A5A0B0-A06C-4AE9-A55D-4BD58F171B12}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.0"
"Manufacturer" = "8:Default Company Name"
"ProductVersion" = "8:1.0.1"
"Manufacturer" = "8:RadzPrower"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:SM64 NX Launcher Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Default Company Name"
"ARPCONTACT" = "8:RadzPrower"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
"ARPURLINFOABOUT" = "8:"
Expand Down

0 comments on commit 83ad6a0

Please sign in to comment.