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

Allow multiple distinct headers per file; bump version

Browse Source
This commit is contained in:
Matt Nadareski
2016-03-31 12:38:58 -07:00
parent 382f8a2d02
commit 33890db6f4
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DATabase/DATabase.cs
View File

@@ -15,7 +15,7 @@ namespace SabreTools
private static Logger logger;
private static string _dbName = "DATabase.sqlite";
private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;";
private static string _version = "0.2.4.0";
private static string _version = "0.2.5.0";
private static string _header =
@"+-----------------------------------------------------------------------------+
| DATabase " + _version + @" |

42
Deheader/Headerer.cs
View File

@@ -13,7 +13,7 @@ namespace SabreTools
/// </summary>
class Headerer
{
private static string _version = "0.2.4.0";
private static string _version = "0.2.5.0";
private static string _dbName = "Headerer.sqlite";
private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;";
private static Dictionary<string, int> types;
@@ -187,7 +187,7 @@ Options:
sha1.ComputeHash(File.ReadAllBytes(file + ".new"));
bool exists = false;
string query = @"SELECT * FROM data WHERE sha1='" + BitConverter.ToString(sha1.Hash) + "'";
string query = @"SELECT * FROM data WHERE sha1='" + BitConverter.ToString(sha1.Hash) + "' AND header='" + realhead + "'";
using (SQLiteConnection dbc = new SQLiteConnection(_connectionString))
{
dbc.Open();
@@ -220,7 +220,7 @@ Options:
}
/// <summary>
/// Detect and replace header to the given file
/// Detect and replace header(s) to the given file
/// </summary>
/// <param name="file">Name of the file to be parsed</param>
private static void ReplaceHeader(string file)
@@ -230,7 +230,7 @@ Options:
sha1.ComputeHash(File.ReadAllBytes(file));
string hash = BitConverter.ToString(sha1.Hash);
// Then try to pull the corresponding thing from the database
// Then try to pull the corresponding headers from the database
string header = "";
string query = @"SELECT header, type FROM data WHERE sha1='" + hash + "'";
@@ -243,23 +243,14 @@ Options:
{
if (sldr.HasRows)
{
sldr.Read();
int sub = 0;
while (sldr.Read())
{
Console.WriteLine("Found match with rom type " + sldr.GetString(1));
header = sldr.GetString(0);
}
}
}
}
// If the header isn't null, add it to the file. Otherwise tell the user
if (header == "")
{
Console.WriteLine("No matching header could be found!");
return;
}
Console.WriteLine("Creating reheadered file: " + file + ".new");
BinaryWriter bw = new BinaryWriter(File.OpenWrite(file + ".new"));
Console.WriteLine("Creating reheadered file: " + 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
for (int i = 0; i < header.Length; i += 2)
@@ -270,6 +261,16 @@ Options:
bw.Close();
Console.WriteLine("Reheadered file created!");
}
}
else
{
Console.WriteLine("No matching header could be found!");
return;
}
}
}
}
}
/// <summary>
/// Ensure that the databse exists and has the proper schema
@@ -292,9 +293,10 @@ Options:
// Make sure the database has the correct schema
string query = @"
CREATE TABLE IF NOT EXISTS data (
'sha1' TEXT PRIMARY KEY NOT NULL,
'sha1' TEXT NOT NULL,
'header' TEXT NOT NULL,
'type' TEXT NOT NULL
'type' TEXT NOT NULL,
PRIMARY KEY (sha1, header, type)
)";
SQLiteCommand slc = new SQLiteCommand(query, dbc);
slc.ExecuteNonQuery();

2
README.MD
View File

@@ -36,7 +36,7 @@ A simple auxilary tool that detects and removes headers and also restores header
<li>Nintendo Entertainment System / Famicom</li>
<li>Super Nintendo Entertainment System</li>
</ul>
The saved headers are currently stored in a database; one header per file. This restriction may be lifted in the future.
The saved headers are currently stored in a database; multiple headers allowed per file.
<h3>Contributions</h3>

2
SabreToolsUI/SabreToolsUI.Designer.cs generated
View File

@@ -261,7 +261,7 @@
this.MainMenuStrip = this.menuStrip1;
this.Name = "SabreToolsUI";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "SabreTools UI 0.2.4.0";
this.Text = "SabreTools UI 0.2.5.0";
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);