open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update organizer db

Browse Source
pull/702/head
Luke Pulverenti 8 years ago
parent da6e94396f
commit d7edd499d2
3 changed files with 204 additions and 248 deletions
Show Stats Download Patch File Download Diff File

25
MediaBrowser.Server.Implementations/Persistence/BaseSqliteRepository.cs
Unescape View File

@ -8,7 +8,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
public abstract class BaseSqliteRepository : IDisposable public abstract class BaseSqliteRepository : IDisposable
{ {
protected readonly SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
protected readonly IDbConnector DbConnector; protected readonly IDbConnector DbConnector;
protected ILogger Logger; protected ILogger Logger;
@ -46,7 +45,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
_disposed = true; _disposed = true;
Dispose(true); Dispose(true);
GC.SuppressFinalize(this);
} }
protected async Task Vacuum(IDbConnection connection) protected async Task Vacuum(IDbConnection connection)
@ -69,35 +67,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
} }
private readonly object _disposeLock = new object();
/// <summary> /// <summary>
/// Releases unmanaged and - optionally - managed resources. /// Releases unmanaged and - optionally - managed resources.
/// </summary> /// </summary>
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param> /// <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) protected virtual void Dispose(bool dispose)
{ {
if (dispose)
{
try
{
lock (_disposeLock)
{
WriteLock.Wait();
CloseConnection();
}
}
catch (Exception ex)
{
Logger.ErrorException("Error disposing database", ex);
}
}
}
protected virtual void CloseConnection()
{
} }
} }
} }

173
MediaBrowser.Server.Implementations/Persistence/SqliteFileOrganizationRepository.cs
Unescape View File

