The Free Software Media System - Server Backend & API
Merge pull request #17565 from twsouthwick/use-datasource
Taylor Southwick284997ebe286
diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.csindex a3fbe42e02..f0b44d6130 100644--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs@@ -287,7 +287,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider/// <inheritdoc />public async Task<string> MigrationBackupFast(CancellationToken cancellationToken){- var path = Path.Combine(_applicationPaths.DataPath, "jellyfin.db");+ var path = GetDatabasePath();var backupFolder = Path.Combine(_applicationPaths.DataPath, BackupFolderName);Directory.CreateDirectory(backupFolder);@@ -317,7 +317,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider{// ensure there are absolutely no dangling Sqlite connections.SqliteConnection.ClearAllPools();- var path = Path.Combine(_applicationPaths.DataPath, "jellyfin.db");+ var path = GetDatabasePath();var backupFile = Path.Combine(_applicationPaths.DataPath, BackupFolderName, $"{key}_jellyfin.db");if (!File.Exists(backupFile))@@ -390,6 +390,17 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProviderreturn Task.CompletedTask;}+ private string GetDatabasePath()+ {+ if (DbContextFactory is null)+ {+ throw new InvalidOperationException("The database provider has not been initialized.");+ }++ using var dbContext = DbContextFactory.CreateDbContext();+ return dbContext.Database.GetDbConnection().DataSource;+ }+/// <inheritdoc/>public async Task PurgeDatabase(JellyfinDbContext dbContext, IEnumerable<string>? tableNames){