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

[ALL] Fix String.Empty

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

50
RombaSharp/Partials/RombaSharp_Helpers.cs
View File

@@ -87,7 +87,7 @@ namespace SabreTools
dbc.Open();
StreamWriter sw = new StreamWriter(File.Open("export.csv", FileMode.Create, FileAccess.Write));
sw.WriteLine("\"ID\",\"Size\",\"CRC\",\"MD5\",\"SHA-1\",\"In Depot\",\"DAT Hash"");
sw.WriteLine("\"ID\",\"Size\",\"CRC\",\"MD5\",\"SHA-1\",\"In Depot\",\"DAT Hash\"");
string query = "SELECT dats.id, size, crc, md5, sha1, indepot, hash FROM data JOIN dats ON data.id=dats.id";
SqliteCommand slc = new SqliteCommand(query, dbc);
@@ -97,13 +97,13 @@ namespace SabreTools
{
while (sldr.Read())
{
string line = """ + sldr.GetInt32(0) + "\","
+ """ + sldr.GetInt64(1) + "\","
+ """ + sldr.GetString(2) + "\","
+ """ + sldr.GetString(3) + "\","
+ """ + sldr.GetString(4) + "\","
+ """ + sldr.GetInt32(5) + "\","
+ """ + sldr.GetString(6) + """;
string line = "\"" + sldr.GetInt32(0) + "\","
+ "\"" + sldr.GetInt64(1) + "\","
+ "\"" + sldr.GetString(2) + "\","
+ "\"" + sldr.GetString(3) + "\","
+ "\"" + sldr.GetString(4) + "\","
+ "\"" + sldr.GetInt32(5) + "\","
+ "\"" + sldr.GetString(6) + "\"";
sw.WriteLine(line);
}
}
@@ -459,7 +459,7 @@ namespace SabreTools
foreach (string dathash in unneeded)
{
query = "DELETE FROM dats WHERE hash="" + dathash + """;
query = "DELETE FROM dats WHERE hash=\"" + dathash + "\"";
slc = new SqliteCommand(query, dbc);
slc.ExecuteNonQuery();
slc.Dispose();
@@ -502,23 +502,23 @@ namespace SabreTools
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 + "\"),";
sha1query += " (\"" + rom.SHA1 + "\"),";
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 + "\"),";
}
}
}
@@ -528,15 +528,15 @@ namespace SabreTools
if (!String.IsNullOrEmpty(disk.MD5))
{
md5query += " ("" + disk.MD5 + "\"),";
md5query += " (\"" + disk.MD5 + "\"),";
}
if (!String.IsNullOrEmpty(disk.SHA1))
{
sha1query += " ("" + disk.SHA1 + "\"),";
sha1query += " (\"" + disk.SHA1 + "\"),";
if (!String.IsNullOrEmpty(disk.MD5))
{
md5sha1query += " ("" + disk.MD5 + "\", "" + disk.SHA1 + "\"),";
md5sha1query += " (\"" + disk.MD5 + "\", \"" + disk.SHA1 + "\"),";
}
}
}
@@ -571,7 +571,7 @@ namespace SabreTools
}
}
string datquery = "INSERT OR IGNORE INTO dat (hash) VALUES ("" + dat.SHA1 + "\")";
string datquery = "INSERT OR IGNORE INTO dat (hash) VALUES (\"" + dat.SHA1 + "\")";
slc = new SqliteCommand(datquery, dbc);
slc.ExecuteNonQuery();
slc.Dispose();
@@ -603,7 +603,7 @@ namespace SabreTools
// If we have it, then check for all hashes that are in that depot
List<string> hashes = new List<string>();
string query = "SELECT sha1 FROM sha1 WHERE depot="" + depotname + """;
string query = "SELECT sha1 FROM sha1 WHERE depot=\"" + depotname + "\"";
SqliteCommand slc = new SqliteCommand(query, dbc);
SqliteDataReader sldr = slc.ExecuteReader();
if (sldr.HasRows)
@@ -643,23 +643,23 @@ namespace SabreTools
{
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 + "\", "" + depotname + "\"),";
sha1query += " (\"" + rom.SHA1 + "\", \"" + depotname + "\"),";
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 + "\"),";
}
}
}
@@ -703,7 +703,7 @@ JOIN crc
ON crcsha1.crc=crc.crc
JOIN md5
ON md5sha1.md5=md5.md5
WHERE sha1.sha1 IN (String.Empty" + String.Join("\","", hashes) + "\")";
WHERE sha1.sha1 IN (String.Empty" + String.Join("\",\"", hashes) + "\")";
slc = new SqliteCommand(query, dbc);
slc.ExecuteNonQuery();

32
RombaSharp/Partials/RombaSharp_Inits.cs
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)

10
RombaSharp/Properties/AssemblyInfo.cs
View File

@@ -6,13 +6,13 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("RombaSharp")]
[assembly: AssemblyDescription(String.Empty)]
[assembly: AssemblyConfiguration(String.Empty)]
[assembly: AssemblyCompany(String.Empty)]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RombaSharp")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark(String.Empty)]
[assembly: AssemblyCulture(String.Empty)]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from

2
RombaSharp/RombaSharp.cs
View File

@@ -178,7 +178,7 @@ namespace SabreTools
outdat = args[i];
break;
default:
string temparg = args[i].Replace(""", String.Empty).Replace("file://", String.Empty);
string temparg = args[i].Replace("\"", String.Empty).Replace("file://", String.Empty);
if (temparg.StartsWith("-") && temparg.Contains("="))
{