Updating project to correct the following errors:
1. Using directive should appear within a namespace declaration 2. Use trailing comma in multi-line initializers
This commit is contained in:
+16
-16
@@ -26,8 +26,8 @@ using Microsoft.Extensions.Logging;
|
||||
public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
{
|
||||
private const string BackupFolderName = "SQLiteBackups";
|
||||
private readonly IApplicationPaths _applicationPaths;
|
||||
private readonly ILogger<SqliteDatabaseProvider> _logger;
|
||||
private readonly IApplicationPaths applicationPaths;
|
||||
private readonly ILogger<SqliteDatabaseProvider> logger;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="SqliteDatabaseProvider"/> class.
|
||||
@@ -36,8 +36,8 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
/// <param name="logger">A logger.</param>
|
||||
public SqliteDatabaseProvider(IApplicationPaths applicationPaths, ILogger<SqliteDatabaseProvider> logger)
|
||||
{
|
||||
_applicationPaths = applicationPaths;
|
||||
_logger = logger;
|
||||
applicationPaths = applicationPaths;
|
||||
logger = logger;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
@@ -65,7 +65,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
var customOptions = databaseConfiguration.CustomProviderOptions?.Options;
|
||||
|
||||
var sqliteConnectionBuilder = new SqliteConnectionStringBuilder();
|
||||
sqliteConnectionBuilder.DataSource = Path.Combine(_applicationPaths.DataPath, "jellyfin.db");
|
||||
sqliteConnectionBuilder.DataSource = Path.Combine(applicationPaths.DataPath, "jellyfin.db");
|
||||
sqliteConnectionBuilder.Cache = GetOption(customOptions, "cache", Enum.Parse<SqliteCacheMode>, () => SqliteCacheMode.Default);
|
||||
sqliteConnectionBuilder.Pooling = GetOption(customOptions, "pooling", e => e.Equals(bool.TrueString, StringComparison.OrdinalIgnoreCase), () => true);
|
||||
sqliteConnectionBuilder.DefaultTimeout = GetOption(customOptions, "command-timeout", int.Parse, () => 30);
|
||||
@@ -73,7 +73,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
var connectionString = sqliteConnectionBuilder.ToString();
|
||||
|
||||
// Log SQLite connection parameters
|
||||
_logger.LogInformation("SQLite connection string: {ConnectionString}", connectionString);
|
||||
logger.LogInformation("SQLite connection string: {ConnectionString}", connectionString);
|
||||
|
||||
options
|
||||
.UseSqlite(
|
||||
@@ -83,7 +83,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
.ConfigureWarnings(warnings =>
|
||||
warnings.Ignore(RelationalEventId.NonTransactionalMigrationOperationWarning))
|
||||
.AddInterceptors(new PragmaConnectionInterceptor(
|
||||
_logger,
|
||||
logger,
|
||||
GetOption<int?>(customOptions, "cacheSize", e => int.Parse(e, CultureInfo.InvariantCulture)),
|
||||
GetOption(customOptions, "lockingmode", e => e, () => "NORMAL")!,
|
||||
GetOption(customOptions, "journalsizelimit", int.Parse, () => 134_217_728),
|
||||
@@ -95,7 +95,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
if (enableSensitiveDataLogging)
|
||||
{
|
||||
options.EnableSensitiveDataLogging(enableSensitiveDataLogging);
|
||||
_logger.LogInformation("EnableSensitiveDataLogging is enabled on SQLite connection");
|
||||
logger.LogInformation("EnableSensitiveDataLogging is enabled on SQLite connection");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
await context.Database.ExecuteSqlRawAsync("PRAGMA optimize", cancellationToken).ConfigureAwait(false);
|
||||
await context.Database.ExecuteSqlRawAsync("VACUUM", cancellationToken).ConfigureAwait(false);
|
||||
await context.Database.ExecuteSqlRawAsync("PRAGMA wal_checkpoint(TRUNCATE)", cancellationToken).ConfigureAwait(false);
|
||||
_logger.LogInformation("jellyfin.db optimized successfully!");
|
||||
logger.LogInformation("jellyfin.db optimized successfully!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,8 +147,8 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
public Task<string> MigrationBackupFast(CancellationToken cancellationToken)
|
||||
{
|
||||
var key = DateTime.UtcNow.ToString("yyyyMMddhhmmss", CultureInfo.InvariantCulture);
|
||||
var path = Path.Combine(_applicationPaths.DataPath, "jellyfin.db");
|
||||
var backupFile = Path.Combine(_applicationPaths.DataPath, BackupFolderName);
|
||||
var path = Path.Combine(applicationPaths.DataPath, "jellyfin.db");
|
||||
var backupFile = Path.Combine(applicationPaths.DataPath, BackupFolderName);
|
||||
Directory.CreateDirectory(backupFile);
|
||||
|
||||
backupFile = Path.Combine(backupFile, $"{key}_jellyfin.db");
|
||||
@@ -161,12 +161,12 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
{
|
||||
// ensure there are absolutly no dangling Sqlite connections.
|
||||
SqliteConnection.ClearAllPools();
|
||||
var path = Path.Combine(_applicationPaths.DataPath, "jellyfin.db");
|
||||
var backupFile = Path.Combine(_applicationPaths.DataPath, BackupFolderName, $"{key}_jellyfin.db");
|
||||
var path = Path.Combine(applicationPaths.DataPath, "jellyfin.db");
|
||||
var backupFile = Path.Combine(applicationPaths.DataPath, BackupFolderName, $"{key}_jellyfin.db");
|
||||
|
||||
if (!File.Exists(backupFile))
|
||||
{
|
||||
_logger.LogCritical("Tried to restore a backup that does not exist: {Key}", key);
|
||||
logger.LogCritical("Tried to restore a backup that does not exist: {Key}", key);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -177,11 +177,11 @@ public sealed class SqliteDatabaseProvider : IJellyfinDatabaseProvider
|
||||
/// <inheritdoc />
|
||||
public Task DeleteBackup(string key)
|
||||
{
|
||||
var backupFile = Path.Combine(_applicationPaths.DataPath, BackupFolderName, $"{key}_jellyfin.db");
|
||||
var backupFile = Path.Combine(applicationPaths.DataPath, BackupFolderName, $"{key}_jellyfin.db");
|
||||
|
||||
if (!File.Exists(backupFile))
|
||||
{
|
||||
_logger.LogCritical("Tried to delete a backup that does not exist: {Key}", key);
|
||||
logger.LogCritical("Tried to delete a backup that does not exist: {Key}", key);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user