Mirrors/XCI-Explorer
2
0
Fork 0
mirror of https://github.com/StudentBlake/XCI-Explorer synced 2024-11-10 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use platform independent directory seperators.

Browse source 
The "Path.DirectorySeparatorChar" variable contains a directory
separator that works on both Windows, and the Unixes.
This commit is contained in:
Koopa 2019-11-04 16:55:52 -05:00
parent 8965a7376b
commit ef59875017
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
XCI_Explorer/MainForm.cs
View file

@ -78,7 +78,7 @@ namespace XCI_Explorer
} }
} }
if (!File.Exists("tools\\hactool.exe")) if (!File.Exists($"tools{Path.DirectorySeparatorChar}hactool.exe"))
{ {
Directory.CreateDirectory("tools"); Directory.CreateDirectory("tools");
MessageBox.Show("hactool.exe is missing.\nPlease include hactool.exe in the 'tools' folder."); MessageBox.Show("hactool.exe is missing.\nPlease include hactool.exe in the 'tools' folder.");
@ -405,7 +405,7 @@ namespace XCI_Explorer
process.StartInfo = new ProcessStartInfo process.StartInfo = new ProcessStartInfo
{ {
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
FileName = "tools\\hactool.exe", FileName = $"tools{Path.DirectorySeparatorChar}hactool.exe",
Arguments = "-k keys.txt --section0dir=data meta", Arguments = "-k keys.txt --section0dir=data meta",
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
@ -494,7 +494,7 @@ namespace XCI_Explorer
byte[] array5 = new byte[64 * 1024]; byte[] array5 = new byte[64 * 1024];
fileStream.Position = 16 + 24 * PFS0.PFS0_Headers[0].FileCount + PFS0.PFS0_Headers[0].StringTableSize + array3[n].Offset; fileStream.Position = 16 + 24 * PFS0.PFS0_Headers[0].FileCount + PFS0.PFS0_Headers[0].StringTableSize + array3[n].Offset;
using (Stream output = File.Create("tmp\\" + ncaTarget)) using (Stream output = File.Create($"tmp{Path.DirectorySeparatorChar}" + ncaTarget))
{ {
long Size = array3[n].Size; long Size = array3[n].Size;
int result = 0; int result = 0;
@ -522,7 +522,7 @@ namespace XCI_Explorer
process.StartInfo = new ProcessStartInfo process.StartInfo = new ProcessStartInfo
{ {
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
FileName = "tools\\hactool.exe", FileName = $"tools{Path.DirectorySeparatorChar}hactool.exe",
Arguments = "-k keys.txt --romfsdir=tmp tmp/" + ncaTarget Arguments = "-k keys.txt --romfsdir=tmp tmp/" + ncaTarget
}; };
@ -533,7 +533,7 @@ namespace XCI_Explorer
try try
{ {
byte[] source = File.ReadAllBytes("tmp\\control.nacp"); byte[] source = File.ReadAllBytes($"tmp{Path.DirectorySeparatorChar}control.nacp");
NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray()); NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray());
for (int i = 0; i < NACP.NACP_Strings.Length; i++) for (int i = 0; i < NACP.NACP_Strings.Length; i++)
@ -543,7 +543,7 @@ namespace XCI_Explorer
if (NACP.NACP_Strings[i].Check != 0) if (NACP.NACP_Strings[i].Check != 0)
{ {
CB_RegionName.Items.Add(Language[i]); CB_RegionName.Items.Add(Language[i]);
string icon_filename = "tmp\\icon_" + Language[i].Replace(" ", "") + ".dat"; string icon_filename = $"tmp{Path.DirectorySeparatorChar}icon_" + Language[i].Replace(" ", "") + ".dat";
if (File.Exists(icon_filename)) if (File.Exists(icon_filename))
{ {
using (Bitmap original = new Bitmap(icon_filename)) using (Bitmap original = new Bitmap(icon_filename))
@ -602,7 +602,7 @@ namespace XCI_Explorer
process.StartInfo = new ProcessStartInfo process.StartInfo = new ProcessStartInfo
{ {
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
FileName = "tools\\hactool.exe", FileName = $"tools{Path.DirectorySeparatorChar}hactool.exe",
Arguments = "-k keys.txt tmp/" + ncaTarget, Arguments = "-k keys.txt tmp/" + ncaTarget,
RedirectStandardOutput = true, RedirectStandardOutput = true,
UseShellExecute = false, UseShellExecute = false,
@ -702,7 +702,7 @@ namespace XCI_Explorer
process.StartInfo = new ProcessStartInfo process.StartInfo = new ProcessStartInfo
{ {
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
FileName = "tools\\hactool.exe", FileName = $"tools{Path.DirectorySeparatorChar}hactool.exe",
Arguments = "-k keys.txt --section0dir=data meta" Arguments = "-k keys.txt --section0dir=data meta"
}; };
process.Start(); process.Start();
@ -773,15 +773,15 @@ namespace XCI_Explorer
process.StartInfo = new ProcessStartInfo process.StartInfo = new ProcessStartInfo
{ {
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
FileName = "tools\\hactool.exe", FileName = $"tools{Path.DirectorySeparatorChar}hactool.exe",
Arguments = "-k keys.txt --romfsdir=data meta" Arguments = "-k keys.txt --romfsdir=data meta"
}; };
process.Start(); process.Start();
process.WaitForExit(); process.WaitForExit();
if (File.Exists("data\\control.nacp")) if (File.Exists($"data{Path.DirectorySeparatorChar}control.nacp"))
{ {
byte[] source = File.ReadAllBytes("data\\control.nacp"); byte[] source = File.ReadAllBytes($"data{Path.DirectorySeparatorChar}control.nacp");
NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray()); NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray());
string GameVer = NACP.NACP_Datas[0].GameVer.Replace("\0", ""); string GameVer = NACP.NACP_Datas[0].GameVer.Replace("\0", "");
@ -804,7 +804,7 @@ namespace XCI_Explorer
if (NACP.NACP_Strings[i].Check != 0 && !CB_RegionName.Items.Contains(Language[i])) if (NACP.NACP_Strings[i].Check != 0 && !CB_RegionName.Items.Contains(Language[i]))
{ {
CB_RegionName.Items.Add(Language[i]); CB_RegionName.Items.Add(Language[i]);
string icon_filename = "data\\icon_" + Language[i].Replace(" ", "") + ".dat"; string icon_filename = $"data{Path.DirectorySeparatorChar}icon_" + Language[i].Replace(" ", "") + ".dat";
if (File.Exists(icon_filename)) if (File.Exists(icon_filename))
{ {
using (Bitmap original = new Bitmap(icon_filename)) using (Bitmap original = new Bitmap(icon_filename))