@ -16,69 +16,29 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable
{ {
private IDbConnection _connection;
private readonly IServerApplicationPaths _appPaths;
private readonly CultureInfo _usCulture = new CultureInfo("en-US"); private readonly CultureInfo _usCulture = new CultureInfo("en-US");
private IDbCommand _saveResultCommand;
private IDbCommand _deleteResultCommand;
private IDbCommand _deleteAllCommand;
public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector) public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector)
{ {
_appPaths = appPaths; DbFilePath = Path.Combine(appPaths.DataPath, "fileorganization.db");
} }
/// <summary> /// <summary>
/// Opens the connection to the database /// Opens the connection to the database
/// </summary> /// </summary>
/// <returns>Task.</returns> /// <returns>Task.</returns>
public async Task Initialize(IDbConnector dbConnector) public async Task Initialize()
{
using (var connection = await CreateConnection().ConfigureAwait(false))
{ {
var dbFile = Path.Combine(_appPaths.DataPath, "fileorganization.db");
_connection = await dbConnector.Connect(dbFile, false).ConfigureAwait(false);
string[] queries = { string[] queries = {
"create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)", "create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)",
"create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)" "create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)"
}; };
_connection.RunQueries(queries, Logger); connection.RunQueries(queries, Logger);
PrepareStatements();
} }
private void PrepareStatements()
{
_saveResultCommand = _connection.CreateCommand();
_saveResultCommand.CommandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (@ResultId, @OriginalPath, @TargetPath, @FileLength, @OrganizationDate, @Status, @OrganizationType, @StatusMessage, @ExtractedName, @ExtractedYear, @ExtractedSeasonNumber, @ExtractedEpisodeNumber, @ExtractedEndingEpisodeNumber, @DuplicatePaths)";
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ResultId");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@OriginalPath");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@TargetPath");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@FileLength");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@OrganizationDate");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@Status");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@OrganizationType");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@StatusMessage");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedName");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedYear");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedSeasonNumber");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedEpisodeNumber");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@ExtractedEndingEpisodeNumber");
_saveResultCommand.Parameters.Add(_saveResultCommand, "@DuplicatePaths");
_deleteResultCommand = _connection.CreateCommand();
_deleteResultCommand.CommandText = "delete from FileOrganizerResults where ResultId = @ResultId";
_deleteResultCommand.Parameters.Add(_saveResultCommand, "@ResultId");
_deleteAllCommand = _connection.CreateCommand();
_deleteAllCommand.CommandText = "delete from FileOrganizerResults";
} }
public async Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken) public async Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken)
@ -90,34 +50,53 @@ namespace MediaBrowser.Server.Implementations.Persistence
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); using (var connection = await CreateConnection().ConfigureAwait(false))
{
using (var saveResultCommand = connection.CreateCommand())
{
saveResultCommand.CommandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (@ResultId, @OriginalPath, @TargetPath, @FileLength, @OrganizationDate, @Status, @OrganizationType, @StatusMessage, @ExtractedName, @ExtractedYear, @ExtractedSeasonNumber, @ExtractedEpisodeNumber, @ExtractedEndingEpisodeNumber, @DuplicatePaths)";
saveResultCommand.Parameters.Add(saveResultCommand, "@ResultId");
saveResultCommand.Parameters.Add(saveResultCommand, "@OriginalPath");
saveResultCommand.Parameters.Add(saveResultCommand, "@TargetPath");
saveResultCommand.Parameters.Add(saveResultCommand, "@FileLength");
saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationDate");
saveResultCommand.Parameters.Add(saveResultCommand, "@Status");
saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationType");
saveResultCommand.Parameters.Add(saveResultCommand, "@StatusMessage");
saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedName");
saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedYear");
saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedSeasonNumber");
saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEpisodeNumber");
saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEndingEpisodeNumber");
saveResultCommand.Parameters.Add(saveResultCommand, "@DuplicatePaths");
IDbTransaction transaction = null; IDbTransaction transaction = null;
try try
{ {
transaction = _connection.BeginTransaction(); transaction = connection.BeginTransaction();
var index = 0; var index = 0;
_saveResultCommand.GetParameter(index++).Value = new Guid(result.Id); saveResultCommand.GetParameter(index++).Value = new Guid(result.Id);
_saveResultCommand.GetParameter(index++).Value = result.OriginalPath; saveResultCommand.GetParameter(index++).Value = result.OriginalPath;
_saveResultCommand.GetParameter(index++).Value = result.TargetPath; saveResultCommand.GetParameter(index++).Value = result.TargetPath;
_saveResultCommand.GetParameter(index++).Value = result.FileSize; saveResultCommand.GetParameter(index++).Value = result.FileSize;
_saveResultCommand.GetParameter(index++).Value = result.Date; saveResultCommand.GetParameter(index++).Value = result.Date;
_saveResultCommand.GetParameter(index++).Value = result.Status.ToString(); saveResultCommand.GetParameter(index++).Value = result.Status.ToString();
_saveResultCommand.GetParameter(index++).Value = result.Type.ToString(); saveResultCommand.GetParameter(index++).Value = result.Type.ToString();
_saveResultCommand.GetParameter(index++).Value = result.StatusMessage; saveResultCommand.GetParameter(index++).Value = result.StatusMessage;
_saveResultCommand.GetParameter(index++).Value = result.ExtractedName; saveResultCommand.GetParameter(index++).Value = result.ExtractedName;
_saveResultCommand.GetParameter(index++).Value = result.ExtractedYear; saveResultCommand.GetParameter(index++).Value = result.ExtractedYear;
_saveResultCommand.GetParameter(index++).Value = result.ExtractedSeasonNumber; saveResultCommand.GetParameter(index++).Value = result.ExtractedSeasonNumber;
_saveResultCommand.GetParameter(index++).Value = result.ExtractedEpisodeNumber; saveResultCommand.GetParameter(index++).Value = result.ExtractedEpisodeNumber;
_saveResultCommand.GetParameter(index++).Value = result.ExtractedEndingEpisodeNumber; saveResultCommand.GetParameter(index++).Value = result.ExtractedEndingEpisodeNumber;
_saveResultCommand.GetParameter(index).Value = string.Join("|", result.DuplicatePaths.ToArray()); saveResultCommand.GetParameter(index).Value = string.Join("|", result.DuplicatePaths.ToArray());
_saveResultCommand.Transaction = transaction; saveResultCommand.Transaction = transaction;
_saveResultCommand.ExecuteNonQuery(); saveResultCommand.ExecuteNonQuery();
transaction.Commit(); transaction.Commit();
} }
@ -147,8 +126,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
transaction.Dispose(); transaction.Dispose();
} }
}
WriteLock.Release(); }
} }
} }
@ -159,19 +138,25 @@ namespace MediaBrowser.Server.Implementations.Persistence
throw new ArgumentNullException("id"); throw new ArgumentNullException("id");
} }
await WriteLock.WaitAsync().ConfigureAwait(false); using (var connection = await CreateConnection().ConfigureAwait(false))
{
using (var deleteResultCommand = connection.CreateCommand())
{
deleteResultCommand.CommandText = "delete from FileOrganizerResults where ResultId = @ResultId";
deleteResultCommand.Parameters.Add(deleteResultCommand, "@ResultId");
IDbTransaction transaction = null; IDbTransaction transaction = null;
try try
{ {
transaction = _connection.BeginTransaction(); transaction = connection.BeginTransaction();
_deleteResultCommand.GetParameter(0).Value = new Guid(id); deleteResultCommand.GetParameter(0).Value = new Guid(id);
_deleteResultCommand.Transaction = transaction; deleteResultCommand.Transaction = transaction;
_deleteResultCommand.ExecuteNonQuery(); deleteResultCommand.ExecuteNonQuery();
transaction.Commit(); transaction.Commit();
} }
@ -201,24 +186,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
transaction.Dispose(); transaction.Dispose();
} }
}
WriteLock.Release(); }
} }
} }
public async Task DeleteAll() public async Task DeleteAll()
{ {
await WriteLock.WaitAsync().ConfigureAwait(false); using (var connection = await CreateConnection().ConfigureAwait(false))
{
using (var cmd = connection.CreateCommand())
{
cmd.CommandText = "delete from FileOrganizerResults";
IDbTransaction transaction = null; IDbTransaction transaction = null;
try try
{ {
transaction = _connection.BeginTransaction(); transaction = connection.BeginTransaction();
_deleteAllCommand.Transaction = transaction; cmd.Transaction = transaction;
_deleteAllCommand.ExecuteNonQuery(); cmd.ExecuteNonQuery();
transaction.Commit(); transaction.Commit();
} }
@ -248,8 +237,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
transaction.Dispose(); transaction.Dispose();
} }
}
WriteLock.Release(); }
} }
} }
@ -260,7 +249,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
throw new ArgumentNullException("query"); throw new ArgumentNullException("query");
} }
using (var cmd = _connection.CreateCommand()) using (var connection = CreateConnection(true).Result)
{
using (var cmd = connection.CreateCommand())
{ {
cmd.CommandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults"; cmd.CommandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults";
@ -302,6 +293,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}; };
} }
} }
}
public FileOrganizationResult GetResult(string id) public FileOrganizationResult GetResult(string id)
{ {
@ -310,9 +302,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
throw new ArgumentNullException("id"); throw new ArgumentNullException("id");
} }
using (var connection = CreateConnection(true).Result)
{
var guid = new Guid(id); var guid = new Guid(id);
using (var cmd = _connection.CreateCommand()) using (var cmd = connection.CreateCommand())
{ {
cmd.CommandText = "select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@Id"; cmd.CommandText = "select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@Id";
@ -329,6 +323,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
return null; return null;
} }
}
public FileOrganizationResult GetResult(IDataReader reader) public FileOrganizationResult GetResult(IDataReader reader)
{ {
@ -409,19 +404,5 @@ namespace MediaBrowser.Server.Implementations.Persistence
return result; return result;
} }
protected override void CloseConnection()
{
if (_connection != null)
{
if (_connection.IsOpen())
{
_connection.Close();
}
_connection.Dispose();
_connection = null;
}
}
} }
} }

2
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
Unescape View File

@ -691,7 +691,7 @@ namespace MediaBrowser.Server.Startup.Common
{ {
var repo = new SqliteFileOrganizationRepository(LogManager, ServerConfigurationManager.ApplicationPaths, NativeApp.GetDbConnector()); var repo = new SqliteFileOrganizationRepository(LogManager, ServerConfigurationManager.ApplicationPaths, NativeApp.GetDbConnector());
await repo.Initialize(NativeApp.GetDbConnector()).ConfigureAwait(false); await repo.Initialize().ConfigureAwait(false);
return repo; return repo;
} }

Write Preview
Loading…
Cancel
Save