claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert to logging statements

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-09 04:10:31 -07:00
parent 9ce5b2ee35
commit 72c4a95ae3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Deheader/Headerer.cs
View File

@@ -51,6 +51,7 @@ namespace SabreTools
if (args.Length == 0 || args.Length > 2) if (args.Length == 0 || args.Length > 2)
{ {
Build.Help(); Build.Help();
logger.Close();
return; return;
} }
@@ -124,6 +125,7 @@ namespace SabreTools
Build.Help(); Build.Help();
} }
} }
logger.Close();
} }
/// <summary> /// <summary>
@@ -192,11 +194,11 @@ namespace SabreTools
} }
} }
Console.WriteLine("File has header: " + (type != HeaderType.None)); logger.Log("File has header: " + (type != HeaderType.None));
if (type != HeaderType.None) if (type != HeaderType.None)
{ {
Console.WriteLine("Deteched header type: " + type); logger.Log("Deteched header type: " + type);
int hs = headerSize; int hs = headerSize;
// Save header as string in the database // Save header as string in the database
@@ -210,13 +212,13 @@ namespace SabreTools
hbin = hbin.Skip(hs).ToArray(); hbin = hbin.Skip(hs).ToArray();
// Write out the new file // Write out the new file
Console.WriteLine("Creating unheadered file: " + file + ".new"); logger.Log("Creating unheadered file: " + file + ".new");
BinaryWriter bw = new BinaryWriter(File.OpenWrite(file + ".new")); BinaryWriter bw = new BinaryWriter(File.OpenWrite(file + ".new"));
FileInfo fi = new FileInfo(file); FileInfo fi = new FileInfo(file);
bw.Write(hbin); bw.Write(hbin);
bw.Write(br.ReadBytes((int)fi.Length - hs)); bw.Write(br.ReadBytes((int)fi.Length - hs));
bw.Close(); bw.Close();
Console.WriteLine("Unheadered file created!"); logger.Log("Unheadered file created!");
// Now add the information to the database if it's not already there // Now add the information to the database if it's not already there
SHA1 sha1 = SHA1.Create(); SHA1 sha1 = SHA1.Create();
@@ -247,7 +249,7 @@ namespace SabreTools
dbc.Open(); dbc.Open();
using (SQLiteCommand slc = new SQLiteCommand(query, dbc)) using (SQLiteCommand slc = new SQLiteCommand(query, dbc))
{ {
Console.WriteLine("Result of inserting header: " + slc.ExecuteNonQuery()); logger.Log("Result of inserting header: " + slc.ExecuteNonQuery());
} }
} }
} }
@@ -282,10 +284,10 @@ namespace SabreTools
int sub = 0; int sub = 0;
while (sldr.Read()) while (sldr.Read())
{ {
Console.WriteLine("Found match with rom type " + sldr.GetString(1)); logger.Log("Found match with rom type " + sldr.GetString(1));
header = sldr.GetString(0); header = sldr.GetString(0);
Console.WriteLine("Creating reheadered file: " + file + ".new" + sub); logger.Log("Creating reheadered file: " + file + ".new" + sub);
BinaryWriter bw = new BinaryWriter(File.OpenWrite(file + ".new" + sub)); BinaryWriter bw = new BinaryWriter(File.OpenWrite(file + ".new" + sub));
// Source: http://stackoverflow.com/questions/311165/how-do-you-convert-byte-array-to-hexadecimal-string-and-vice-versa // Source: http://stackoverflow.com/questions/311165/how-do-you-convert-byte-array-to-hexadecimal-string-and-vice-versa
@@ -295,12 +297,12 @@ namespace SabreTools
} }
bw.Write(File.ReadAllBytes(file)); bw.Write(File.ReadAllBytes(file));
bw.Close(); bw.Close();
Console.WriteLine("Reheadered file created!"); logger.Log("Reheadered file created!");
} }
} }
else else
{ {
Console.WriteLine("No matching header could be found!"); logger.Warning("No matching header could be found!");
return; return;
} }
} }