alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-12 13:22:17 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

rework repo disposal

Browse Source
This commit is contained in:
Luke Pulverenti
2015-05-02 18:59:01 -04:00
parent ee2fbf59d0
commit ae99233759
8 changed files with 165 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
View File

@@ -14,13 +14,10 @@ using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.Persistence
{
public class SqliteFileOrganizationRepository : IFileOrganizationRepository, IDisposable
public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable
{
private IDbConnection _connection;
private readonly ILogger _logger;
private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
private readonly IServerApplicationPaths _appPaths;
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
@@ -29,11 +26,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _deleteResultCommand;
private IDbCommand _deleteAllCommand;
public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths)
public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths) : base(logManager)
{
_appPaths = appPaths;
_logger = logManager.GetLogger(GetType().Name);
}
/// <summary>
@@ -44,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
var dbFile = Path.Combine(_appPaths.DataPath, "fileorganization.db");
_connection = await SqliteExtensions.ConnectToDb(dbFile, _logger).ConfigureAwait(false);
_connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
string[] queries = {
@@ -57,7 +52,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
"pragma shrink_memory"
};
_connection.RunQueries(queries, _logger);
_connection.RunQueries(queries, Logger);
PrepareStatements();
}
@@ -100,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
cancellationToken.ThrowIfCancellationRequested();
await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false);
IDbTransaction transaction = null;
@@ -142,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
catch (Exception e)
{
_logger.ErrorException("Failed to save FileOrganizationResult:", e);
Logger.ErrorException("Failed to save FileOrganizationResult:", e);
if (transaction != null)
{
@@ -158,7 +153,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
transaction.Dispose();
}
_writeLock.Release();
WriteLock.Release();
}
}
@@ -169,7 +164,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
throw new ArgumentNullException("id");
}
await _writeLock.WaitAsync().ConfigureAwait(false);
await WriteLock.WaitAsync().ConfigureAwait(false);
IDbTransaction transaction = null;
@@ -196,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
catch (Exception e)
{
_logger.ErrorException("Failed to delete FileOrganizationResult:", e);
Logger.ErrorException("Failed to delete FileOrganizationResult:", e);
if (transaction != null)
{
@@ -212,13 +207,13 @@ namespace MediaBrowser.Server.Implementations.Persistence
transaction.Dispose();
}
_writeLock.Release();
WriteLock.Release();
}
}
public async Task DeleteAll()
{
await _writeLock.WaitAsync().ConfigureAwait(false);
await WriteLock.WaitAsync().ConfigureAwait(false);
IDbTransaction transaction = null;
@@ -243,7 +238,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
catch (Exception e)
{
_logger.ErrorException("Failed to delete results", e);
Logger.ErrorException("Failed to delete results", e);
if (transaction != null)
{
@@ -259,7 +254,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
transaction.Dispose();
}
_writeLock.Release();
WriteLock.Release();
}
}
@@ -420,45 +415,17 @@ namespace MediaBrowser.Server.Implementations.Persistence
return result;
}
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>
public void Dispose()
protected override void CloseConnection()
{
Dispose(true);
GC.SuppressFinalize(this);
}
private readonly object _disposeLock = new object();
/// <summary>
/// Releases unmanaged and - optionally - managed resources.
/// </summary>
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
protected virtual void Dispose(bool dispose)
{
if (dispose)
if (_connection != null)
{
try
if (_connection.IsOpen())
{
lock (_disposeLock)
{
if (_connection != null)
{
if (_connection.IsOpen())
{
_connection.Close();
}
_connection.Close();
}
_connection.Dispose();
_connection = null;
}
}
}
catch (Exception ex)
{
_logger.ErrorException("Error disposing database", ex);
}
_connection.Dispose();
_connection = null;
}
}
}