The-Homebrew-Cloud/nusdownloader
2
0
Fork 0
mirror of https://github.com/WB3000/nusdownloader.git synced 2024-11-17 07:09:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressed Issue 1 on Google Code (more official name recognition)

Browse Source 
Replaced some (currentdir + x) with Path.Combine(currendir, x)
- This should be done to ALL instances eventually...
This commit is contained in:
givememystuffplease 2010-07-04 02:16:14 +00:00
parent 73af599d1c
commit fb4ca758f2
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
NUS Downloader/Form1.cs
View File

@ -22,7 +22,7 @@ namespace NUS_Downloader
const string DSiNUSURL = "http://nus.cdn.t.shop.nintendowifi.net/ccs/download/"; const string DSiNUSURL = "http://nus.cdn.t.shop.nintendowifi.net/ccs/download/";
// TODO: Always remember to change version! // TODO: Always remember to change version!
string version = "v1.5a (Beta)"; string version = "v1.5a Beta";
WebClient generalWC = new WebClient(); WebClient generalWC = new WebClient();
static RijndaelManaged rijndaelCipher; static RijndaelManaged rijndaelCipher;
static bool dsidecrypt = false; static bool dsidecrypt = false;
@ -228,11 +228,11 @@ namespace NUS_Downloader
// Directory stuff // Directory stuff
string currentdir = Directory.GetCurrentDirectory(); string currentdir = Directory.GetCurrentDirectory();
if (currentdir.EndsWith(Convert.ToString(Path.DirectorySeparatorChar.ToString())) == false) //if (currentdir.EndsWith(Convert.ToString(Path.DirectorySeparatorChar.ToString())) == false)
currentdir += Path.DirectorySeparatorChar.ToString(); //currentdir += Path.DirectorySeparatorChar.ToString();
// Check for Wii common key bin file... // Check for Wii common key bin file...
if (File.Exists(currentdir + "key.bin") == false) if (File.Exists(Path.Combine(currentdir, "key.bin")) == false)
{ {
WriteStatus("Common Key (key.bin) missing! Decryption disabled!"); WriteStatus("Common Key (key.bin) missing! Decryption disabled!");
WriteStatus(" - To enable it, why not try choosing \"Retrieve Common Key\" from the Extras menu?"); WriteStatus(" - To enable it, why not try choosing \"Retrieve Common Key\" from the Extras menu?");
@ -250,33 +250,33 @@ namespace NUS_Downloader
{ {
WriteStatus(" - Converting your key.bin file to the correct format..."); WriteStatus(" - Converting your key.bin file to the correct format...");
// Directory stuff // Directory stuff
string keydir = Directory.GetCurrentDirectory(); //string keydir = Directory.GetCurrentDirectory();
if (!(keydir.EndsWith(Path.DirectorySeparatorChar.ToString())) || !(keydir.EndsWith(Path.AltDirectorySeparatorChar.ToString()))) //if (!(keydir.EndsWith(Path.DirectorySeparatorChar.ToString())) || !(keydir.EndsWith(Path.AltDirectorySeparatorChar.ToString())))
keydir += Path.DirectorySeparatorChar.ToString(); //keydir += Path.DirectorySeparatorChar.ToString();
TextReader ckreader = new StreamReader(currentdir + "key.bin"); TextReader ckreader = new StreamReader(Path.Combine(currentdir, "key.bin"));
String ckashex = ckreader.ReadLine(); String ckashex = ckreader.ReadLine();
ckreader.Close(); ckreader.Close();
File.Delete(currentdir + "key.bin"); File.Delete(Path.Combine(currentdir, "key.bin"));
WriteCommonKey("key.bin", HexStringToByteArray(ckashex)); WriteCommonKey("key.bin", HexStringToByteArray(ckashex));
} }
} }
} }
// Check for Wii KOR common key bin file... // Check for Wii KOR common key bin file...
if (File.Exists(currentdir + "kkey.bin") == true) if (File.Exists(Path.Combine(currentdir, "kkey.bin")) == true)
{ {
WriteStatus("Korean Common Key detected."); WriteStatus("Korean Common Key detected.");
} }
// Check for DSi common key bin file... // Check for DSi common key bin file...
if (File.Exists(currentdir + "dsikey.bin") == true) if (File.Exists(Path.Combine(currentdir, "dsikey.bin")) == true)
{ {
WriteStatus("DSi Common Key detected."); WriteStatus("DSi Common Key detected.");
dsidecrypt = true; dsidecrypt = true;
} }
// Check for database.xml // Check for database.xml
if (File.Exists(currentdir + "database.xml") == false) if (File.Exists(Path.Combine(currentdir, "database.xml")) == false)
{ {
WriteStatus("Database.xml not found. Title database not usable!"); WriteStatus("Database.xml not found. Title database not usable!");
databaseButton.Visible = false; databaseButton.Visible = false;
@ -295,10 +295,10 @@ namespace NUS_Downloader
} }
// Check for Proxy Settings file... // Check for Proxy Settings file...
if (File.Exists(currentdir + "proxy.txt") == true) if (File.Exists(Path.Combine(currentdir, "proxy.txt")) == true)
{ {
WriteStatus("Proxy settings detected."); WriteStatus("Proxy settings detected.");
string[] proxy_file = File.ReadAllLines(currentdir + "proxy.txt"); string[] proxy_file = File.ReadAllLines(Path.Combine(currentdir, "proxy.txt"));
proxy_url = proxy_file[0]; proxy_url = proxy_file[0];
if (proxy_file.Length > 1) if (proxy_file.Length > 1)
{ {
@ -1616,24 +1616,24 @@ namespace NUS_Downloader
{ {
// Directory stuff // Directory stuff
string currentdir = Directory.GetCurrentDirectory(); string currentdir = Directory.GetCurrentDirectory();
if (!(currentdir.EndsWith(Path.DirectorySeparatorChar.ToString())) || !(currentdir.EndsWith(Path.AltDirectorySeparatorChar.ToString()))) //if (!(currentdir.EndsWith(Path.DirectorySeparatorChar.ToString())) || !(currentdir.EndsWith(Path.AltDirectorySeparatorChar.ToString())))
currentdir += Path.DirectorySeparatorChar.ToString(); //currentdir += Path.DirectorySeparatorChar.ToString();
if (File.Exists(currentdir + keyfile) == true) if (File.Exists(Path.Combine(currentdir, keyfile)) == true)
{ {
WriteStatus("Overwriting old key.bin..."); WriteStatus("Overwriting old key.bin...");
} }
try try
{ {
FileStream fs = File.OpenWrite(currentdir + keyfile); FileStream fs = File.OpenWrite(Path.Combine(currentdir, keyfile));
fs.Write(commonkey, 0, commonkey.Length); fs.Write(commonkey, 0, commonkey.Length);
fs.Close(); fs.Close();
WriteStatus("key.bin written - reloading..."); WriteStatus("key.bin written - Reloading...");
return true; return true;
} }
catch (IOException e) catch (IOException e)
{ {
WriteStatus("Error: couldn't write key.bin: " + e.Message); WriteStatus("Error: Couldn't write key.bin: " + e.Message);
} }
return false; return false;
} }
@ -1947,12 +1947,25 @@ namespace NUS_Downloader
/// <param name="titlename">The titlename.</param> /// <param name="titlename">The titlename.</param>
public void OfficialWADNaming(string titlename) public void OfficialWADNaming(string titlename)
{ {
if (titlename.Contains("IOS")) if (titlename == "MIOS")
wadnamebox.Text = "RVL-mios-[v].wad";
else if (titlename.Contains("IOS"))
wadnamebox.Text = titlename + "-64-[v].wad"; wadnamebox.Text = titlename + "-64-[v].wad";
else if (titlename.Contains("System Menu")) else if (titlename.Contains("System Menu"))
wadnamebox.Text = "RVL-WiiSystemmenu-[v].wad"; wadnamebox.Text = "RVL-WiiSystemmenu-[v].wad";
else if (titlename.Contains("System Menu"))
wadnamebox.Text = "RVL-WiiSystemmenu-[v].wad";
else if (titlename == "BC")
wadnamebox.Text = "RVL-bc-[v].wad";
else if (titlename.Contains("Mii Channel"))
wadnamebox.Text = "RVL-NigaoeNR-[v].wad";
else if (titlename.Contains("Shopping Channel"))
wadnamebox.Text = "RVL-Shopping-[v].wad";
else if (titlename.Contains("Weather Channel"))
wadnamebox.Text = "RVL-Weather-[v].wad";
else else
wadnamebox.Text = titlename + "-NUS-[v].wad"; wadnamebox.Text = titlename + "-NUS-[v].wad";
if (titleversion.Text != "") if (titleversion.Text != "")
wadnamebox.Text = wadnamebox.Text.Replace("[v]", "v" + titleversion.Text); wadnamebox.Text = wadnamebox.Text.Replace("[v]", "v" + titleversion.Text);
} }