TheShadowEevee/Sharpii-NetCore
1
0
Fork 0
mirror of https://github.com/TheShadowEevee/Sharpii-NetCore.git synced 2025-01-11 14:58:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a File Path Seperator Bug

Browse source 
Fixed a program breaking bug that caused various issues with file access.
This commit is contained in:
Shadow Eevee 2020-03-06 20:01:25 -08:00
parent 8005685a35
commit efabed2e35
8 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Sharpii/BNS.cs
View file

@ -180,6 +180,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - BNS - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - BNS - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");

3
Sharpii/HBC.cs
View file

@ -173,7 +173,7 @@ namespace Sharpii
return false; return false;
} }
if (!File.Exists(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory) + "\\WadInstaller.dll")) if (!File.Exists(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "WadInstaller.dll")))
{ {
Console.WriteLine("ERROR: WadInstaller.dll not found"); Console.WriteLine("ERROR: WadInstaller.dll not found");
Console.WriteLine("\n\nAttemp to download? [Y/N]"); Console.WriteLine("\n\nAttemp to download? [Y/N]");
@ -331,6 +331,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - SendDol - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - SendDol - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");

1
Sharpii/IOS.cs
View file

@ -239,6 +239,7 @@ namespace Sharpii
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - IOS - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - IOS - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine(" Code based off PatchIOS by leathl"); Console.WriteLine(" Code based off PatchIOS by leathl");
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");
Console.WriteLine(""); Console.WriteLine("");

17
Sharpii/NUSD.cs
View file

@ -277,7 +277,7 @@ namespace Sharpii
{ {
if (wad == true) if (wad == true)
{ {
if (!File.Exists(temp + "\\" + id + "v" + version + ".wad")) if (!File.Exists(Path.Combine(temp, id + "v" + version + ".wad")))
{ {
Console.WriteLine("ERROR: Can't find WAD"); Console.WriteLine("ERROR: Can't find WAD");
return; return;
@ -287,19 +287,19 @@ namespace Sharpii
int index = realout.LastIndexOf("\\") > realout.LastIndexOf("/") ? realout.LastIndexOf("\\") : realout.LastIndexOf("/"); int index = realout.LastIndexOf("\\") > realout.LastIndexOf("/") ? realout.LastIndexOf("\\") : realout.LastIndexOf("/");
if (File.Exists(realout.Substring(0, index + 1) + ios)) if (File.Exists(realout.Substring(0, index + 1) + ios))
File.Delete(realout.Substring(0, index + 1) + ios); File.Delete(realout.Substring(0, index + 1) + ios);
File.Move(temp + "\\" + id + "v" + version + ".wad", realout.Substring(0, index + 1) + ios); File.Move(Path.Combine(temp, id + "v" + version + ".wad"), realout.Substring(0, index + 1) + ios);
} }
else if (ios == "" && NoOut == true) else if (ios == "" && NoOut == true)
{ {
if (File.Exists(realout + ".wad")) if (File.Exists(realout + ".wad"))
File.Delete(realout + ".wad"); File.Delete(realout + ".wad");
File.Move(temp + "\\" + id + "v" + version + ".wad", realout + ".wad"); File.Move(Path.Combine(temp, id + "v" + version + ".wad"), realout + ".wad");
} }
else else
{ {
if (File.Exists(realout)) if (File.Exists(realout))
File.Delete(realout); File.Delete(realout);
File.Move(temp + "\\" + id + "v" + version + ".wad", realout); File.Move(Path.Combine(temp, id + "v" + version + ".wad"), realout);
} }
DeleteADir.DeleteDirectory(temp); DeleteADir.DeleteDirectory(temp);
} }
@ -307,11 +307,11 @@ namespace Sharpii
{ {
if (output.Substring(output.Length - 1, 1) == "\\" || output.Substring(output.Length - 1, 1) == "/") if (output.Substring(output.Length - 1, 1) == "\\" || output.Substring(output.Length - 1, 1) == "/")
output = output.Substring(output.Length - 1, 1); output = output.Substring(output.Length - 1, 1);
if (File.Exists(output + "\\" + id + "v" + version + ".wad")) if (File.Exists(Path.Combine(output, id + "v" + version + ".wad")))
{ {
if (File.Exists(output + "\\" + ios)) if (File.Exists(Path.Combine(output, ios)))
File.Delete(output + "\\" + ios); File.Delete(Path.Combine(output, ios));
File.Move(output + "\\" + id + "v" + version + ".wad", output + "\\" + ios); File.Move(Path.Combine(output, id + "v" + version + ".wad"), Path.Combine(output, ios));
} }
} }
} }
@ -320,6 +320,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - NUSD - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - NUSD - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");

20
Sharpii/Program.cs
View file

@ -171,22 +171,21 @@ namespace Sharpii
Console.WriteLine("Installing Sharpii..."); Console.WriteLine("Installing Sharpii...");
if (BeQuiet.quiet > 1) if (BeQuiet.quiet > 1)
Console.WriteLine("Adding Variables"); Console.WriteLine("Adding Variables");
Environment.SetEnvironmentVariable("PATH", Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) + Environment.SetEnvironmentVariable("PATH", Path.Combine(Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine), ";", Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii"), EnvironmentVariableTarget.Machine);
";" + Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\", EnvironmentVariableTarget.Machine);
if (BeQuiet.quiet > 1) if (BeQuiet.quiet > 1)
Console.WriteLine("Creating Directory"); Console.WriteLine("Creating Directory");
if (Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\")) if (Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii")))
DeleteADir.DeleteDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\"); DeleteADir.DeleteDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii"));
Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\"); Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii"));
if (BeQuiet.quiet > 1) if (BeQuiet.quiet > 1)
Console.WriteLine("Copying Files"); Console.WriteLine("Copying Files");
File.Copy(AppDomain.CurrentDomain.BaseDirectory, Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\Sharpii.exe"); File.Copy(AppDomain.CurrentDomain.BaseDirectory, Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\Sharpii.exe");
if (File.Exists(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory) + "\\libWiiSharp.dll")) if (File.Exists(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "libWiiSharp.dll")))
File.Copy(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory) + "\\libWiiSharp.dll", Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\libWiiSharp.dll"); File.Copy(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "libWiiSharp.dll"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii", "libWiiSharp.dll"));
if (File.Exists(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory) + "\\WadInstaller.dll")) if (File.Exists(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "WadInstaller.dll")))
File.Copy(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory) + "\\WadInstaller.dll", Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\Sharpii\\WadInstaller.dll"); File.Copy(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "WadInstaller.dll"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Sharpii", "WadInstaller.dll"));
if (BeQuiet.quiet > 1) if (BeQuiet.quiet > 1)
{ {
@ -247,6 +246,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");
@ -321,5 +321,5 @@ public class BeQuiet
} }
public class ProgramVersion public class ProgramVersion
{ {
public static string version = "1.7.3; .Net Core Port"; public static string version = "1.0.1; .Net Core Port (Based on Sharpii 1.7.3)";
} }

