[ALL] Fix String.Empty

This commit is contained in:
Matt Nadareski
2017-01-27 16:40:58 -08:00
parent d1df5c2b60
commit c02a115c98
15 changed files with 379 additions and 294 deletions

View File

@@ -73,9 +73,9 @@ namespace SabreTools
if (onlyNeeded)
{
string query = "SELECT * FROM crcsha1 JOIN md5sha1 ON crcsha1.sha1=md5sha1.sha1"
+ " WHERE crcsha1.crc="" + rom.CRC + """
+ " OR md5sha1.md5="" + rom.MD5 + """
+ " OR md5sha1.sha1="" + rom.SHA1 + """;
+ " WHERE crcsha1.crc=\"" + rom.CRC + "\""
+ " OR md5sha1.md5=\"" + rom.MD5 + "\""
+ " OR md5sha1.sha1=\"" + rom.SHA1 + "\"";
SqliteCommand slc = new SqliteCommand(query, dbc);
SqliteDataReader sldr = slc.ExecuteReader();
@@ -84,23 +84,23 @@ namespace SabreTools
// Add to the queries
if (!String.IsNullOrEmpty(rom.CRC))
{
crcquery += " ("" + rom.CRC + "\"),";
crcquery += " (\"" + rom.CRC + "\"),";
}
if (!String.IsNullOrEmpty(rom.MD5))
{
md5query += " ("" + rom.MD5 + "\"),";
md5query += " (\"" + rom.MD5 + "\"),";
}
if (!String.IsNullOrEmpty(rom.SHA1))
{
sha1query += " ("" + rom.SHA1 + "\", "" + _depots.Keys.ToList()[0] + "\"),";
sha1query += " (\"" + rom.SHA1 + "\", \"" + _depots.Keys.ToList()[0] + "\"),";
if (!String.IsNullOrEmpty(rom.CRC))
{
crcsha1query += " ("" + rom.CRC + "\", "" + rom.SHA1 + "\"),";
crcsha1query += " (\"" + rom.CRC + "\", \"" + rom.SHA1 + "\"),";
}
if (!String.IsNullOrEmpty(rom.MD5))
{
md5sha1query += " ("" + rom.MD5 + "\", "" + rom.SHA1 + "\"),";
md5sha1query += " (\"" + rom.MD5 + "\", \"" + rom.SHA1 + "\"),";
}
}
@@ -114,23 +114,23 @@ namespace SabreTools
// Add to the queries
if (!String.IsNullOrEmpty(rom.CRC))
{
crcquery += " ("" + rom.CRC + "\"),";
crcquery += " (\"" + rom.CRC + "\"),";
}
if (!String.IsNullOrEmpty(rom.MD5))
{
md5query += " ("" + rom.MD5 + "\"),";
md5query += " (\"" + rom.MD5 + "\"),";
}
if (!String.IsNullOrEmpty(rom.SHA1))
{
sha1query += " ("" + rom.SHA1 + "\", "" + _depots.Keys.ToList()[0] + "\"),";
sha1query += " (\"" + rom.SHA1 + "\", \"" + _depots.Keys.ToList()[0] + "\"),";
if (!String.IsNullOrEmpty(rom.CRC))
{
crcsha1query += " ("" + rom.CRC + "\", "" + rom.SHA1 + "\"),";
crcsha1query += " (\"" + rom.CRC + "\", \"" + rom.SHA1 + "\"),";
}
if (!String.IsNullOrEmpty(rom.MD5))
{
md5sha1query += " ("" + rom.MD5 + "\", "" + rom.SHA1 + "\"),";
md5sha1query += " (\"" + rom.MD5 + "\", \"" + rom.SHA1 + "\"),";
}
}
@@ -320,7 +320,7 @@ namespace SabreTools
// Now, search for each of them and return true or false for each
foreach (string input in crc)
{
string query = "SELECT * FROM crc WHERE crc="" + input + """;
string query = "SELECT * FROM crc WHERE crc=\"" + input + "\"";
SqliteCommand slc = new SqliteCommand(query, dbc);
SqliteDataReader sldr = slc.ExecuteReader();
if (sldr.HasRows)
@@ -337,7 +337,7 @@ namespace SabreTools
}
foreach (string input in md5)
{
string query = "SELECT * FROM md5 WHERE md5="" + input + """;
string query = "SELECT * FROM md5 WHERE md5=\"" + input + "\"";
SqliteCommand slc = new SqliteCommand(query, dbc);
SqliteDataReader sldr = slc.ExecuteReader();
if (sldr.HasRows)
@@ -354,7 +354,7 @@ namespace SabreTools
}
foreach (string input in sha1)
{
string query = "SELECT * FROM sha1 WHERE sha1="" + input + """;
string query = "SELECT * FROM sha1 WHERE sha1=\"" + input + "\"";
SqliteCommand slc = new SqliteCommand(query, dbc);
SqliteDataReader sldr = slc.ExecuteReader();
if (sldr.HasRows)