mirror of
https://github.com/WB3000/nusdownloader.git
synced 2024-11-17 07:09:21 +01:00
Added FileNotFound checks to database loader
This commit is contained in:
parent
6ac6a30516
commit
778a44e31b
@ -34,6 +34,9 @@ namespace NUS_Downloader
|
||||
|
||||
public void LoadDatabaseToStream(string databaseFile)
|
||||
{
|
||||
// Does it exist?
|
||||
if (!File.Exists(databaseFile))
|
||||
throw new FileNotFoundException("I couldn't find the database file!", "database.xml");
|
||||
// Load database.xml into MemoryStream
|
||||
databaseString = File.ReadAllText(databaseFile);
|
||||
/*System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
|
||||
|
@ -1652,18 +1652,26 @@ namespace NUS_Downloader
|
||||
private void RetrieveNewDatabase_Completed(object sender, RunWorkerCompletedEventArgs e)
|
||||
{
|
||||
string database = e.Result.ToString();
|
||||
Database db = new Database();
|
||||
db.LoadDatabaseToStream(Path.Combine(CURRENT_DIR, "database.xml"));
|
||||
string currentversion = db.GetDatabaseVersion();
|
||||
string onlineversion = Database.GetDatabaseVersion(database);
|
||||
WriteStatus(" - Database successfully parsed!");
|
||||
WriteStatus(" - Current Database Version: " + currentversion);
|
||||
WriteStatus(" - Online Database Version: " + onlineversion);
|
||||
|
||||
if (currentversion == onlineversion)
|
||||
try
|
||||
{
|
||||
WriteStatus(" - You have the latest database version!");
|
||||
return;
|
||||
Database db = new Database();
|
||||
db.LoadDatabaseToStream(Path.Combine(CURRENT_DIR, "database.xml"));
|
||||
string currentversion = db.GetDatabaseVersion();
|
||||
string onlineversion = Database.GetDatabaseVersion(database);
|
||||
WriteStatus(" - Database successfully parsed!");
|
||||
WriteStatus(" - Current Database Version: " + currentversion);
|
||||
WriteStatus(" - Online Database Version: " + onlineversion);
|
||||
|
||||
if (currentversion == onlineversion)
|
||||
{
|
||||
WriteStatus(" - You have the latest database version!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
WriteStatus(" - Database does not yet exist.");
|
||||
WriteStatus(" - Online Database Version: " + Database.GetDatabaseVersion(database));
|
||||
}
|
||||
|
||||
bool isCreation = false;
|
||||
|
Loading…
Reference in New Issue
Block a user