1
Sharpii/TPL.cs
View file

@ -202,6 +202,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - TPL - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - TPL - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");

1
Sharpii/U8.cs
View file

@ -202,6 +202,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - U8 - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - U8 - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");

45
Sharpii/WAD.cs
View file

@ -380,10 +380,10 @@ namespace Sharpii
Directory.CreateDirectory(temp); Directory.CreateDirectory(temp);
wad.Unpack(temp + "\\main"); wad.Unpack(Path.Combine(temp, "main"));
U8 u = new U8(); U8 u = new U8();
u.LoadFile(temp + "\\main\\00000000.app"); u.LoadFile(Path.Combine(temp, "main", "00000000.app"));
u.Extract(temp + "\\main\\00000000"); u.Extract(Path.Combine(temp, "main", "00000000"));
WAD twad = new WAD(); WAD twad = new WAD();
@ -393,12 +393,12 @@ namespace Sharpii
Console.Write("Grabbing sound..."); Console.Write("Grabbing sound...");
twad.LoadFile(sound); twad.LoadFile(sound);
twad.Unpack(temp + "\\sound"); twad.Unpack(Path.Combine(temp + "sound"));
U8 tu = new U8(); U8 tu = new U8();
tu.LoadFile(temp + "\\sound\\00000000.app"); tu.LoadFile(Path.Combine(temp, "sound", "00000000.app"));
tu.Extract(temp + "\\sound\\00000000"); tu.Extract(Path.Combine(temp, "sound", "00000000"));
File.Copy(temp + "\\sound\\00000000\\meta\\sound.bin", temp + "\\main\\00000000\\meta\\sound.bin", true); File.Copy(Path.Combine(temp, "sound", "00000000", "meta", "sound.bin"), Path.Combine(temp, "main", "00000000", "meta", "sound.bin"), true);
if (BeQuiet.quiet > 2) if (BeQuiet.quiet > 2)
Console.Write("Done!\n"); Console.Write("Done!\n");
@ -409,12 +409,12 @@ namespace Sharpii
Console.Write("Grabbing banner..."); Console.Write("Grabbing banner...");
twad.LoadFile(banner); twad.LoadFile(banner);
twad.Unpack(temp + "\\banner"); twad.Unpack(Path.Combine(temp, "banner"));
U8 tu = new U8(); U8 tu = new U8();
tu.LoadFile(temp + "\\banner\\00000000.app"); tu.LoadFile(Path.Combine(temp, "banner", "00000000.app"));
tu.Extract(temp + "\\banner\\00000000"); tu.Extract(Path.Combine(temp, "banner", "00000000"));
File.Copy(temp + "\\banner\\00000000\\meta\\banner.bin", temp + "\\main\\00000000\\meta\\banner.bin", true); File.Copy(Path.Combine(temp, "banner", "00000000", "meta", "banner.bin"), Path.Combine(temp, "main", "00000000", "meta", "banner.bin"), true);
if (BeQuiet.quiet > 2) if (BeQuiet.quiet > 2)
Console.Write("Done!\n"); Console.Write("Done!\n");
@ -425,12 +425,12 @@ namespace Sharpii
Console.Write("Grabbing icon..."); Console.Write("Grabbing icon...");
twad.LoadFile(icon); twad.LoadFile(icon);
twad.Unpack(temp + "\\icon"); twad.Unpack(Path.Combine(temp, "icon"));
U8 tu = new U8(); U8 tu = new U8();
tu.LoadFile(temp + "\\icon\\00000000.app"); tu.LoadFile(Path.Combine(temp, "icon", "00000000.app"));
tu.Extract(temp + "\\icon\\00000000"); tu.Extract(Path.Combine(temp, "icon", "00000000"));
File.Copy(temp + "\\icon\\00000000\\meta\\icon.bin", temp + "\\main\\00000000\\meta\\icon.bin", true); File.Copy(Path.Combine(temp, "icon", "00000000", "meta", "icon.bin"), Path.Combine(temp, "main", "00000000", "meta", "icon.bin"), true);
if (BeQuiet.quiet > 2) if (BeQuiet.quiet > 2)
Console.Write("Done!\n"); Console.Write("Done!\n");
@ -442,8 +442,8 @@ namespace Sharpii
if (app.Substring(app.Length - 4, 4) == ".dol") if (app.Substring(app.Length - 4, 4) == ".dol")
{ {
Directory.CreateDirectory(temp + "\\dol\\"); Directory.CreateDirectory(Path.Combine(temp, "dol"));
File.Copy(app, temp + "\\dol\\00000001.app"); File.Copy(app, Path.Combine(temp, "dol", "00000001.app"));
} }
else else
{ {
@ -451,15 +451,15 @@ namespace Sharpii
twad.Unpack(temp + "\\dol"); twad.Unpack(temp + "\\dol");
} }
File.Copy(temp + "\\dol\\00000001.app", temp + "\\main\\00000001.app", true); File.Copy(Path.Combine(temp, "dol", "00000001.app"), Path.Combine(temp, "main", "00000001.app"), true);
if (BeQuiet.quiet > 2) if (BeQuiet.quiet > 2)
Console.Write("Done!\n"); Console.Write("Done!\n");
} }
u.ReplaceFile(1, temp + "\\main\\00000000\\meta\\banner.bin"); u.ReplaceFile(1, Path.Combine(temp, "main", "00000000", "meta", "banner.bin"));
u.ReplaceFile(2, temp + "\\main\\00000000\\meta\\icon.bin"); u.ReplaceFile(2, Path.Combine(temp, "main", "00000000", "meta", "icon.bin"));
u.ReplaceFile(3, temp + "\\main\\00000000\\meta\\sound.bin"); u.ReplaceFile(3, Path.Combine(temp, "main", "00000000", "meta", "sound.bin"));
u.Save(temp + "\\main\\00000000.app"); u.Save(Path.Combine(temp, "main", "00000000.app"));
DeleteADir.DeleteDirectory(temp + "\\main\\00000000\\"); DeleteADir.DeleteDirectory(temp + "\\main\\00000000\\");
wad.CreateNew(temp + "\\main"); wad.CreateNew(temp + "\\main");
DeleteADir.DeleteDirectory(temp); DeleteADir.DeleteDirectory(temp);
@ -602,6 +602,7 @@ namespace Sharpii
{ {
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine("Sharpii {0} - WAD - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version); Console.WriteLine("Sharpii {0} - WAD - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
Console.WriteLine("Sharpii .Net Core Port by TheShadowEevee");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(""); Console.WriteLine("");
Console.WriteLine(" Usage:"); Console.WriteLine(" Usage:");