aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix database being in use while trying a master update.

Browse Source
This commit is contained in:
Natalia Portillo
2021-12-10 02:44:01 +00:00
parent ffc23068d7
commit 36f57a58cb
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
View File

@@ -121,15 +121,25 @@ namespace Aaru.Gui.ViewModels.Windows
Task.Run(() =>
{
AaruContext ctx;
AaruContext ctx = null;
try
{
ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
ctx = AaruContext.Create(Settings.Settings.LocalDbPath, false);
ctx.Database.Migrate();
}
catch(NotSupportedException)
{
try
{
ctx?.Database.CloseConnection();
ctx?.Dispose();
}
catch(Exception)
{
// Should not ever arrive here, but if it does, keep trying to replace it anyway
}
File.Delete(Settings.Settings.LocalDbPath);
ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
ctx.Database.EnsureCreated();
@@ -186,7 +196,7 @@ namespace Aaru.Gui.ViewModels.Windows
// TODO: Update database
}
var mainContext = AaruContext.Create(Settings.Settings.MainDbPath);
var mainContext = AaruContext.Create(Settings.Settings.MainDbPath, false);
if(mainContext.Database.GetPendingMigrations().Any())
{
@@ -202,6 +212,8 @@ namespace Aaru.Gui.ViewModels.Windows
ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MainDbPath);
return;
}
// TODO: Update database