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

I accidentally ignored ALL sources, not just new ones

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-09 15:53:37 -07:00
parent 186b85a6b0
commit f5cf9cb802
1 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
DATabaseTwo/Import.cs
View File

@@ -124,12 +124,6 @@ COMMIT;";
// Add the hash to the temporary Dictionary // Add the hash to the temporary Dictionary
hashes.Add(hash, hashid); hashes.Add(hash, hashid);
// If we don't care about source, stop here
if (_ignore)
{
continue;
}
// Now try to determine the source for the file based on the name // Now try to determine the source for the file based on the name
string source = GetSourceFromFileName(Path.GetFileName(file)); string source = GetSourceFromFileName(Path.GetFileName(file));
int sourceid = 0; int sourceid = 0;
@@ -147,66 +141,70 @@ COMMIT;";
} }
} }
// If the source is blank, ask the user to supply one // Only if we're not ignoring new sources should be ask the user for input
while (source == "" && sourceid == 0) if (!_ignore)
{ {
Console.Clear(); // If the source is blank, ask the user to supply one
Build.Start("DATabaseTwo"); while (source == "" && sourceid == 0)
Console.WriteLine("Sources:");
foreach (KeyValuePair<string, int> pair in sources)
{ {
Console.WriteLine(" " + pair.Value + " - " + pair.Key); Console.Clear();
} Build.Start("DATabaseTwo");
Console.WriteLine("\nFor file name: " + Path.GetFileName(file));
Console.Write("Select a source above or enter a new one: ");
source = Console.ReadLine();
Int32.TryParse(source, out sourceid); Console.WriteLine("Sources:");
foreach (KeyValuePair<string, int> pair in sources)
{
Console.WriteLine(" " + pair.Value + " - " + pair.Key);
}
Console.WriteLine("\nFor file name: " + Path.GetFileName(file));
Console.Write("Select a source above or enter a new one: ");
source = Console.ReadLine();
// If the value could be parsed, reset the source string Int32.TryParse(source, out sourceid);
if (sourceid != 0)
{ // If the value could be parsed, reset the source string
source = ""; if (sourceid != 0)
{
source = "";
}
// If the source ID is set check to see if it's valid
if (sourceid != 0 && !sources.ContainsValue(sourceid))
{
Console.WriteLine("Invalid selection: " + sourceid);
Console.ReadLine();
sourceid = 0;
}
} }
// If the source ID is set check to see if it's valid // If the source isn't in, add it and get the insert id
if (sourceid != 0 && !sources.ContainsValue(sourceid)) if (source != "" && sourceid == 0 && !sources.ContainsKey(source))
{ {
Console.WriteLine("Invalid selection: " + sourceid); string tquery = @"BEGIN;
Console.ReadLine();
sourceid = 0;
}
}
// If the source isn't in, add it and get the insert id
if (source != "" && sourceid == 0 && !sources.ContainsKey(source))
{
string tquery = @"BEGIN;
INSERT INTO source (name, url) INSERT INTO source (name, url)
VALUES ('" + source + @"', ''); VALUES ('" + source + @"', '');
SELECT last_insert_rowid(); SELECT last_insert_rowid();
COMMIT;"; COMMIT;";
using (SqliteCommand sslc = new SqliteCommand(tquery, dbc)) using (SqliteCommand sslc = new SqliteCommand(tquery, dbc))
{
using (SqliteDataReader ssldr = sslc.ExecuteReader())
{ {
if (ssldr.Read()) using (SqliteDataReader ssldr = sslc.ExecuteReader())
{ {
sourceid = ssldr.GetInt32(0); if (ssldr.Read())
{
sourceid = ssldr.GetInt32(0);
}
} }
} }
}
// Add the new source to the temporary Dictionary // Add the new source to the temporary Dictionary
sources.Add(source, sourceid); sources.Add(source, sourceid);
}
// Otherwise, get the ID
else if (source != "" && sourceid == 0 && sources.ContainsKey(source))
{
sourceid = sources[source];
}
// Otherwise, we should already have an ID
} }
// Otherwise, get the ID
else if (source != "" && sourceid == 0 && sources.ContainsKey(source))
{
sourceid = sources[source];
}
// Otherwise, we should already have an ID
// Add the source and system link to the database // Add the source and system link to the database
string uquery = @"INSERT OR IGNORE INTO datsdata (id, key, value) string uquery = @"INSERT OR IGNORE INTO datsdata (id, key, value)