Switched to a Singleton ApplicationDbContext as a local SQLite file makes more sense to be constantly open.

Author: TheSeventhCode

.gitignore

@@ -413,11 +413,5 @@ FodyWeavers.xsd
 .ionide
 
 # End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudiocode
-Show Obsidian Search Sidebar
-Settings
-Open Search in Obsidian
-Pin Sidebar
-Search
-Search your vault ... (Alt+Shift+F)
-0 result(s) of 0 (using )
-❗ Could not connect to Obsidian. Please make sure Obsidian is running and check your extension settings.
+
+.idea/.idea.DazContentInstaller/.idea/AugmentWebviewStateStore.xml

DazContentInstaller/ServiceCollectionExtensions.cs

@@ -24,8 +24,8 @@ private static IServiceCollection CreateServiceCollection(this IServiceCollectio
 
         services.Configure<InstallerConfig>(o => o.AppDataPath = appDataPath);
 
-        services.AddDbContextFactory<ApplicationDbContext>(o =>
-            o.UseSqlite($"Data Source={config.DbPath}"));
+        services.AddDbContext<ApplicationDbContext>(o =>
+            o.UseSqlite($"Data Source={config.DbPath}"), ServiceLifetime.Singleton);
 
         services.AddSingleton<SettingsService>();
         services.AddSingleton<IAppInfoService, AppInfoService>();

DazContentInstaller/ViewModels/MainWindowViewModel.cs

@@ -19,7 +19,7 @@ namespace DazContentInstaller.ViewModels;
 
 public class MainWindowViewModel : ViewModelBase
 {
-    private readonly IDbContextFactory<ApplicationDbContext> _dbContextFactory = null!;
+    private readonly ApplicationDbContext _dbContext = null!;
     private readonly SettingsService _settingsService = null!;
     public ObservableCollection<LoadedArchive> LoadedArchives { get; set; } = [];
     private InstalledArchiveTree InstalledArchivesTree { get; } = [];
@@ -140,10 +140,10 @@ public MainWindowViewModel()
         RemoveLoadedArchiveClick = ReactiveCommand.Create<LoadedArchive>(RemoveLoadedArchive);
     }
 
-    public MainWindowViewModel(IDbContextFactory<ApplicationDbContext> dbContextFactory,
+    public MainWindowViewModel(ApplicationDbContext dbContext,
         SettingsService settingsService) : this()
     {
-        _dbContextFactory = dbContextFactory;
+        _dbContext = dbContext;
         _settingsService = settingsService;
     }
 
@@ -162,11 +162,10 @@ private void ClearLoadedArchives()
 
     public async Task LoadAssetLibrariesAsync()
     {
-        await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
         AssetLibraries.Clear();
         await Task.Run(async () =>
         {
-            await foreach (var library in dbContext.AssetLibraries.AsAsyncEnumerable())
+            await foreach (var library in _dbContext.AssetLibraries.AsAsyncEnumerable())
                 AssetLibraries.Add(library);
         });
 
@@ -181,15 +180,14 @@ public async Task LoadInstalledArchivesAsync()
 
         await Task.Run(async () =>
         {
-            await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
-            var archivesQuery = dbContext.Archives
+            var archivesQuery = _dbContext.Archives
                 .Where(d => d.Status == ArchiveStatus.Installed);
             if (CurrentSelectedAssetLibrary is not null)
                 archivesQuery = archivesQuery.Where(d => d.AssetLibraryId == CurrentSelectedAssetLibrary.Id);
 
             await foreach (var archive in archivesQuery.OrderBy(d => d.ArchiveName.ToLower()).AsAsyncEnumerable())
             {
-                var files = await dbContext.AssetFiles.Where(d => d.ArchiveId == archive.Id).ToListAsync();
+                var files = await _dbContext.AssetFiles.Where(d => d.ArchiveId == archive.Id).ToListAsync();
                 archive.AssetFiles = files;
 
                 var node = InstalledArchivesTree.LoadArchive(archive);
@@ -220,10 +218,8 @@ private async Task InstallArchives()
 
         await Task.Run(async () =>
         {
-            await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
-
             var archivesToInstallNames = archivesToInstall.Select(GetLoadedArchiveName).ToArray();
-            var existingArchives = await dbContext.Archives
+            var existingArchives = await _dbContext.Archives
                 .Where(a => a.AssetLibraryId == CurrentSelectedAssetLibrary.Id &&
                             archivesToInstallNames.Contains(a.ArchiveName))
                 .Include(a => a.AssetFiles)
@@ -253,8 +249,8 @@ await Task.Run(async () =>
                 };
 
                 dbArchive.AssetFiles.AddRange(archive.ContainedFiles);
-                dbContext.Archives.Add(dbArchive);
-                await dbContext.SaveChangesAsync();
+                _dbContext.Archives.Add(dbArchive);
+                await _dbContext.SaveChangesAsync();
 
                 Dispatcher.UIThread.Post(() => LoadedArchives.Remove(archive));
             }
@@ -282,10 +278,9 @@ private async Task UninstallArchiveAsync()
             return;
 
         AllowArchiveLoad = false;
-        await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
 
         var selectedInstallArchiveIds = SelectedInstallNodes.Select(n => n.DbId).ToArray();
-        var archives = await dbContext.Archives
+        var archives = await _dbContext.Archives
             .Include(a => a.AssetLibrary)
             .Include(a => a.AssetFiles)
             .Where(a => selectedInstallArchiveIds.Contains(a.Id))
@@ -304,7 +299,7 @@ await Task.Run(async () =>
             messageProgress.Report($"Reading {selectedInstallArchiveIds.Length} archives to uninstall...");
 
             var archiveIds = archives.Select(a => a.Id).ToArray();
-            var deleteFileExceptions = await dbContext.AssetFiles
+            var deleteFileExceptions = await _dbContext.AssetFiles
                 .Where(f => !archiveIds.Contains(f.ArchiveId) && f.InstalledPath != null)
                 .ToListAsync();
 
@@ -323,8 +318,8 @@ await Task.Run(async () =>
                 var uninstaller = new DazArchiveUninstaller(archive);
                 await uninstaller.UninstallArchiveAsync(deleteFileExceptions.Select(d => d.InstalledPath!).ToHashSet());
 
-                dbContext.Archives.Remove(archive);
-                await dbContext.SaveChangesAsync();
+                _dbContext.Archives.Remove(archive);
+                await _dbContext.SaveChangesAsync();
 
                 messageProgress.Report($"Uninstalled {archive.ArchiveName}");
                 percentageProgress.Report(index * increment);
@@ -426,12 +421,11 @@ public async Task UpdateInstalledAssetDetailsAsync(TreeNode? selectedItem)
             return;
 
         OnPropertyChanged(nameof(UninstallButtonEnabled));
-        await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
-        var archive = await dbContext.Archives.FindAsync(selectedItem.DbId);
+        var archive = await _dbContext.Archives.FindAsync(selectedItem.DbId);
         if (archive is null)
             return;
 
-        var files = await dbContext.AssetFiles.Where(d => d.ArchiveId == archive.Id).ToListAsync();
+        var files = await _dbContext.AssetFiles.Where(d => d.ArchiveId == archive.Id).ToListAsync();
         var details = new List<string>
         {
             $"File: {Path.GetFileName(archive.ArchiveName)}",

DazContentInstaller/ViewModels/SettingsWindowViewModel.cs

@@ -17,7 +17,7 @@ public class SettingsWindowViewModel : ViewModelBase
     public ObservableCollection<AssetLibraryModel> AssetLibraries { get; set; } = [];
 
     private readonly SettingsService _settingsService = null!;
-    private readonly IDbContextFactory<ApplicationDbContext> _dbContextFactory = null!;
+    private readonly ApplicationDbContext _dbContext = null!;
     private bool _autoDetectDazLibraries = true;
     private bool _createBackupBeforeInstall = true;
 
@@ -42,10 +42,10 @@ public bool CreateBackupBeforeInstall
     }
 
     public SettingsWindowViewModel(SettingsService settingsService,
-        IDbContextFactory<ApplicationDbContext> dbContextFactory) : this()
+        ApplicationDbContext dbContext) : this()
     {
         _settingsService = settingsService;
-        _dbContextFactory = dbContextFactory;
+        _dbContext = dbContext;
     }
 
     public SettingsWindowViewModel()
@@ -89,8 +89,7 @@ public async Task SaveAsync()
 
         await _settingsService.SaveSettingsAsync();
 
-        await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
-        var dbLibraries = await dbContext.AssetLibraries.ToListAsync();
+        var dbLibraries = await _dbContext.AssetLibraries.ToListAsync();
         var newLibraries = AssetLibraries.Where(l => dbLibraries.All(dl => dl.Id != l.Id)).ToList();
 
         foreach (var assetLibraryModel in newLibraries)
@@ -103,11 +102,11 @@ public async Task SaveAsync()
                 IsDefault = assetLibraryModel.IsDefault,
                 CreatedDate = assetLibraryModel.CreatedDate
             };
-            dbContext.AssetLibraries.Add(library);
+            _dbContext.AssetLibraries.Add(library);
         }
 
         var removedLibraries = dbLibraries.Where(l => AssetLibraries.All(al => al.Id != l.Id)).ToList();
-        foreach (var library in removedLibraries) dbContext.AssetLibraries.Remove(library);
+        foreach (var library in removedLibraries) _dbContext.AssetLibraries.Remove(library);
 
         var updatedLibraries = AssetLibraries.Where(l => dbLibraries.Any(dl => dl.Id == l.Id)).ToList();
         foreach (var library in updatedLibraries)
@@ -118,7 +117,7 @@ public async Task SaveAsync()
             dbLibrary.IsDefault = library.IsDefault;
         }
 
-        await dbContext.SaveChangesAsync();
+        await _dbContext.SaveChangesAsync();
     }
 
     public void AddLibrary(IStorageFolder folder)
@@ -132,8 +131,7 @@ public async Task ReloadLibrariesAsync()
     {
         AssetLibraries.Clear();
 
-        await using var dbContext = await _dbContextFactory.CreateDbContextAsync();
-        var libraries = await dbContext.AssetLibraries
+        var libraries = await _dbContext.AssetLibraries
             .OrderByDescending(l => l.CreatedDate)
             .Select(l => new AssetLibraryModel(l.Id, l.Name, l.Path, l.IsDefault, l.CreatedDate))
             .ToListAsync();