From 5209ce9b2f7d2c56bca2c65966a5e2e7cc982133 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 19 Nov 2016 13:09:15 -0500 Subject: stub out portable item repository --- .../Data/SqliteUserDataRepository.cs | 446 +++++++++++++++++++++ 1 file changed, 446 insertions(+) create mode 100644 Emby.Server.Implementations/Data/SqliteUserDataRepository.cs (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs new file mode 100644 index 000000000..d1355ce8f --- /dev/null +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -0,0 +1,446 @@ +//using System; +//using System.Collections.Generic; +//using System.Globalization; +//using System.IO; +//using System.Text; +//using System.Threading; +//using System.Threading.Tasks; +//using MediaBrowser.Common.Configuration; +//using MediaBrowser.Controller.Entities; +//using MediaBrowser.Controller.Persistence; +//using MediaBrowser.Model.Logging; +//using SQLitePCL.pretty; + +//namespace Emby.Server.Implementations.Data +//{ +// public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository +// { +// private SQLiteDatabaseConnection _connection; + +// public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) +// : base(logger) +// { +// DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); +// } + +// protected override bool EnableConnectionPooling +// { +// get { return false; } +// } + +// /// +// /// Gets the name of the repository +// /// +// /// The name. +// public string Name +// { +// get +// { +// return "SQLite"; +// } +// } + +// /// +// /// Opens the connection to the database +// /// +// /// Task. +// public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) +// { +// WriteLock.Dispose(); +// WriteLock = writeLock; +// _connection = connection; + +// string[] queries = { + +// "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", + +// "drop index if exists UserDataDb.idx_userdata", +// "drop index if exists UserDataDb.idx_userdata1", +// "drop index if exists UserDataDb.idx_userdata2", +// "drop index if exists UserDataDb.userdataindex1", + +// "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", +// "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", +// "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", +// "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", + +// //pragmas +// "pragma temp_store = memory", + +// "pragma shrink_memory" +// }; + +// _connection.RunQueries(queries); + +// connection.RunInTransaction(db => +// { +// var existingColumnNames = GetColumnNames(db, "userdata"); + +// AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); +// AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); +// }); +// } + +// /// +// /// Saves the user data. +// /// +// /// The user id. +// /// The key. +// /// The user data. +// /// The cancellation token. +// /// Task. +// /// userData +// /// or +// /// cancellationToken +// /// or +// /// userId +// /// or +// /// userDataId +// public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) +// { +// if (userData == null) +// { +// throw new ArgumentNullException("userData"); +// } +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (string.IsNullOrEmpty(key)) +// { +// throw new ArgumentNullException("key"); +// } + +// return PersistUserData(userId, key, userData, cancellationToken); +// } + +// public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) +// { +// if (userData == null) +// { +// throw new ArgumentNullException("userData"); +// } +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } + +// return PersistAllUserData(userId, userData, cancellationToken); +// } + +// /// +// /// Persists the user data. +// /// +// /// The user id. +// /// The key. +// /// The user data. +// /// The cancellation token. +// /// Task. +// public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) +// { +// cancellationToken.ThrowIfCancellationRequested(); + +// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); + +// IDbTransaction transaction = null; + +// try +// { +// transaction = _connection.BeginTransaction(); + +// using (var cmd = _connection.CreateCommand()) +// { +// cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; + +// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; +// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; +// cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userData.Rating; +// cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userData.Played; +// cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userData.PlayCount; +// cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userData.IsFavorite; +// cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userData.PlaybackPositionTicks; +// cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userData.LastPlayedDate; +// cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userData.AudioStreamIndex; +// cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userData.SubtitleStreamIndex; + +// cmd.Transaction = transaction; + +// cmd.ExecuteNonQuery(); +// } + +// transaction.Commit(); +// } +// catch (OperationCanceledException) +// { +// if (transaction != null) +// { +// transaction.Rollback(); +// } + +// throw; +// } +// catch (Exception e) +// { +// Logger.ErrorException("Failed to save user data:", e); + +// if (transaction != null) +// { +// transaction.Rollback(); +// } + +// throw; +// } +// finally +// { +// if (transaction != null) +// { +// transaction.Dispose(); +// } + +// WriteLock.Release(); +// } +// } + +// /// +// /// Persist all user data for the specified user +// /// +// /// +// /// +// /// +// /// +// private async Task PersistAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) +// { +// cancellationToken.ThrowIfCancellationRequested(); + +// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); + +// IDbTransaction transaction = null; + +// try +// { +// transaction = _connection.BeginTransaction(); + +// foreach (var userItemData in userData) +// { +// using (var cmd = _connection.CreateCommand()) +// { +// cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; + +// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userItemData.Key; +// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; +// cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userItemData.Rating; +// cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userItemData.Played; +// cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userItemData.PlayCount; +// cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userItemData.IsFavorite; +// cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userItemData.PlaybackPositionTicks; +// cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userItemData.LastPlayedDate; +// cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userItemData.AudioStreamIndex; +// cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userItemData.SubtitleStreamIndex; + +// cmd.Transaction = transaction; + +// cmd.ExecuteNonQuery(); +// } + +// cancellationToken.ThrowIfCancellationRequested(); +// } + +// transaction.Commit(); +// } +// catch (OperationCanceledException) +// { +// if (transaction != null) +// { +// transaction.Rollback(); +// } + +// throw; +// } +// catch (Exception e) +// { +// Logger.ErrorException("Failed to save user data:", e); + +// if (transaction != null) +// { +// transaction.Rollback(); +// } + +// throw; +// } +// finally +// { +// if (transaction != null) +// { +// transaction.Dispose(); +// } + +// WriteLock.Release(); +// } +// } + +// /// +// /// Gets the user data. +// /// +// /// The user id. +// /// The key. +// /// Task{UserItemData}. +// /// +// /// userId +// /// or +// /// key +// /// +// public UserItemData GetUserData(Guid userId, string key) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (string.IsNullOrEmpty(key)) +// { +// throw new ArgumentNullException("key"); +// } + +// using (var cmd = _connection.CreateCommand()) +// { +// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = @key and userId=@userId"; + +// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; +// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; + +// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) +// { +// if (reader.Read()) +// { +// return ReadRow(reader); +// } +// } + +// return null; +// } +// } + +// public UserItemData GetUserData(Guid userId, List keys) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (keys == null) +// { +// throw new ArgumentNullException("keys"); +// } + +// using (var cmd = _connection.CreateCommand()) +// { +// var index = 0; +// var userdataKeys = new List(); +// var builder = new StringBuilder(); +// foreach (var key in keys) +// { +// var paramName = "@Key" + index; +// userdataKeys.Add("Key =" + paramName); +// cmd.Parameters.Add(cmd, paramName, DbType.String).Value = key; +// builder.Append(" WHEN Key=" + paramName + " THEN " + index); +// index++; +// break; +// } + +// var keyText = string.Join(" OR ", userdataKeys.ToArray()); + +// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId AND (" + keyText + ") "; + +// cmd.CommandText += " ORDER BY (Case " + builder + " Else " + keys.Count.ToString(CultureInfo.InvariantCulture) + " End )"; +// cmd.CommandText += " LIMIT 1"; + +// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; + +// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) +// { +// if (reader.Read()) +// { +// return ReadRow(reader); +// } +// } + +// return null; +// } +// } + +// /// +// /// Return all user-data associated with the given user +// /// +// /// +// /// +// public IEnumerable GetAllUserData(Guid userId) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } + +// using (var cmd = _connection.CreateCommand()) +// { +// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId"; + +// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; + +// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) +// { +// while (reader.Read()) +// { +// yield return ReadRow(reader); +// } +// } +// } +// } + +// /// +// /// Read a row from the specified reader into the provided userData object +// /// +// /// +// private UserItemData ReadRow(IDataReader reader) +// { +// var userData = new UserItemData(); + +// userData.Key = reader.GetString(0); +// userData.UserId = reader.GetGuid(1); + +// if (!reader.IsDBNull(2)) +// { +// userData.Rating = reader.GetDouble(2); +// } + +// userData.Played = reader.GetBoolean(3); +// userData.PlayCount = reader.GetInt32(4); +// userData.IsFavorite = reader.GetBoolean(5); +// userData.PlaybackPositionTicks = reader.GetInt64(6); + +// if (!reader.IsDBNull(7)) +// { +// userData.LastPlayedDate = reader.GetDateTime(7).ToUniversalTime(); +// } + +// if (!reader.IsDBNull(8)) +// { +// userData.AudioStreamIndex = reader.GetInt32(8); +// } + +// if (!reader.IsDBNull(9)) +// { +// userData.SubtitleStreamIndex = reader.GetInt32(9); +// } + +// return userData; +// } + +// protected override void Dispose(bool dispose) +// { +// // handled by library database +// } + +// protected override void CloseConnection() +// { +// // handled by library database +// } +// } +//} \ No newline at end of file -- cgit v1.2.3 From 9d1b4e1074a530a6ba8652f9940a4d30f66a0dd1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 19 Nov 2016 15:10:59 -0500 Subject: update userdata repository --- .../Data/SqliteUserDataRepository.cs | 777 +++++++++------------ 1 file changed, 331 insertions(+), 446 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index d1355ce8f..4c73b6c6a 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -1,446 +1,331 @@ -//using System; -//using System.Collections.Generic; -//using System.Globalization; -//using System.IO; -//using System.Text; -//using System.Threading; -//using System.Threading.Tasks; -//using MediaBrowser.Common.Configuration; -//using MediaBrowser.Controller.Entities; -//using MediaBrowser.Controller.Persistence; -//using MediaBrowser.Model.Logging; -//using SQLitePCL.pretty; - -//namespace Emby.Server.Implementations.Data -//{ -// public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository -// { -// private SQLiteDatabaseConnection _connection; - -// public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) -// : base(logger) -// { -// DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); -// } - -// protected override bool EnableConnectionPooling -// { -// get { return false; } -// } - -// /// -// /// Gets the name of the repository -// /// -// /// The name. -// public string Name -// { -// get -// { -// return "SQLite"; -// } -// } - -// /// -// /// Opens the connection to the database -// /// -// /// Task. -// public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) -// { -// WriteLock.Dispose(); -// WriteLock = writeLock; -// _connection = connection; - -// string[] queries = { - -// "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", - -// "drop index if exists UserDataDb.idx_userdata", -// "drop index if exists UserDataDb.idx_userdata1", -// "drop index if exists UserDataDb.idx_userdata2", -// "drop index if exists UserDataDb.userdataindex1", - -// "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", -// "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", -// "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", -// "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", - -// //pragmas -// "pragma temp_store = memory", - -// "pragma shrink_memory" -// }; - -// _connection.RunQueries(queries); - -// connection.RunInTransaction(db => -// { -// var existingColumnNames = GetColumnNames(db, "userdata"); - -// AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); -// AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); -// }); -// } - -// /// -// /// Saves the user data. -// /// -// /// The user id. -// /// The key. -// /// The user data. -// /// The cancellation token. -// /// Task. -// /// userData -// /// or -// /// cancellationToken -// /// or -// /// userId -// /// or -// /// userDataId -// public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) -// { -// if (userData == null) -// { -// throw new ArgumentNullException("userData"); -// } -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (string.IsNullOrEmpty(key)) -// { -// throw new ArgumentNullException("key"); -// } - -// return PersistUserData(userId, key, userData, cancellationToken); -// } - -// public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) -// { -// if (userData == null) -// { -// throw new ArgumentNullException("userData"); -// } -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } - -// return PersistAllUserData(userId, userData, cancellationToken); -// } - -// /// -// /// Persists the user data. -// /// -// /// The user id. -// /// The key. -// /// The user data. -// /// The cancellation token. -// /// Task. -// public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; - -// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; -// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; -// cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userData.Rating; -// cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userData.Played; -// cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userData.PlayCount; -// cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userData.IsFavorite; -// cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userData.PlaybackPositionTicks; -// cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userData.LastPlayedDate; -// cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userData.AudioStreamIndex; -// cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userData.SubtitleStreamIndex; - -// cmd.Transaction = transaction; - -// cmd.ExecuteNonQuery(); -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save user data:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// /// -// /// Persist all user data for the specified user -// /// -// /// -// /// -// /// -// /// -// private async Task PersistAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// foreach (var userItemData in userData) -// { -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; - -// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userItemData.Key; -// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; -// cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userItemData.Rating; -// cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userItemData.Played; -// cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userItemData.PlayCount; -// cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userItemData.IsFavorite; -// cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userItemData.PlaybackPositionTicks; -// cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userItemData.LastPlayedDate; -// cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userItemData.AudioStreamIndex; -// cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userItemData.SubtitleStreamIndex; - -// cmd.Transaction = transaction; - -// cmd.ExecuteNonQuery(); -// } - -// cancellationToken.ThrowIfCancellationRequested(); -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save user data:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// /// -// /// Gets the user data. -// /// -// /// The user id. -// /// The key. -// /// Task{UserItemData}. -// /// -// /// userId -// /// or -// /// key -// /// -// public UserItemData GetUserData(Guid userId, string key) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (string.IsNullOrEmpty(key)) -// { -// throw new ArgumentNullException("key"); -// } - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = @key and userId=@userId"; - -// cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; -// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) -// { -// if (reader.Read()) -// { -// return ReadRow(reader); -// } -// } - -// return null; -// } -// } - -// public UserItemData GetUserData(Guid userId, List keys) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (keys == null) -// { -// throw new ArgumentNullException("keys"); -// } - -// using (var cmd = _connection.CreateCommand()) -// { -// var index = 0; -// var userdataKeys = new List(); -// var builder = new StringBuilder(); -// foreach (var key in keys) -// { -// var paramName = "@Key" + index; -// userdataKeys.Add("Key =" + paramName); -// cmd.Parameters.Add(cmd, paramName, DbType.String).Value = key; -// builder.Append(" WHEN Key=" + paramName + " THEN " + index); -// index++; -// break; -// } - -// var keyText = string.Join(" OR ", userdataKeys.ToArray()); - -// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId AND (" + keyText + ") "; - -// cmd.CommandText += " ORDER BY (Case " + builder + " Else " + keys.Count.ToString(CultureInfo.InvariantCulture) + " End )"; -// cmd.CommandText += " LIMIT 1"; - -// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) -// { -// if (reader.Read()) -// { -// return ReadRow(reader); -// } -// } - -// return null; -// } -// } - -// /// -// /// Return all user-data associated with the given user -// /// -// /// -// /// -// public IEnumerable GetAllUserData(Guid userId) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId"; - -// cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// yield return ReadRow(reader); -// } -// } -// } -// } - -// /// -// /// Read a row from the specified reader into the provided userData object -// /// -// /// -// private UserItemData ReadRow(IDataReader reader) -// { -// var userData = new UserItemData(); - -// userData.Key = reader.GetString(0); -// userData.UserId = reader.GetGuid(1); - -// if (!reader.IsDBNull(2)) -// { -// userData.Rating = reader.GetDouble(2); -// } - -// userData.Played = reader.GetBoolean(3); -// userData.PlayCount = reader.GetInt32(4); -// userData.IsFavorite = reader.GetBoolean(5); -// userData.PlaybackPositionTicks = reader.GetInt64(6); - -// if (!reader.IsDBNull(7)) -// { -// userData.LastPlayedDate = reader.GetDateTime(7).ToUniversalTime(); -// } - -// if (!reader.IsDBNull(8)) -// { -// userData.AudioStreamIndex = reader.GetInt32(8); -// } - -// if (!reader.IsDBNull(9)) -// { -// userData.SubtitleStreamIndex = reader.GetInt32(9); -// } - -// return userData; -// } - -// protected override void Dispose(bool dispose) -// { -// // handled by library database -// } - -// protected override void CloseConnection() -// { -// // handled by library database -// } -// } -//} \ No newline at end of file +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Common.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Logging; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Data +{ + public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository + { + private SQLiteDatabaseConnection _connection; + + public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) + : base(logger) + { + DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); + } + + protected override bool EnableConnectionPooling + { + get { return false; } + } + + /// + /// Gets the name of the repository + /// + /// The name. + public string Name + { + get + { + return "SQLite"; + } + } + + /// + /// Opens the connection to the database + /// + /// Task. + public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) + { + WriteLock.Dispose(); + WriteLock = writeLock; + _connection = connection; + + string[] queries = { + + "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", + + "drop index if exists UserDataDb.idx_userdata", + "drop index if exists UserDataDb.idx_userdata1", + "drop index if exists UserDataDb.idx_userdata2", + "drop index if exists UserDataDb.userdataindex1", + + "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", + "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", + "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", + "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", + + //pragmas + "pragma temp_store = memory", + + "pragma shrink_memory" + }; + + _connection.RunQueries(queries); + + connection.RunInTransaction(db => + { + var existingColumnNames = GetColumnNames(db, "userdata"); + + AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); + AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); + }); + } + + /// + /// Saves the user data. + /// + /// The user id. + /// The key. + /// The user data. + /// The cancellation token. + /// Task. + /// userData + /// or + /// cancellationToken + /// or + /// userId + /// or + /// userDataId + public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) + { + if (userData == null) + { + throw new ArgumentNullException("userData"); + } + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException("key"); + } + + return PersistUserData(userId, key, userData, cancellationToken); + } + + public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) + { + if (userData == null) + { + throw new ArgumentNullException("userData"); + } + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + + return PersistAllUserData(userId, userData.ToList(), cancellationToken); + } + + /// + /// Persists the user data. + /// + /// The user id. + /// The key. + /// The user data. + /// The cancellation token. + /// Task. + public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + SaveUserData(db, userId, key, userData); + }); + } + } + + private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) + { + var paramList = new List(); + var commandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (?, ?, ?,?,?,?,?,?,?,?)"; + + paramList.Add(key); + paramList.Add(userId.ToGuidParamValue()); + paramList.Add(userData.Rating); + paramList.Add(userData.Played); + paramList.Add(userData.PlayCount); + paramList.Add(userData.IsFavorite); + paramList.Add(userData.PlaybackPositionTicks); + + if (userData.LastPlayedDate.HasValue) + { + paramList.Add(userData.LastPlayedDate.Value.ToDateTimeParamValue()); + } + else + { + paramList.Add(null); + } + paramList.Add(userData.AudioStreamIndex); + paramList.Add(userData.SubtitleStreamIndex); + + db.Execute(commandText, paramList.ToArray()); + } + + /// + /// Persist all user data for the specified user + /// + private async Task PersistAllUserData(Guid userId, List userDataList, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + foreach (var userItemData in userDataList) + { + SaveUserData(db, userId, userItemData.Key, userItemData); + } + }); + } + } + + /// + /// Gets the user data. + /// + /// The user id. + /// The key. + /// Task{UserItemData}. + /// + /// userId + /// or + /// key + /// + public UserItemData GetUserData(Guid userId, string key) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException("key"); + } + + var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = ? and userId=?"; + + var paramList = new List(); + paramList.Add(key); + paramList.Add(userId.ToGuidParamValue()); + + foreach (var row in _connection.Query(commandText, paramList.ToArray())) + { + return ReadRow(row); + } + + return null; + } + + public UserItemData GetUserData(Guid userId, List keys) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (keys == null) + { + throw new ArgumentNullException("keys"); + } + + if (keys.Count == 0) + { + return null; + } + + return GetUserData(userId, keys[0]); + } + + /// + /// Return all user-data associated with the given user + /// + /// + /// + public IEnumerable GetAllUserData(Guid userId) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + + var list = new List(); + + using (WriteLock.Read()) + { + var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=?"; + + var paramList = new List(); + paramList.Add(userId.ToGuidParamValue()); + + foreach (var row in _connection.Query(commandText, paramList.ToArray())) + { + list.Add(ReadRow(row)); + } + } + + return list; + } + + /// + /// Read a row from the specified reader into the provided userData object + /// + /// + private UserItemData ReadRow(IReadOnlyList reader) + { + var userData = new UserItemData(); + + userData.Key = reader[0].ToString(); + userData.UserId = reader[1].ReadGuid(); + + if (reader[2].SQLiteType != SQLiteType.Null) + { + userData.Rating = reader[2].ToDouble(); + } + + userData.Played = reader[3].ToBool(); + userData.PlayCount = reader[4].ToInt(); + userData.IsFavorite = reader[5].ToBool(); + userData.PlaybackPositionTicks = reader[6].ToInt64(); + + if (reader[7].SQLiteType != SQLiteType.Null) + { + userData.LastPlayedDate = reader[7].ReadDateTime(); + } + + if (reader[8].SQLiteType != SQLiteType.Null) + { + userData.AudioStreamIndex = reader[8].ToInt(); + } + + if (reader[9].SQLiteType != SQLiteType.Null) + { + userData.SubtitleStreamIndex = reader[9].ToInt(); + } + + return userData; + } + + protected override void Dispose(bool dispose) + { + // handled by library database + } + + protected override void CloseConnection() + { + // handled by library database + } + } +} \ No newline at end of file -- cgit v1.2.3 From 2a0280d48dd4271f60e9d59be932d6ba0f38c62c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 19 Nov 2016 16:07:01 -0500 Subject: add dll config file --- .../Data/SqliteExtensions.cs | 10 + .../Data/SqliteItemRepository.cs | 238 ++++---- .../Data/SqliteUserDataRepository.cs | 662 ++++++++++----------- .../MediaBrowser.Server.Mono.csproj | 4 + .../SQLitePCLRaw.provider.sqlite3.dll.config | 3 + 5 files changed, 477 insertions(+), 440 deletions(-) create mode 100644 MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index d9536ae9c..3dc3cec8e 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Globalization; using MediaBrowser.Model.IO; using MediaBrowser.Model.Serialization; @@ -127,5 +128,14 @@ namespace Emby.Server.Implementations.Data return stream.ToArray(); } } + + public static void Attach(IDatabaseConnection db, string path, string alias) + { + var commandText = string.Format("attach ? as {0};", alias); + var paramList = new List(); + paramList.Add(path); + + db.Execute(commandText, paramList.ToArray()); + } } } diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index c88bffe04..32cfecfce 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -139,7 +139,7 @@ // /// Task. // public async Task Initialize(SqliteUserDataRepository userDataRepo) // { -// _connection = await CreateConnection(false).ConfigureAwait(false); +// _connection = CreateConnection(false); // var createMediaStreamsTableCommand // = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; @@ -168,109 +168,131 @@ // }; -// _connection.RunQueries(queries, Logger); - -// _connection.AddColumn(Logger, "AncestorIds", "AncestorIdText", "Text"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "Path", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "StartDate", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "EndDate", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ChannelId", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsMovie", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsSports", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsKids", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "CommunityRating", "Float"); -// _connection.AddColumn(Logger, "TypedBaseItems", "CustomRating", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IndexNumber", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsLocked", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Name", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "OfficialRating", "Text"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "MediaType", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Overview", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ParentIndexNumber", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "PremiereDate", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ProductionYear", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ParentId", "GUID"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Genres", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SchemaVersion", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SortName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "RunTimeTicks", "BIGINT"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "OfficialRatingDescription", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "HomePageUrl", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "VoteCount", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "DisplayMediaType", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "DateCreated", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "DateModified", "DATETIME"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "ForcedSortName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsOffline", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "LocationType", "Text"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "IsSeries", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsLive", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsNews", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsPremiere", "BIT"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "EpisodeTitle", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsRepeat", "BIT"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "PreferredMetadataLanguage", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "PreferredMetadataCountryCode", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsHD", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ExternalEtag", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "DateLastRefreshed", "DATETIME"); - -// _connection.AddColumn(Logger, "TypedBaseItems", "DateLastSaved", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsInMixedFolder", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "LockedFields", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Studios", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Audio", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ExternalServiceId", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Tags", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsFolder", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "InheritedParentalRatingValue", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "UnratedType", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "TopParentId", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsItemByName", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SourceType", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "TrailerTypes", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "CriticRating", "Float"); -// _connection.AddColumn(Logger, "TypedBaseItems", "CriticRatingSummary", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "InheritedTags", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "CleanName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "PresentationUniqueKey", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SlugName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "OriginalTitle", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "PrimaryVersionId", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "DateLastMediaAdded", "DATETIME"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Album", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "IsVirtualItem", "BIT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SeriesName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "UserDataKey", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SeasonName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SeasonId", "GUID"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SeriesId", "GUID"); -// _connection.AddColumn(Logger, "TypedBaseItems", "SeriesSortName", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ExternalSeriesId", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ShortOverview", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Tagline", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Keywords", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ProviderIds", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Images", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ProductionLocations", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ThemeSongIds", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ThemeVideoIds", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "TotalBitrate", "INT"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ExtraType", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "Artists", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "AlbumArtists", "Text"); -// _connection.AddColumn(Logger, "TypedBaseItems", "ExternalId", "Text"); - -// _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text"); - -// _connection.AddColumn(Logger, ChaptersTableName, "ImageDateModified", "DATETIME"); +// _connection.RunQueries(queries); + +// _connection.RunInTransaction(db => +// { +// var existingColumnNames = GetColumnNames(db, "AncestorIds"); +// AddColumn(db, "AncestorIds", "AncestorIdText", "Text", existingColumnNames); + +// existingColumnNames = GetColumnNames(db, "TypedBaseItems"); + +// AddColumn(db, "TypedBaseItems", "Path", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "StartDate", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "EndDate", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ChannelId", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsMovie", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsSports", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsKids", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "CommunityRating", "Float", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "CustomRating", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IndexNumber", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsLocked", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Name", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "OfficialRating", "Text", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "MediaType", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Overview", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ParentIndexNumber", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "PremiereDate", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ParentId", "GUID", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Genres", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SchemaVersion", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "OfficialRatingDescription", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "HomePageUrl", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "VoteCount", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "DisplayMediaType", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "DateCreated", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsOffline", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "LocationType", "Text", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsLive", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsNews", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsPremiere", "BIT", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "EpisodeTitle", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsRepeat", "BIT", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "PreferredMetadataLanguage", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "PreferredMetadataCountryCode", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsHD", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ExternalEtag", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "DateLastRefreshed", "DATETIME", existingColumnNames); + +// AddColumn(db, "TypedBaseItems", "DateLastSaved", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsInMixedFolder", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "LockedFields", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Studios", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Audio", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ExternalServiceId", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Tags", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsFolder", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "InheritedParentalRatingValue", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "UnratedType", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "TopParentId", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsItemByName", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SourceType", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "TrailerTypes", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "CriticRating", "Float", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "CriticRatingSummary", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "InheritedTags", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "CleanName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "PresentationUniqueKey", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SlugName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "OriginalTitle", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "PrimaryVersionId", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "DateLastMediaAdded", "DATETIME", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Album", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "IsVirtualItem", "BIT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SeriesName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "UserDataKey", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SeasonName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SeasonId", "GUID", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SeriesId", "GUID", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "SeriesSortName", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ExternalSeriesId", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ShortOverview", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Tagline", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Keywords", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ProviderIds", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Images", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ProductionLocations", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ThemeSongIds", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ThemeVideoIds", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "TotalBitrate", "INT", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ExtraType", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "Artists", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "AlbumArtists", "Text", existingColumnNames); +// AddColumn(db, "TypedBaseItems", "ExternalId", "Text", existingColumnNames); + +// existingColumnNames = GetColumnNames(db, "ItemValues"); +// AddColumn(db, "ItemValues", "CleanValue", "Text", existingColumnNames); + +// existingColumnNames = GetColumnNames(db, ChaptersTableName); +// AddColumn(db, ChaptersTableName, "ImageDateModified", "DATETIME", existingColumnNames); + +// existingColumnNames = GetColumnNames(db, "MediaStreams"); +// AddColumn(db, "MediaStreams", "IsAvc", "BIT", existingColumnNames); +// AddColumn(db, "MediaStreams", "TimeBase", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "CodecTimeBase", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "Title", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "NalLengthSize", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "Comment", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "CodecTag", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "PixelFormat", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "BitDepth", "INT", existingColumnNames); +// AddColumn(db, "MediaStreams", "RefFrames", "INT", existingColumnNames); +// AddColumn(db, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames); +// AddColumn(db, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames); +// }); // string[] postQueries = @@ -334,14 +356,12 @@ // "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)" // }; -// _connection.RunQueries(postQueries, Logger); +// _connection.RunQueries(postQueries); // PrepareStatements(); -// new MediaStreamColumns(_connection, Logger).AddColumns(); - -// DataExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); -// await userDataRepo.Initialize(_connection, WriteLock).ConfigureAwait(false); +// SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); +// userDataRepo.Initialize(_connection, WriteLock); // //await Vacuum(_connection).ConfigureAwait(false); // } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 4c73b6c6a..5556c4502 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -1,331 +1,331 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Common.Configuration; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Model.Logging; -using SQLitePCL.pretty; - -namespace Emby.Server.Implementations.Data -{ - public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository - { - private SQLiteDatabaseConnection _connection; - - public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) - : base(logger) - { - DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); - } - - protected override bool EnableConnectionPooling - { - get { return false; } - } - - /// - /// Gets the name of the repository - /// - /// The name. - public string Name - { - get - { - return "SQLite"; - } - } - - /// - /// Opens the connection to the database - /// - /// Task. - public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) - { - WriteLock.Dispose(); - WriteLock = writeLock; - _connection = connection; - - string[] queries = { - - "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", - - "drop index if exists UserDataDb.idx_userdata", - "drop index if exists UserDataDb.idx_userdata1", - "drop index if exists UserDataDb.idx_userdata2", - "drop index if exists UserDataDb.userdataindex1", - - "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", - "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", - "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", - "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", - - //pragmas - "pragma temp_store = memory", - - "pragma shrink_memory" - }; - - _connection.RunQueries(queries); - - connection.RunInTransaction(db => - { - var existingColumnNames = GetColumnNames(db, "userdata"); - - AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); - AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); - }); - } - - /// - /// Saves the user data. - /// - /// The user id. - /// The key. - /// The user data. - /// The cancellation token. - /// Task. - /// userData - /// or - /// cancellationToken - /// or - /// userId - /// or - /// userDataId - public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) - { - if (userData == null) - { - throw new ArgumentNullException("userData"); - } - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (string.IsNullOrEmpty(key)) - { - throw new ArgumentNullException("key"); - } - - return PersistUserData(userId, key, userData, cancellationToken); - } - - public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) - { - if (userData == null) - { - throw new ArgumentNullException("userData"); - } - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - - return PersistAllUserData(userId, userData.ToList(), cancellationToken); - } - - /// - /// Persists the user data. - /// - /// The user id. - /// The key. - /// The user data. - /// The cancellation token. - /// Task. - public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - - using (WriteLock.Write()) - { - _connection.RunInTransaction(db => - { - SaveUserData(db, userId, key, userData); - }); - } - } - - private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) - { - var paramList = new List(); - var commandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (?, ?, ?,?,?,?,?,?,?,?)"; - - paramList.Add(key); - paramList.Add(userId.ToGuidParamValue()); - paramList.Add(userData.Rating); - paramList.Add(userData.Played); - paramList.Add(userData.PlayCount); - paramList.Add(userData.IsFavorite); - paramList.Add(userData.PlaybackPositionTicks); - - if (userData.LastPlayedDate.HasValue) - { - paramList.Add(userData.LastPlayedDate.Value.ToDateTimeParamValue()); - } - else - { - paramList.Add(null); - } - paramList.Add(userData.AudioStreamIndex); - paramList.Add(userData.SubtitleStreamIndex); - - db.Execute(commandText, paramList.ToArray()); - } - - /// - /// Persist all user data for the specified user - /// - private async Task PersistAllUserData(Guid userId, List userDataList, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - - using (WriteLock.Write()) - { - _connection.RunInTransaction(db => - { - foreach (var userItemData in userDataList) - { - SaveUserData(db, userId, userItemData.Key, userItemData); - } - }); - } - } - - /// - /// Gets the user data. - /// - /// The user id. - /// The key. - /// Task{UserItemData}. - /// - /// userId - /// or - /// key - /// - public UserItemData GetUserData(Guid userId, string key) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (string.IsNullOrEmpty(key)) - { - throw new ArgumentNullException("key"); - } - - var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = ? and userId=?"; - - var paramList = new List(); - paramList.Add(key); - paramList.Add(userId.ToGuidParamValue()); - - foreach (var row in _connection.Query(commandText, paramList.ToArray())) - { - return ReadRow(row); - } - - return null; - } - - public UserItemData GetUserData(Guid userId, List keys) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (keys == null) - { - throw new ArgumentNullException("keys"); - } - - if (keys.Count == 0) - { - return null; - } - - return GetUserData(userId, keys[0]); - } - - /// - /// Return all user-data associated with the given user - /// - /// - /// - public IEnumerable GetAllUserData(Guid userId) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - - var list = new List(); - - using (WriteLock.Read()) - { - var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=?"; - - var paramList = new List(); - paramList.Add(userId.ToGuidParamValue()); - - foreach (var row in _connection.Query(commandText, paramList.ToArray())) - { - list.Add(ReadRow(row)); - } - } - - return list; - } - - /// - /// Read a row from the specified reader into the provided userData object - /// - /// - private UserItemData ReadRow(IReadOnlyList reader) - { - var userData = new UserItemData(); - - userData.Key = reader[0].ToString(); - userData.UserId = reader[1].ReadGuid(); - - if (reader[2].SQLiteType != SQLiteType.Null) - { - userData.Rating = reader[2].ToDouble(); - } - - userData.Played = reader[3].ToBool(); - userData.PlayCount = reader[4].ToInt(); - userData.IsFavorite = reader[5].ToBool(); - userData.PlaybackPositionTicks = reader[6].ToInt64(); - - if (reader[7].SQLiteType != SQLiteType.Null) - { - userData.LastPlayedDate = reader[7].ReadDateTime(); - } - - if (reader[8].SQLiteType != SQLiteType.Null) - { - userData.AudioStreamIndex = reader[8].ToInt(); - } - - if (reader[9].SQLiteType != SQLiteType.Null) - { - userData.SubtitleStreamIndex = reader[9].ToInt(); - } - - return userData; - } - - protected override void Dispose(bool dispose) - { - // handled by library database - } - - protected override void CloseConnection() - { - // handled by library database - } - } -} \ No newline at end of file +//using System; +//using System.Collections.Generic; +//using System.IO; +//using System.Linq; +//using System.Threading; +//using System.Threading.Tasks; +//using MediaBrowser.Common.Configuration; +//using MediaBrowser.Controller.Entities; +//using MediaBrowser.Controller.Persistence; +//using MediaBrowser.Model.Logging; +//using SQLitePCL.pretty; + +//namespace Emby.Server.Implementations.Data +//{ +// public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository +// { +// private SQLiteDatabaseConnection _connection; + +// public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) +// : base(logger) +// { +// DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); +// } + +// protected override bool EnableConnectionPooling +// { +// get { return false; } +// } + +// /// +// /// Gets the name of the repository +// /// +// /// The name. +// public string Name +// { +// get +// { +// return "SQLite"; +// } +// } + +// /// +// /// Opens the connection to the database +// /// +// /// Task. +// public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) +// { +// WriteLock.Dispose(); +// WriteLock = writeLock; +// _connection = connection; + +// string[] queries = { + +// "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", + +// "drop index if exists UserDataDb.idx_userdata", +// "drop index if exists UserDataDb.idx_userdata1", +// "drop index if exists UserDataDb.idx_userdata2", +// "drop index if exists UserDataDb.userdataindex1", + +// "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", +// "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", +// "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", +// "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", + +// //pragmas +// "pragma temp_store = memory", + +// "pragma shrink_memory" +// }; + +// _connection.RunQueries(queries); + +// connection.RunInTransaction(db => +// { +// var existingColumnNames = GetColumnNames(db, "userdata"); + +// AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); +// AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); +// }); +// } + +// /// +// /// Saves the user data. +// /// +// /// The user id. +// /// The key. +// /// The user data. +// /// The cancellation token. +// /// Task. +// /// userData +// /// or +// /// cancellationToken +// /// or +// /// userId +// /// or +// /// userDataId +// public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) +// { +// if (userData == null) +// { +// throw new ArgumentNullException("userData"); +// } +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (string.IsNullOrEmpty(key)) +// { +// throw new ArgumentNullException("key"); +// } + +// return PersistUserData(userId, key, userData, cancellationToken); +// } + +// public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) +// { +// if (userData == null) +// { +// throw new ArgumentNullException("userData"); +// } +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } + +// return PersistAllUserData(userId, userData.ToList(), cancellationToken); +// } + +// /// +// /// Persists the user data. +// /// +// /// The user id. +// /// The key. +// /// The user data. +// /// The cancellation token. +// /// Task. +// public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) +// { +// cancellationToken.ThrowIfCancellationRequested(); + +// using (WriteLock.Write()) +// { +// _connection.RunInTransaction(db => +// { +// SaveUserData(db, userId, key, userData); +// }); +// } +// } + +// private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) +// { +// var paramList = new List(); +// var commandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (?, ?, ?,?,?,?,?,?,?,?)"; + +// paramList.Add(key); +// paramList.Add(userId.ToGuidParamValue()); +// paramList.Add(userData.Rating); +// paramList.Add(userData.Played); +// paramList.Add(userData.PlayCount); +// paramList.Add(userData.IsFavorite); +// paramList.Add(userData.PlaybackPositionTicks); + +// if (userData.LastPlayedDate.HasValue) +// { +// paramList.Add(userData.LastPlayedDate.Value.ToDateTimeParamValue()); +// } +// else +// { +// paramList.Add(null); +// } +// paramList.Add(userData.AudioStreamIndex); +// paramList.Add(userData.SubtitleStreamIndex); + +// db.Execute(commandText, paramList.ToArray()); +// } + +// /// +// /// Persist all user data for the specified user +// /// +// private async Task PersistAllUserData(Guid userId, List userDataList, CancellationToken cancellationToken) +// { +// cancellationToken.ThrowIfCancellationRequested(); + +// using (WriteLock.Write()) +// { +// _connection.RunInTransaction(db => +// { +// foreach (var userItemData in userDataList) +// { +// SaveUserData(db, userId, userItemData.Key, userItemData); +// } +// }); +// } +// } + +// /// +// /// Gets the user data. +// /// +// /// The user id. +// /// The key. +// /// Task{UserItemData}. +// /// +// /// userId +// /// or +// /// key +// /// +// public UserItemData GetUserData(Guid userId, string key) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (string.IsNullOrEmpty(key)) +// { +// throw new ArgumentNullException("key"); +// } + +// var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = ? and userId=?"; + +// var paramList = new List(); +// paramList.Add(key); +// paramList.Add(userId.ToGuidParamValue()); + +// foreach (var row in _connection.Query(commandText, paramList.ToArray())) +// { +// return ReadRow(row); +// } + +// return null; +// } + +// public UserItemData GetUserData(Guid userId, List keys) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } +// if (keys == null) +// { +// throw new ArgumentNullException("keys"); +// } + +// if (keys.Count == 0) +// { +// return null; +// } + +// return GetUserData(userId, keys[0]); +// } + +// /// +// /// Return all user-data associated with the given user +// /// +// /// +// /// +// public IEnumerable GetAllUserData(Guid userId) +// { +// if (userId == Guid.Empty) +// { +// throw new ArgumentNullException("userId"); +// } + +// var list = new List(); + +// using (WriteLock.Read()) +// { +// var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=?"; + +// var paramList = new List(); +// paramList.Add(userId.ToGuidParamValue()); + +// foreach (var row in _connection.Query(commandText, paramList.ToArray())) +// { +// list.Add(ReadRow(row)); +// } +// } + +// return list; +// } + +// /// +// /// Read a row from the specified reader into the provided userData object +// /// +// /// +// private UserItemData ReadRow(IReadOnlyList reader) +// { +// var userData = new UserItemData(); + +// userData.Key = reader[0].ToString(); +// userData.UserId = reader[1].ReadGuid(); + +// if (reader[2].SQLiteType != SQLiteType.Null) +// { +// userData.Rating = reader[2].ToDouble(); +// } + +// userData.Played = reader[3].ToBool(); +// userData.PlayCount = reader[4].ToInt(); +// userData.IsFavorite = reader[5].ToBool(); +// userData.PlaybackPositionTicks = reader[6].ToInt64(); + +// if (reader[7].SQLiteType != SQLiteType.Null) +// { +// userData.LastPlayedDate = reader[7].ReadDateTime(); +// } + +// if (reader[8].SQLiteType != SQLiteType.Null) +// { +// userData.AudioStreamIndex = reader[8].ToInt(); +// } + +// if (reader[9].SQLiteType != SQLiteType.Null) +// { +// userData.SubtitleStreamIndex = reader[9].ToInt(); +// } + +// return userData; +// } + +// protected override void Dispose(bool dispose) +// { +// // handled by library database +// } + +// protected override void CloseConnection() +// { +// // handled by library database +// } +// } +//} \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index bd21db6cc..a0dc59cef 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -230,6 +230,10 @@ PreserveNewest + + Designer + PreserveNewest + PreserveNewest Designer diff --git a/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config b/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config new file mode 100644 index 000000000..83a6cd9f3 --- /dev/null +++ b/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file -- cgit v1.2.3 From a385ab51424692425a8d563e01acb86edbe9cff9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Nov 2016 01:13:35 -0500 Subject: update extension --- .../Data/SqliteExtensions.cs | 27 ++++++ .../Data/SqliteUserDataRepository.cs | 97 ++++++++++++++-------- 2 files changed, 88 insertions(+), 36 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index 1cc8a8a93..0f4f703a0 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -173,6 +173,15 @@ namespace Emby.Server.Implementations.Data return result[index].ReadGuid(); } + public static void TryBind(this IReadOnlyDictionary bindParameters, string name, double value) + { + IBindParameter bindParam; + if (bindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value); + } + } + public static void TryBind(this IReadOnlyDictionary bindParameters, string name, string value) { IBindParameter bindParam; @@ -191,6 +200,24 @@ namespace Emby.Server.Implementations.Data } } + public static void TryBind(this IReadOnlyDictionary bindParameters, string name, int value) + { + IBindParameter bindParam; + if (bindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value); + } + } + + public static void TryBind(this IReadOnlyDictionary bindParameters, string name, long value) + { + IBindParameter bindParam; + if (bindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value); + } + } + public static void TryBind(this IReadOnlyDictionary bindParameters, string name, byte[] value) { IBindParameter bindParam; diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 5556c4502..8aa3698b8 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -150,29 +150,54 @@ // private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) // { -// var paramList = new List(); -// var commandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (?, ?, ?,?,?,?,?,?,?,?)"; - -// paramList.Add(key); -// paramList.Add(userId.ToGuidParamValue()); -// paramList.Add(userData.Rating); -// paramList.Add(userData.Played); -// paramList.Add(userData.PlayCount); -// paramList.Add(userData.IsFavorite); -// paramList.Add(userData.PlaybackPositionTicks); - -// if (userData.LastPlayedDate.HasValue) +// using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) // { -// paramList.Add(userData.LastPlayedDate.Value.ToDateTimeParamValue()); -// } -// else -// { -// paramList.Add(null); -// } -// paramList.Add(userData.AudioStreamIndex); -// paramList.Add(userData.SubtitleStreamIndex); +// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); +// statement.BindParameters.TryBind("@Key", key); + +// if (userData.Rating.HasValue) +// { +// statement.BindParameters.TryBind("@rating", userData.Rating.Value); +// } +// else +// { +// statement.BindParameters.TryBindNull("@rating"); +// } + +// statement.BindParameters.TryBind("@played", userData.Played); +// statement.BindParameters.TryBind("@playCount", userData.PlayCount); +// statement.BindParameters.TryBind("@isFavorite", userData.IsFavorite); +// statement.BindParameters.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks); -// db.Execute(commandText, paramList.ToArray()); +// if (userData.LastPlayedDate.HasValue) +// { +// statement.BindParameters.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue()); +// } +// else +// { +// statement.BindParameters.TryBindNull("@lastPlayedDate"); +// } + +// if (userData.AudioStreamIndex.HasValue) +// { +// statement.BindParameters.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value); +// } +// else +// { +// statement.BindParameters.TryBindNull("@AudioStreamIndex"); +// } + +// if (userData.SubtitleStreamIndex.HasValue) +// { +// statement.BindParameters.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value); +// } +// else +// { +// statement.BindParameters.TryBindNull("@SubtitleStreamIndex"); +// } + +// statement.MoveNext(); +// } // } // /// @@ -216,15 +241,15 @@ // throw new ArgumentNullException("key"); // } -// var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = ? and userId=?"; - -// var paramList = new List(); -// paramList.Add(key); -// paramList.Add(userId.ToGuidParamValue()); - -// foreach (var row in _connection.Query(commandText, paramList.ToArray())) +// using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) // { -// return ReadRow(row); +// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); +// statement.BindParameters.TryBind("@Key", key); + +// foreach (var row in statement.ExecuteQuery()) +// { +// return ReadRow(row); +// } // } // return null; @@ -265,14 +290,14 @@ // using (WriteLock.Read()) // { -// var commandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=?"; - -// var paramList = new List(); -// paramList.Add(userId.ToGuidParamValue()); - -// foreach (var row in _connection.Query(commandText, paramList.ToArray())) +// using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) // { -// list.Add(ReadRow(row)); +// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); + +// foreach (var row in statement.ExecuteQuery()) +// { +// list.Add(ReadRow(row)); +// } // } // } -- cgit v1.2.3 From 7f62a99ab508551b83568051a874703ddd50b563 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Nov 2016 02:10:07 -0500 Subject: update extensions --- .../Activity/ActivityRepository.cs | 20 ++-- .../Data/SqliteDisplayPreferencesRepository.cs | 16 +-- .../Data/SqliteExtensions.cs | 115 ++++++++++++++++++--- .../Data/SqliteUserDataRepository.cs | 34 +++--- .../Data/SqliteUserRepository.cs | 6 +- .../Notifications/SqliteNotificationsRepository.cs | 34 +++--- .../Security/AuthenticationRepository.cs | 30 +++--- Emby.Server.Implementations/Sync/SyncRepository.cs | 4 +- 8 files changed, 173 insertions(+), 86 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index aaa0b2f5d..ebf93fa33 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -59,16 +59,16 @@ namespace Emby.Server.Implementations.Activity { using (var statement = db.PrepareStatement("replace into ActivityLogEntries (Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Id, @Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)")) { - statement.BindParameters.TryBind("@Id", entry.Id.ToGuidParamValue()); - statement.BindParameters.TryBind("@Name", entry.Name); - - statement.BindParameters.TryBind("@Overview", entry.Overview); - statement.BindParameters.TryBind("@ShortOverview", entry.ShortOverview); - statement.BindParameters.TryBind("@Type", entry.Type); - statement.BindParameters.TryBind("@ItemId", entry.ItemId); - statement.BindParameters.TryBind("@UserId", entry.UserId); - statement.BindParameters.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue()); - statement.BindParameters.TryBind("@LogSeverity", entry.Severity.ToString()); + statement.TryBind("@Id", entry.Id.ToGuidParamValue()); + statement.TryBind("@Name", entry.Name); + + statement.TryBind("@Overview", entry.Overview); + statement.TryBind("@ShortOverview", entry.ShortOverview); + statement.TryBind("@Type", entry.Type); + statement.TryBind("@ItemId", entry.ItemId); + statement.TryBind("@UserId", entry.UserId); + statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue()); + statement.TryBind("@LogSeverity", entry.Severity.ToString()); statement.MoveNext(); } diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 1c592048e..184caa4d4 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -104,10 +104,10 @@ namespace Emby.Server.Implementations.Data { var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider); - statement.BindParameters.TryBind("@id", displayPreferences.Id.ToGuidParamValue()); - statement.BindParameters.TryBind("@userId", userId.ToGuidParamValue()); - statement.BindParameters.TryBind("@client", client); - statement.BindParameters.TryBind("@data", serialized); + statement.TryBind("@id", displayPreferences.Id.ToGuidParamValue()); + statement.TryBind("@userId", userId.ToGuidParamValue()); + statement.TryBind("@client", client); + statement.TryBind("@data", serialized); statement.MoveNext(); } @@ -168,9 +168,9 @@ namespace Emby.Server.Implementations.Data { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client")) { - statement.BindParameters.TryBind("@id", guidId.ToGuidParamValue()); - statement.BindParameters.TryBind("@userId", userId.ToGuidParamValue()); - statement.BindParameters.TryBind("@client", client); + statement.TryBind("@id", guidId.ToGuidParamValue()); + statement.TryBind("@userId", userId.ToGuidParamValue()); + statement.TryBind("@client", client); foreach (var row in statement.ExecuteQuery()) { @@ -202,7 +202,7 @@ namespace Emby.Server.Implementations.Data { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId")) { - statement.BindParameters.TryBind("@userId", userId.ToGuidParamValue()); + statement.TryBind("@userId", userId.ToGuidParamValue()); foreach (var row in statement.ExecuteQuery()) { diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index 0f4f703a0..657dadfe5 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -173,69 +173,156 @@ namespace Emby.Server.Implementations.Data return result[index].ReadGuid(); } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, double value) + public static void TryBind(this IStatement statement, string name, double value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, string value) + public static void TryBind(this IStatement statement, string name, string value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, bool value) + public static void TryBind(this IStatement statement, string name, bool value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, int value) + public static void TryBind(this IStatement statement, string name, float value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, long value) + public static void TryBind(this IStatement statement, string name, int value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBind(this IReadOnlyDictionary bindParameters, string name, byte[] value) + public static void TryBind(this IStatement statement, string name, Guid value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value.ToGuidParamValue()); + } + } + + public static void TryBind(this IStatement statement, string name, DateTime value) + { + IBindParameter bindParam; + if (statement.BindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value.ToDateTimeParamValue()); + } + } + + public static void TryBind(this IStatement statement, string name, long value) + { + IBindParameter bindParam; + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.Bind(value); } } - public static void TryBindNull(this IReadOnlyDictionary bindParameters, string name) + public static void TryBind(this IStatement statement, string name, byte[] value) { IBindParameter bindParam; - if (bindParameters.TryGetValue(name, out bindParam)) + if (statement.BindParameters.TryGetValue(name, out bindParam)) + { + bindParam.Bind(value); + } + } + + public static void TryBindNull(this IStatement statement, string name) + { + IBindParameter bindParam; + if (statement.BindParameters.TryGetValue(name, out bindParam)) { bindParam.BindNull(); } } + public static void TryBind(this IStatement statement, string name, DateTime? value) + { + if (value.HasValue) + { + TryBind(statement, name, value.Value); + } + else + { + TryBindNull(statement, name); + } + } + + public static void TryBind(this IStatement statement, string name, Guid? value) + { + if (value.HasValue) + { + TryBind(statement, name, value.Value); + } + else + { + TryBindNull(statement, name); + } + } + + public static void TryBind(this IStatement statement, string name, int? value) + { + if (value.HasValue) + { + TryBind(statement, name, value.Value); + } + else + { + TryBindNull(statement, name); + } + } + + public static void TryBind(this IStatement statement, string name, float? value) + { + if (value.HasValue) + { + TryBind(statement, name, value.Value); + } + else + { + TryBindNull(statement, name); + } + } + + public static void TryBind(this IStatement statement, string name, bool? value) + { + if (value.HasValue) + { + TryBind(statement, name, value.Value); + } + else + { + TryBindNull(statement, name); + } + } + public static IEnumerable> ExecuteQuery( this IStatement This) { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 8aa3698b8..c6b08c4b3 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -152,48 +152,48 @@ // { // using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) // { -// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); -// statement.BindParameters.TryBind("@Key", key); +// statement.TryBind("@UserId", userId.ToGuidParamValue()); +// statement.TryBind("@Key", key); // if (userData.Rating.HasValue) // { -// statement.BindParameters.TryBind("@rating", userData.Rating.Value); +// statement.TryBind("@rating", userData.Rating.Value); // } // else // { -// statement.BindParameters.TryBindNull("@rating"); +// statement.TryBindNull("@rating"); // } -// statement.BindParameters.TryBind("@played", userData.Played); -// statement.BindParameters.TryBind("@playCount", userData.PlayCount); -// statement.BindParameters.TryBind("@isFavorite", userData.IsFavorite); -// statement.BindParameters.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks); +// statement.TryBind("@played", userData.Played); +// statement.TryBind("@playCount", userData.PlayCount); +// statement.TryBind("@isFavorite", userData.IsFavorite); +// statement.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks); // if (userData.LastPlayedDate.HasValue) // { -// statement.BindParameters.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue()); +// statement.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue()); // } // else // { -// statement.BindParameters.TryBindNull("@lastPlayedDate"); +// statement.TryBindNull("@lastPlayedDate"); // } // if (userData.AudioStreamIndex.HasValue) // { -// statement.BindParameters.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value); +// statement.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value); // } // else // { -// statement.BindParameters.TryBindNull("@AudioStreamIndex"); +// statement.TryBindNull("@AudioStreamIndex"); // } // if (userData.SubtitleStreamIndex.HasValue) // { -// statement.BindParameters.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value); +// statement.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value); // } // else // { -// statement.BindParameters.TryBindNull("@SubtitleStreamIndex"); +// statement.TryBindNull("@SubtitleStreamIndex"); // } // statement.MoveNext(); @@ -243,8 +243,8 @@ // using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) // { -// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); -// statement.BindParameters.TryBind("@Key", key); +// statement.TryBind("@UserId", userId.ToGuidParamValue()); +// statement.TryBind("@Key", key); // foreach (var row in statement.ExecuteQuery()) // { @@ -292,7 +292,7 @@ // { // using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) // { -// statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); +// statement.TryBind("@UserId", userId.ToGuidParamValue()); // foreach (var row in statement.ExecuteQuery()) // { diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index ee496b669..5e148d95a 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -91,8 +91,8 @@ namespace Emby.Server.Implementations.Data { using (var statement = db.PrepareStatement("replace into users (guid, data) values (@guid, @data)")) { - statement.BindParameters.TryBind("@guid", user.Id.ToGuidParamValue()); - statement.BindParameters.TryBind("@data", serialized); + statement.TryBind("@guid", user.Id.ToGuidParamValue()); + statement.TryBind("@data", serialized); statement.MoveNext(); } }); @@ -154,7 +154,7 @@ namespace Emby.Server.Implementations.Data { using (var statement = db.PrepareStatement("delete from users where guid=@id")) { - statement.BindParameters.TryBind("@id", user.Id.ToGuidParamValue()); + statement.TryBind("@id", user.Id.ToGuidParamValue()); statement.MoveNext(); } }); diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 15322dcd3..5a3b64dbb 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -109,8 +109,8 @@ namespace Emby.Server.Implementations.Notifications { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { - statement.BindParameters.TryBind("@IsRead", false); - statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@IsRead", false); + statement.TryBind("@UserId", userId.ToGuidParamValue()); foreach (var row in statement.ExecuteQuery()) { @@ -228,16 +228,16 @@ namespace Emby.Server.Implementations.Notifications { using (var statement = conn.PrepareStatement("replace into Notifications (Id, UserId, Date, Name, Description, Url, Level, IsRead, Category, RelatedId) values (@Id, @UserId, @Date, @Name, @Description, @Url, @Level, @IsRead, @Category, @RelatedId)")) { - statement.BindParameters.TryBind("@Id", notification.Id.ToGuidParamValue()); - statement.BindParameters.TryBind("@UserId", notification.UserId.ToGuidParamValue()); - statement.BindParameters.TryBind("@Date", notification.Date.ToDateTimeParamValue()); - statement.BindParameters.TryBind("@Name", notification.Name); - statement.BindParameters.TryBind("@Description", notification.Description); - statement.BindParameters.TryBind("@Url", notification.Url); - statement.BindParameters.TryBind("@Level", notification.Level.ToString()); - statement.BindParameters.TryBind("@IsRead", notification.IsRead); - statement.BindParameters.TryBind("@Category", string.Empty); - statement.BindParameters.TryBind("@RelatedId", string.Empty); + statement.TryBind("@Id", notification.Id.ToGuidParamValue()); + statement.TryBind("@UserId", notification.UserId.ToGuidParamValue()); + statement.TryBind("@Date", notification.Date.ToDateTimeParamValue()); + statement.TryBind("@Name", notification.Name); + statement.TryBind("@Description", notification.Description); + statement.TryBind("@Url", notification.Url); + statement.TryBind("@Level", notification.Level.ToString()); + statement.TryBind("@IsRead", notification.IsRead); + statement.TryBind("@Category", string.Empty); + statement.TryBind("@RelatedId", string.Empty); statement.MoveNext(); } @@ -291,8 +291,8 @@ namespace Emby.Server.Implementations.Notifications { using (var statement = conn.PrepareStatement("update Notifications set IsRead=@IsRead where UserId=@UserId")) { - statement.BindParameters.TryBind("@IsRead", isRead); - statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@IsRead", isRead); + statement.TryBind("@UserId", userId.ToGuidParamValue()); statement.MoveNext(); } @@ -313,14 +313,14 @@ namespace Emby.Server.Implementations.Notifications { using (var statement = conn.PrepareStatement("update Notifications set IsRead=@IsRead where UserId=@UserId and Id=@Id")) { - statement.BindParameters.TryBind("@IsRead", isRead); - statement.BindParameters.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@IsRead", isRead); + statement.TryBind("@UserId", userId.ToGuidParamValue()); foreach (var id in notificationIdList) { statement.Reset(); - statement.BindParameters.TryBind("@Id", id.ToGuidParamValue()); + statement.TryBind("@Id", id.ToGuidParamValue()); statement.MoveNext(); } diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index 160e0f5d2..a9141f153 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -71,24 +71,24 @@ namespace Emby.Server.Implementations.Security { using (var statement = db.PrepareStatement("replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)")) { - statement.BindParameters.TryBind("@Id", info.Id.ToGuidParamValue()); - statement.BindParameters.TryBind("@AccessToken", info.AccessToken); + statement.TryBind("@Id", info.Id.ToGuidParamValue()); + statement.TryBind("@AccessToken", info.AccessToken); - statement.BindParameters.TryBind("@DeviceId", info.DeviceId); - statement.BindParameters.TryBind("@AppName", info.AppName); - statement.BindParameters.TryBind("@AppVersion", info.AppVersion); - statement.BindParameters.TryBind("@DeviceName", info.DeviceName); - statement.BindParameters.TryBind("@UserId", info.UserId); - statement.BindParameters.TryBind("@IsActive", info.IsActive); - statement.BindParameters.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue()); + statement.TryBind("@DeviceId", info.DeviceId); + statement.TryBind("@AppName", info.AppName); + statement.TryBind("@AppVersion", info.AppVersion); + statement.TryBind("@DeviceName", info.DeviceName); + statement.TryBind("@UserId", info.UserId); + statement.TryBind("@IsActive", info.IsActive); + statement.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue()); if (info.DateRevoked.HasValue) { - statement.BindParameters.TryBind("@DateRevoked", info.DateRevoked.Value.ToDateTimeParamValue()); + statement.TryBind("@DateRevoked", info.DateRevoked.Value.ToDateTimeParamValue()); } else { - statement.BindParameters.TryBindNull("@DateRevoked"); + statement.TryBindNull("@DateRevoked"); } statement.MoveNext(); @@ -104,22 +104,22 @@ namespace Emby.Server.Implementations.Security { if (!string.IsNullOrWhiteSpace(query.AccessToken)) { - statement.BindParameters.TryBind("@AccessToken", query.AccessToken); + statement.TryBind("@AccessToken", query.AccessToken); } if (!string.IsNullOrWhiteSpace(query.UserId)) { - statement.BindParameters.TryBind("@UserId", query.UserId); + statement.TryBind("@UserId", query.UserId); } if (!string.IsNullOrWhiteSpace(query.DeviceId)) { - statement.BindParameters.TryBind("@DeviceId", query.DeviceId); + statement.TryBind("@DeviceId", query.DeviceId); } if (query.IsActive.HasValue) { - statement.BindParameters.TryBind("@IsActive", query.IsActive.Value); + statement.TryBind("@IsActive", query.IsActive.Value); } } diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index bbd23831c..6fb918f15 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -515,7 +515,7 @@ namespace Emby.Server.Implementations.Sync { if (!string.IsNullOrWhiteSpace(query.TargetId)) { - statement.BindParameters.TryBind("@TargetId", query.TargetId); + statement.TryBind("@TargetId", query.TargetId); } foreach (var row in statement.ExecuteQuery()) @@ -535,7 +535,7 @@ namespace Emby.Server.Implementations.Sync { if (!string.IsNullOrWhiteSpace(query.TargetId)) { - statement.BindParameters.TryBind("@TargetId", query.TargetId); + statement.TryBind("@TargetId", query.TargetId); } foreach (var row in statement.ExecuteQuery()) -- cgit v1.2.3 From 184f3bc50a5fb9405a2bf713821dbc8393306f69 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Nov 2016 04:46:07 -0500 Subject: update db init --- Emby.Server.Core/ApplicationHost.cs | 8 +- Emby.Server.Core/Data/BaseSqliteRepository.cs | 114 - Emby.Server.Core/Data/DataExtensions.cs | 186 - Emby.Server.Core/Data/IDbConnector.cs | 10 - Emby.Server.Core/Data/MediaStreamColumns.cs | 408 - Emby.Server.Core/Data/SqliteItemRepository.cs | 5287 --------- Emby.Server.Core/Data/SqliteUserDataRepository.cs | 453 - .../Data/CleanDatabaseScheduledTask.cs | 4 +- .../Data/SqliteExtensions.cs | 59 +- .../Data/SqliteItemRepository.cs | 10615 ++++++++++--------- .../Data/SqliteUserDataRepository.cs | 715 +- .../Persistence/IItemRepository.cs | 2 +- .../MediaBrowser.Server.Mono.csproj | 7 - MediaBrowser.Server.Mono/MonoAppHost.cs | 7 - MediaBrowser.Server.Mono/Native/DbConnector.cs | 22 - .../MediaBrowser.ServerApplication.csproj | 8 - .../Native/DbConnector.cs | 22 - MediaBrowser.ServerApplication/WindowsAppHost.cs | 6 - 18 files changed, 5747 insertions(+), 12186 deletions(-) delete mode 100644 Emby.Server.Core/Data/BaseSqliteRepository.cs delete mode 100644 Emby.Server.Core/Data/DataExtensions.cs delete mode 100644 Emby.Server.Core/Data/IDbConnector.cs delete mode 100644 Emby.Server.Core/Data/MediaStreamColumns.cs delete mode 100644 Emby.Server.Core/Data/SqliteItemRepository.cs delete mode 100644 Emby.Server.Core/Data/SqliteUserDataRepository.cs delete mode 100644 MediaBrowser.Server.Mono/Native/DbConnector.cs delete mode 100644 MediaBrowser.ServerApplication/Native/DbConnector.cs (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 6b3ca940b..ba0d830d3 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -84,7 +84,6 @@ using Emby.Dlna.Ssdp; using Emby.Server.Core; using Emby.Server.Implementations.Activity; using Emby.Server.Core.Configuration; -using Emby.Server.Core.Data; using Emby.Server.Implementations.Devices; using Emby.Server.Implementations.FFMpeg; using Emby.Server.Core.IO; @@ -550,7 +549,7 @@ namespace Emby.Server.Core DisplayPreferencesRepository = displayPreferencesRepo; RegisterSingleInstance(DisplayPreferencesRepository); - var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager, GetDbConnector(), MemoryStreamFactory, assemblyInfo); + var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager); ItemRepository = itemRepo; RegisterSingleInstance(ItemRepository); @@ -693,10 +692,10 @@ namespace Emby.Server.Core displayPreferencesRepo.Initialize(); - var userDataRepo = new SqliteUserDataRepository(LogManager, ApplicationPaths, GetDbConnector()); + var userDataRepo = new SqliteUserDataRepository(LogManager.GetLogger("SqliteUserDataRepository"), ApplicationPaths); ((UserDataManager)UserDataManager).Repository = userDataRepo; - await itemRepo.Initialize(userDataRepo).ConfigureAwait(false); + itemRepo.Initialize(userDataRepo); ((LibraryManager)LibraryManager).ItemRepository = ItemRepository; ConfigureNotificationsRepository(); progress.Report(100); @@ -1444,7 +1443,6 @@ namespace Emby.Server.Core } protected abstract void AuthorizeServer(); - protected abstract IDbConnector GetDbConnector(); public event EventHandler HasUpdateAvailableChanged; diff --git a/Emby.Server.Core/Data/BaseSqliteRepository.cs b/Emby.Server.Core/Data/BaseSqliteRepository.cs deleted file mode 100644 index 8d3cbe10a..000000000 --- a/Emby.Server.Core/Data/BaseSqliteRepository.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Data; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Model.Logging; - -namespace Emby.Server.Core.Data -{ - public abstract class BaseSqliteRepository : IDisposable - { - protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1); - protected readonly IDbConnector DbConnector; - protected ILogger Logger; - - protected string DbFilePath { get; set; } - - protected BaseSqliteRepository(ILogManager logManager, IDbConnector dbConnector) - { - DbConnector = dbConnector; - Logger = logManager.GetLogger(GetType().Name); - } - - protected virtual bool EnableConnectionPooling - { - get { return true; } - } - - protected virtual async Task CreateConnection(bool isReadOnly = false) - { - var connection = await DbConnector.Connect(DbFilePath, false, true).ConfigureAwait(false); - - connection.RunQueries(new[] - { - "pragma temp_store = memory" - - }, Logger); - - return connection; - } - - private bool _disposed; - protected void CheckDisposed() - { - if (_disposed) - { - throw new ObjectDisposedException(GetType().Name + " has been disposed and cannot be accessed."); - } - } - - public void Dispose() - { - _disposed = true; - Dispose(true); - GC.SuppressFinalize(this); - } - - protected async Task Vacuum(IDbConnection connection) - { - CheckDisposed(); - - await WriteLock.WaitAsync().ConfigureAwait(false); - - try - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "vacuum"; - cmd.ExecuteNonQuery(); - } - } - catch (Exception e) - { - Logger.ErrorException("Failed to vacuum:", e); - - throw; - } - finally - { - WriteLock.Release(); - } - } - - private readonly object _disposeLock = new object(); - - /// - /// Releases unmanaged and - optionally - managed resources. - /// - /// true to release both managed and unmanaged resources; false to release only unmanaged resources. - 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() - { - - } - } -} \ No newline at end of file diff --git a/Emby.Server.Core/Data/DataExtensions.cs b/Emby.Server.Core/Data/DataExtensions.cs deleted file mode 100644 index 20766619e..000000000 --- a/Emby.Server.Core/Data/DataExtensions.cs +++ /dev/null @@ -1,186 +0,0 @@ -using System; -using System.Data; -using System.IO; -using System.Text; -using MediaBrowser.Model.IO; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Serialization; - -namespace Emby.Server.Core.Data -{ - public static class DataExtensions - { - /// - /// Determines whether the specified conn is open. - /// - /// The conn. - /// true if the specified conn is open; otherwise, false. - public static bool IsOpen(this IDbConnection conn) - { - return conn.State == ConnectionState.Open; - } - - public static IDataParameter GetParameter(this IDbCommand cmd, int index) - { - return (IDataParameter)cmd.Parameters[index]; - } - - public static IDataParameter GetParameter(this IDbCommand cmd, string name) - { - return (IDataParameter)cmd.Parameters[name]; - } - - public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name, DbType type) - { - var param = cmd.CreateParameter(); - - param.ParameterName = name; - param.DbType = type; - - paramCollection.Add(param); - - return param; - } - - public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name) - { - var param = cmd.CreateParameter(); - - param.ParameterName = name; - - paramCollection.Add(param); - - return param; - } - - - /// - /// Gets a stream from a DataReader at a given ordinal - /// - /// Stream. - /// reader - public static Stream GetMemoryStream(this IDataReader reader, int ordinal, IMemoryStreamFactory streamProvider) - { - if (reader == null) - { - throw new ArgumentNullException("reader"); - } - - var memoryStream = streamProvider.CreateNew(); - var num = 0L; - var array = new byte[4096]; - long bytes; - do - { - bytes = reader.GetBytes(ordinal, num, array, 0, array.Length); - memoryStream.Write(array, 0, (int)bytes); - num += bytes; - } - while (bytes > 0L); - memoryStream.Position = 0; - return memoryStream; - } - - /// - /// Runs the queries. - /// - /// The connection. - /// The queries. - /// The logger. - /// true if XXXX, false otherwise - /// queries - public static void RunQueries(this IDbConnection connection, string[] queries, ILogger logger) - { - if (queries == null) - { - throw new ArgumentNullException("queries"); - } - - using (var tran = connection.BeginTransaction()) - { - try - { - using (var cmd = connection.CreateCommand()) - { - foreach (var query in queries) - { - cmd.Transaction = tran; - cmd.CommandText = query; - cmd.ExecuteNonQuery(); - } - } - - tran.Commit(); - } - catch (Exception e) - { - logger.ErrorException("Error running queries", e); - tran.Rollback(); - throw; - } - } - } - - public static void Attach(IDbConnection db, string path, string alias) - { - using (var cmd = db.CreateCommand()) - { - cmd.CommandText = string.Format("attach @dbPath as {0};", alias); - cmd.Parameters.Add(cmd, "@dbPath", DbType.String); - cmd.GetParameter(0).Value = path; - - cmd.ExecuteNonQuery(); - } - } - - /// - /// Serializes to bytes. - /// - /// System.Byte[][]. - /// obj - public static byte[] SerializeToBytes(this IJsonSerializer json, object obj, IMemoryStreamFactory streamProvider) - { - if (obj == null) - { - throw new ArgumentNullException("obj"); - } - - using (var stream = streamProvider.CreateNew()) - { - json.SerializeToStream(obj, stream); - return stream.ToArray(); - } - } - - public static void AddColumn(this IDbConnection connection, ILogger logger, string table, string columnName, string type) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(" + table + ")"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table " + table); - builder.AppendLine("add column " + columnName + " " + type + " NULL"); - - connection.RunQueries(new[] { builder.ToString() }, logger); - } - } -} \ No newline at end of file diff --git a/Emby.Server.Core/Data/IDbConnector.cs b/Emby.Server.Core/Data/IDbConnector.cs deleted file mode 100644 index ca6c13dae..000000000 --- a/Emby.Server.Core/Data/IDbConnector.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Data; -using System.Threading.Tasks; - -namespace Emby.Server.Core.Data -{ - public interface IDbConnector - { - Task Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null); - } -} diff --git a/Emby.Server.Core/Data/MediaStreamColumns.cs b/Emby.Server.Core/Data/MediaStreamColumns.cs deleted file mode 100644 index cb46a5602..000000000 --- a/Emby.Server.Core/Data/MediaStreamColumns.cs +++ /dev/null @@ -1,408 +0,0 @@ -using System; -using System.Data; -using System.Text; -using MediaBrowser.Model.Logging; - -namespace Emby.Server.Core.Data -{ - public class MediaStreamColumns - { - private readonly IDbConnection _connection; - private readonly ILogger _logger; - - public MediaStreamColumns(IDbConnection connection, ILogger logger) - { - _connection = connection; - _logger = logger; - } - - public void AddColumns() - { - AddPixelFormatColumnCommand(); - AddBitDepthCommand(); - AddIsAnamorphicColumn(); - AddKeyFramesColumn(); - AddRefFramesCommand(); - AddCodecTagColumn(); - AddCommentColumn(); - AddNalColumn(); - AddIsAvcColumn(); - AddTitleColumn(); - AddTimeBaseColumn(); - AddCodecTimeBaseColumn(); - } - - private void AddIsAvcColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "IsAvc", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column IsAvc BIT NULL"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddTimeBaseColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "TimeBase", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column TimeBase TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddCodecTimeBaseColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "CodecTimeBase", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column CodecTimeBase TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddTitleColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "Title", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column Title TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddNalColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "NalLengthSize", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column NalLengthSize TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddCommentColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "Comment", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column Comment TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddCodecTagColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "CodecTag", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column CodecTag TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddPixelFormatColumnCommand() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "PixelFormat", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column PixelFormat TEXT"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddBitDepthCommand() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "BitDepth", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column BitDepth INT NULL"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddRefFramesCommand() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "RefFrames", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column RefFrames INT NULL"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddKeyFramesColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "KeyFrames", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column KeyFrames TEXT NULL"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - private void AddIsAnamorphicColumn() - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "PRAGMA table_info(mediastreams)"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - if (!reader.IsDBNull(1)) - { - var name = reader.GetString(1); - - if (string.Equals(name, "IsAnamorphic", StringComparison.OrdinalIgnoreCase)) - { - return; - } - } - } - } - } - - var builder = new StringBuilder(); - - builder.AppendLine("alter table mediastreams"); - builder.AppendLine("add column IsAnamorphic BIT NULL"); - - _connection.RunQueries(new[] { builder.ToString() }, _logger); - } - - } -} diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs deleted file mode 100644 index 97d703602..000000000 --- a/Emby.Server.Core/Data/SqliteItemRepository.cs +++ /dev/null @@ -1,5287 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Controller.Channels; -using MediaBrowser.Controller.Collections; -using MediaBrowser.Controller.Configuration; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Entities.Movies; -using MediaBrowser.Controller.Entities.TV; -using MediaBrowser.Controller.Extensions; -using MediaBrowser.Controller.LiveTv; -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Controller.Playlists; -using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.IO; -using MediaBrowser.Model.LiveTv; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Querying; -using MediaBrowser.Model.Serialization; -using MediaBrowser.Server.Implementations.Devices; -using MediaBrowser.Server.Implementations.Playlists; -using Emby.Server.Implementations.Data; -using MediaBrowser.Model.Reflection; - -namespace Emby.Server.Core.Data -{ - /// - /// Class SQLiteItemRepository - /// - public class SqliteItemRepository : BaseSqliteRepository, IItemRepository - { - private IDbConnection _connection; - - private readonly TypeMapper _typeMapper; - - /// - /// Gets the name of the repository - /// - /// The name. - public string Name - { - get - { - return "SQLite"; - } - } - - /// - /// Gets the json serializer. - /// - /// The json serializer. - private readonly IJsonSerializer _jsonSerializer; - - /// - /// The _app paths - /// - private readonly IServerConfigurationManager _config; - - /// - /// The _save item command - /// - private IDbCommand _saveItemCommand; - - private readonly string _criticReviewsPath; - - private IDbCommand _deleteItemCommand; - - private IDbCommand _deletePeopleCommand; - private IDbCommand _savePersonCommand; - - private IDbCommand _deleteChaptersCommand; - private IDbCommand _saveChapterCommand; - - private IDbCommand _deleteStreamsCommand; - private IDbCommand _saveStreamCommand; - - private IDbCommand _deleteAncestorsCommand; - private IDbCommand _saveAncestorCommand; - - private IDbCommand _deleteItemValuesCommand; - private IDbCommand _saveItemValuesCommand; - - private IDbCommand _updateInheritedTagsCommand; - - public const int LatestSchemaVersion = 109; - private readonly IMemoryStreamFactory _memoryStreamProvider; - - /// - /// Initializes a new instance of the class. - /// - public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo) - : base(logManager, connector) - { - if (config == null) - { - throw new ArgumentNullException("config"); - } - if (jsonSerializer == null) - { - throw new ArgumentNullException("jsonSerializer"); - } - - _config = config; - _jsonSerializer = jsonSerializer; - _memoryStreamProvider = memoryStreamProvider; - _typeMapper = new TypeMapper(assemblyInfo); - - _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews"); - DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db"); - } - - private const string ChaptersTableName = "Chapters2"; - - protected override async Task CreateConnection(bool isReadOnly = false) - { - var cacheSize = _config.Configuration.SqliteCacheSize; - if (cacheSize <= 0) - { - cacheSize = Math.Min(Environment.ProcessorCount * 50000, 100000); - } - - var connection = await DbConnector.Connect(DbFilePath, false, false, 0 - cacheSize).ConfigureAwait(false); - - connection.RunQueries(new[] - { - "pragma temp_store = memory", - "pragma default_temp_store = memory", - "PRAGMA locking_mode=EXCLUSIVE" - - }, Logger); - - return connection; - } - - /// - /// Opens the connection to the database - /// - /// Task. - public async Task Initialize(SqliteUserDataRepository userDataRepo) - { - _connection = await CreateConnection(false).ConfigureAwait(false); - - var createMediaStreamsTableCommand - = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; - - string[] queries = { - - "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)", - - "create table if not exists AncestorIds (ItemId GUID, AncestorId GUID, AncestorIdText TEXT, PRIMARY KEY (ItemId, AncestorId))", - "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)", - "create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)", - - "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)", - - "create table if not exists People (ItemId GUID, Name TEXT NOT NULL, Role TEXT, PersonType TEXT, SortOrder int, ListOrder int)", - - "drop index if exists idxPeopleItemId", - "create index if not exists idxPeopleItemId1 on People(ItemId,ListOrder)", - "create index if not exists idxPeopleName on People(Name)", - - "create table if not exists "+ChaptersTableName+" (ItemId GUID, ChapterIndex INT, StartPositionTicks BIGINT, Name TEXT, ImagePath TEXT, PRIMARY KEY (ItemId, ChapterIndex))", - - createMediaStreamsTableCommand, - - "create index if not exists idx_mediastreams1 on mediastreams(ItemId)" - - }; - - _connection.RunQueries(queries, Logger); - - _connection.AddColumn(Logger, "AncestorIds", "AncestorIdText", "Text"); - - _connection.AddColumn(Logger, "TypedBaseItems", "Path", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "StartDate", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "EndDate", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "ChannelId", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsMovie", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsSports", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsKids", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "CommunityRating", "Float"); - _connection.AddColumn(Logger, "TypedBaseItems", "CustomRating", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IndexNumber", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsLocked", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "Name", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "OfficialRating", "Text"); - - _connection.AddColumn(Logger, "TypedBaseItems", "MediaType", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Overview", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ParentIndexNumber", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "PremiereDate", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "ProductionYear", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "ParentId", "GUID"); - _connection.AddColumn(Logger, "TypedBaseItems", "Genres", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "SchemaVersion", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "SortName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "RunTimeTicks", "BIGINT"); - - _connection.AddColumn(Logger, "TypedBaseItems", "OfficialRatingDescription", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "HomePageUrl", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "VoteCount", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "DisplayMediaType", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "DateCreated", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "DateModified", "DATETIME"); - - _connection.AddColumn(Logger, "TypedBaseItems", "ForcedSortName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsOffline", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "LocationType", "Text"); - - _connection.AddColumn(Logger, "TypedBaseItems", "IsSeries", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsLive", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsNews", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsPremiere", "BIT"); - - _connection.AddColumn(Logger, "TypedBaseItems", "EpisodeTitle", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsRepeat", "BIT"); - - _connection.AddColumn(Logger, "TypedBaseItems", "PreferredMetadataLanguage", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "PreferredMetadataCountryCode", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsHD", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "ExternalEtag", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "DateLastRefreshed", "DATETIME"); - - _connection.AddColumn(Logger, "TypedBaseItems", "DateLastSaved", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsInMixedFolder", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "LockedFields", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Studios", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Audio", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ExternalServiceId", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Tags", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsFolder", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "InheritedParentalRatingValue", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "UnratedType", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "TopParentId", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsItemByName", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "SourceType", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "TrailerTypes", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "CriticRating", "Float"); - _connection.AddColumn(Logger, "TypedBaseItems", "CriticRatingSummary", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "InheritedTags", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "CleanName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "PresentationUniqueKey", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "SlugName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "OriginalTitle", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "PrimaryVersionId", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "DateLastMediaAdded", "DATETIME"); - _connection.AddColumn(Logger, "TypedBaseItems", "Album", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "IsVirtualItem", "BIT"); - _connection.AddColumn(Logger, "TypedBaseItems", "SeriesName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "UserDataKey", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "SeasonName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "SeasonId", "GUID"); - _connection.AddColumn(Logger, "TypedBaseItems", "SeriesId", "GUID"); - _connection.AddColumn(Logger, "TypedBaseItems", "SeriesSortName", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ExternalSeriesId", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ShortOverview", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Tagline", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Keywords", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ProviderIds", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Images", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ProductionLocations", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ThemeSongIds", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ThemeVideoIds", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "TotalBitrate", "INT"); - _connection.AddColumn(Logger, "TypedBaseItems", "ExtraType", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "Artists", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "AlbumArtists", "Text"); - _connection.AddColumn(Logger, "TypedBaseItems", "ExternalId", "Text"); - - _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text"); - - _connection.AddColumn(Logger, ChaptersTableName, "ImageDateModified", "DATETIME"); - - string[] postQueries = - - { - // obsolete - "drop index if exists idx_TypedBaseItems", - "drop index if exists idx_mediastreams", - "drop index if exists idx_"+ChaptersTableName, - "drop index if exists idx_UserDataKeys1", - "drop index if exists idx_UserDataKeys2", - "drop index if exists idx_TypeTopParentId3", - "drop index if exists idx_TypeTopParentId2", - "drop index if exists idx_TypeTopParentId4", - "drop index if exists idx_Type", - "drop index if exists idx_TypeTopParentId", - "drop index if exists idx_GuidType", - "drop index if exists idx_TopParentId", - "drop index if exists idx_TypeTopParentId6", - "drop index if exists idx_ItemValues2", - "drop index if exists Idx_ProviderIds", - "drop index if exists idx_ItemValues3", - "drop index if exists idx_ItemValues4", - "drop index if exists idx_ItemValues5", - "drop index if exists idx_UserDataKeys3", - "drop table if exists UserDataKeys", - "drop table if exists ProviderIds", - "drop index if exists Idx_ProviderIds1", - "drop table if exists Images", - "drop index if exists idx_Images", - - "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", - "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", - - "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)", - "create index if not exists idx_GuidTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,Type,IsFolder,IsVirtualItem)", - //"create index if not exists idx_GuidMediaTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,MediaType,IsFolder,IsVirtualItem)", - "create index if not exists idx_CleanNameType on TypedBaseItems(CleanName,Type)", - - // covering index - "create index if not exists idx_TopParentIdGuid on TypedBaseItems(TopParentId,Guid)", - - // live tv programs - "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)", - - // covering index for getitemvalues - "create index if not exists idx_TypeTopParentIdGuid on TypedBaseItems(Type,TopParentId,Guid)", - - // used by movie suggestions - "create index if not exists idx_TypeTopParentIdGroup on TypedBaseItems(Type,TopParentId,PresentationUniqueKey)", - "create index if not exists idx_TypeTopParentId5 on TypedBaseItems(TopParentId,IsVirtualItem)", - - // latest items - "create index if not exists idx_TypeTopParentId9 on TypedBaseItems(TopParentId,Type,IsVirtualItem,PresentationUniqueKey,DateCreated)", - "create index if not exists idx_TypeTopParentId8 on TypedBaseItems(TopParentId,IsFolder,IsVirtualItem,PresentationUniqueKey,DateCreated)", - - // resume - "create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)", - - // items by name - "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)", - "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)" - }; - - _connection.RunQueries(postQueries, Logger); - - PrepareStatements(); - - new MediaStreamColumns(_connection, Logger).AddColumns(); - - DataExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); - await userDataRepo.Initialize(_connection, WriteLock).ConfigureAwait(false); - //await Vacuum(_connection).ConfigureAwait(false); - } - - private readonly string[] _retriveItemColumns = - { - "type", - "data", - "StartDate", - "EndDate", - "IsOffline", - "ChannelId", - "IsMovie", - "IsSports", - "IsKids", - "IsSeries", - "IsLive", - "IsNews", - "IsPremiere", - "EpisodeTitle", - "IsRepeat", - "CommunityRating", - "CustomRating", - "IndexNumber", - "IsLocked", - "PreferredMetadataLanguage", - "PreferredMetadataCountryCode", - "IsHD", - "ExternalEtag", - "DateLastRefreshed", - "Name", - "Path", - "PremiereDate", - "Overview", - "ParentIndexNumber", - "ProductionYear", - "OfficialRating", - "OfficialRatingDescription", - "HomePageUrl", - "DisplayMediaType", - "ForcedSortName", - "RunTimeTicks", - "VoteCount", - "DateCreated", - "DateModified", - "guid", - "Genres", - "ParentId", - "Audio", - "ExternalServiceId", - "IsInMixedFolder", - "DateLastSaved", - "LockedFields", - "Studios", - "Tags", - "SourceType", - "TrailerTypes", - "OriginalTitle", - "PrimaryVersionId", - "DateLastMediaAdded", - "Album", - "CriticRating", - "CriticRatingSummary", - "IsVirtualItem", - "SeriesName", - "SeasonName", - "SeasonId", - "SeriesId", - "SeriesSortName", - "PresentationUniqueKey", - "InheritedParentalRatingValue", - "InheritedTags", - "ExternalSeriesId", - "ShortOverview", - "Tagline", - "Keywords", - "ProviderIds", - "Images", - "ProductionLocations", - "ThemeSongIds", - "ThemeVideoIds", - "TotalBitrate", - "ExtraType", - "Artists", - "AlbumArtists", - "ExternalId" - }; - - private readonly string[] _mediaStreamSaveColumns = - { - "ItemId", - "StreamIndex", - "StreamType", - "Codec", - "Language", - "ChannelLayout", - "Profile", - "AspectRatio", - "Path", - "IsInterlaced", - "BitRate", - "Channels", - "SampleRate", - "IsDefault", - "IsForced", - "IsExternal", - "Height", - "Width", - "AverageFrameRate", - "RealFrameRate", - "Level", - "PixelFormat", - "BitDepth", - "IsAnamorphic", - "RefFrames", - "CodecTag", - "Comment", - "NalLengthSize", - "IsAvc", - "Title", - "TimeBase", - "CodecTimeBase" - }; - - /// - /// Prepares the statements. - /// - private void PrepareStatements() - { - var saveColumns = new List - { - "guid", - "type", - "data", - "Path", - "StartDate", - "EndDate", - "ChannelId", - "IsKids", - "IsMovie", - "IsSports", - "IsSeries", - "IsLive", - "IsNews", - "IsPremiere", - "EpisodeTitle", - "IsRepeat", - "CommunityRating", - "CustomRating", - "IndexNumber", - "IsLocked", - "Name", - "OfficialRating", - "MediaType", - "Overview", - "ParentIndexNumber", - "PremiereDate", - "ProductionYear", - "ParentId", - "Genres", - "InheritedParentalRatingValue", - "SchemaVersion", - "SortName", - "RunTimeTicks", - "OfficialRatingDescription", - "HomePageUrl", - "VoteCount", - "DisplayMediaType", - "DateCreated", - "DateModified", - "ForcedSortName", - "IsOffline", - "LocationType", - "PreferredMetadataLanguage", - "PreferredMetadataCountryCode", - "IsHD", - "ExternalEtag", - "DateLastRefreshed", - "DateLastSaved", - "IsInMixedFolder", - "LockedFields", - "Studios", - "Audio", - "ExternalServiceId", - "Tags", - "IsFolder", - "UnratedType", - "TopParentId", - "IsItemByName", - "SourceType", - "TrailerTypes", - "CriticRating", - "CriticRatingSummary", - "InheritedTags", - "CleanName", - "PresentationUniqueKey", - "SlugName", - "OriginalTitle", - "PrimaryVersionId", - "DateLastMediaAdded", - "Album", - "IsVirtualItem", - "SeriesName", - "UserDataKey", - "SeasonName", - "SeasonId", - "SeriesId", - "SeriesSortName", - "ExternalSeriesId", - "ShortOverview", - "Tagline", - "Keywords", - "ProviderIds", - "Images", - "ProductionLocations", - "ThemeSongIds", - "ThemeVideoIds", - "TotalBitrate", - "ExtraType", - "Artists", - "AlbumArtists", - "ExternalId" - }; - _saveItemCommand = _connection.CreateCommand(); - _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values ("; - - for (var i = 1; i <= saveColumns.Count; i++) - { - if (i > 1) - { - _saveItemCommand.CommandText += ","; - } - _saveItemCommand.CommandText += "@" + i.ToString(CultureInfo.InvariantCulture); - - _saveItemCommand.Parameters.Add(_saveItemCommand, "@" + i.ToString(CultureInfo.InvariantCulture)); - } - _saveItemCommand.CommandText += ")"; - - _deleteItemCommand = _connection.CreateCommand(); - _deleteItemCommand.CommandText = "delete from TypedBaseItems where guid=@Id"; - _deleteItemCommand.Parameters.Add(_deleteItemCommand, "@Id"); - - // People - _deletePeopleCommand = _connection.CreateCommand(); - _deletePeopleCommand.CommandText = "delete from People where ItemId=@Id"; - _deletePeopleCommand.Parameters.Add(_deletePeopleCommand, "@Id"); - - _savePersonCommand = _connection.CreateCommand(); - _savePersonCommand.CommandText = "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)"; - _savePersonCommand.Parameters.Add(_savePersonCommand, "@ItemId"); - _savePersonCommand.Parameters.Add(_savePersonCommand, "@Name"); - _savePersonCommand.Parameters.Add(_savePersonCommand, "@Role"); - _savePersonCommand.Parameters.Add(_savePersonCommand, "@PersonType"); - _savePersonCommand.Parameters.Add(_savePersonCommand, "@SortOrder"); - _savePersonCommand.Parameters.Add(_savePersonCommand, "@ListOrder"); - - // Ancestors - _deleteAncestorsCommand = _connection.CreateCommand(); - _deleteAncestorsCommand.CommandText = "delete from AncestorIds where ItemId=@Id"; - _deleteAncestorsCommand.Parameters.Add(_deleteAncestorsCommand, "@Id"); - - _saveAncestorCommand = _connection.CreateCommand(); - _saveAncestorCommand.CommandText = "insert into AncestorIds (ItemId, AncestorId, AncestorIdText) values (@ItemId, @AncestorId, @AncestorIdText)"; - _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@ItemId"); - _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@AncestorId"); - _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@AncestorIdText"); - - // Chapters - _deleteChaptersCommand = _connection.CreateCommand(); - _deleteChaptersCommand.CommandText = "delete from " + ChaptersTableName + " where ItemId=@ItemId"; - _deleteChaptersCommand.Parameters.Add(_deleteChaptersCommand, "@ItemId"); - - _saveChapterCommand = _connection.CreateCommand(); - _saveChapterCommand.CommandText = "replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath)"; - - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ItemId"); - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ChapterIndex"); - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@StartPositionTicks"); - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@Name"); - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImagePath"); - _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImageDateModified"); - - // MediaStreams - _deleteStreamsCommand = _connection.CreateCommand(); - _deleteStreamsCommand.CommandText = "delete from mediastreams where ItemId=@ItemId"; - _deleteStreamsCommand.Parameters.Add(_deleteStreamsCommand, "@ItemId"); - - _saveStreamCommand = _connection.CreateCommand(); - - _saveStreamCommand.CommandText = string.Format("replace into mediastreams ({0}) values ({1})", - string.Join(",", _mediaStreamSaveColumns), - string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())); - - foreach (var col in _mediaStreamSaveColumns) - { - _saveStreamCommand.Parameters.Add(_saveStreamCommand, "@" + col); - } - - _updateInheritedTagsCommand = _connection.CreateCommand(); - _updateInheritedTagsCommand.CommandText = "Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"; - _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@Guid"); - _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@InheritedTags"); - - // item values - _deleteItemValuesCommand = _connection.CreateCommand(); - _deleteItemValuesCommand.CommandText = "delete from ItemValues where ItemId=@Id"; - _deleteItemValuesCommand.Parameters.Add(_deleteItemValuesCommand, "@Id"); - - _saveItemValuesCommand = _connection.CreateCommand(); - _saveItemValuesCommand.CommandText = "insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)"; - _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@ItemId"); - _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Type"); - _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Value"); - _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@CleanValue"); - } - - /// - /// Save a standard item in the repo - /// - /// The item. - /// The cancellation token. - /// Task. - /// item - public Task SaveItem(BaseItem item, CancellationToken cancellationToken) - { - if (item == null) - { - throw new ArgumentNullException("item"); - } - - return SaveItems(new List { item }, cancellationToken); - } - - /// - /// Saves the items. - /// - /// The items. - /// The cancellation token. - /// Task. - /// - /// items - /// or - /// cancellationToken - /// - public async Task SaveItems(List items, CancellationToken cancellationToken) - { - if (items == null) - { - throw new ArgumentNullException("items"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - CheckDisposed(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - foreach (var item in items) - { - cancellationToken.ThrowIfCancellationRequested(); - - var index = 0; - - _saveItemCommand.GetParameter(index++).Value = item.Id; - _saveItemCommand.GetParameter(index++).Value = item.GetType().FullName; - - if (TypeRequiresDeserialization(item.GetType())) - { - _saveItemCommand.GetParameter(index++).Value = _jsonSerializer.SerializeToBytes(item, _memoryStreamProvider); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.Path; - - var hasStartDate = item as IHasStartDate; - if (hasStartDate != null) - { - _saveItemCommand.GetParameter(index++).Value = hasStartDate.StartDate; - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.EndDate; - _saveItemCommand.GetParameter(index++).Value = item.ChannelId; - - var hasProgramAttributes = item as IHasProgramAttributes; - if (hasProgramAttributes != null) - { - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsKids; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsMovie; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsSports; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsSeries; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsLive; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsNews; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsPremiere; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.EpisodeTitle; - _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsRepeat; - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.CommunityRating; - _saveItemCommand.GetParameter(index++).Value = item.CustomRating; - - _saveItemCommand.GetParameter(index++).Value = item.IndexNumber; - _saveItemCommand.GetParameter(index++).Value = item.IsLocked; - - _saveItemCommand.GetParameter(index++).Value = item.Name; - _saveItemCommand.GetParameter(index++).Value = item.OfficialRating; - - _saveItemCommand.GetParameter(index++).Value = item.MediaType; - _saveItemCommand.GetParameter(index++).Value = item.Overview; - _saveItemCommand.GetParameter(index++).Value = item.ParentIndexNumber; - _saveItemCommand.GetParameter(index++).Value = item.PremiereDate; - _saveItemCommand.GetParameter(index++).Value = item.ProductionYear; - - if (item.ParentId == Guid.Empty) - { - _saveItemCommand.GetParameter(index++).Value = null; - } - else - { - _saveItemCommand.GetParameter(index++).Value = item.ParentId; - } - - if (item.Genres.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Genres.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.GetInheritedParentalRatingValue() ?? 0; - - _saveItemCommand.GetParameter(index++).Value = LatestSchemaVersion; - _saveItemCommand.GetParameter(index++).Value = item.SortName; - _saveItemCommand.GetParameter(index++).Value = item.RunTimeTicks; - - _saveItemCommand.GetParameter(index++).Value = item.OfficialRatingDescription; - _saveItemCommand.GetParameter(index++).Value = item.HomePageUrl; - _saveItemCommand.GetParameter(index++).Value = item.VoteCount; - _saveItemCommand.GetParameter(index++).Value = item.DisplayMediaType; - _saveItemCommand.GetParameter(index++).Value = item.DateCreated; - _saveItemCommand.GetParameter(index++).Value = item.DateModified; - - _saveItemCommand.GetParameter(index++).Value = item.ForcedSortName; - _saveItemCommand.GetParameter(index++).Value = item.IsOffline; - _saveItemCommand.GetParameter(index++).Value = item.LocationType.ToString(); - - _saveItemCommand.GetParameter(index++).Value = item.PreferredMetadataLanguage; - _saveItemCommand.GetParameter(index++).Value = item.PreferredMetadataCountryCode; - _saveItemCommand.GetParameter(index++).Value = item.IsHD; - _saveItemCommand.GetParameter(index++).Value = item.ExternalEtag; - - if (item.DateLastRefreshed == default(DateTime)) - { - _saveItemCommand.GetParameter(index++).Value = null; - } - else - { - _saveItemCommand.GetParameter(index++).Value = item.DateLastRefreshed; - } - - if (item.DateLastSaved == default(DateTime)) - { - _saveItemCommand.GetParameter(index++).Value = null; - } - else - { - _saveItemCommand.GetParameter(index++).Value = item.DateLastSaved; - } - - _saveItemCommand.GetParameter(index++).Value = item.IsInMixedFolder; - if (item.LockedFields.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.LockedFields.Select(i => i.ToString()).ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (item.Studios.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Studios.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (item.Audio.HasValue) - { - _saveItemCommand.GetParameter(index++).Value = item.Audio.Value.ToString(); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.ServiceName; - - if (item.Tags.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Tags.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.IsFolder; - - _saveItemCommand.GetParameter(index++).Value = item.GetBlockUnratedType().ToString(); - - var topParent = item.GetTopParent(); - if (topParent != null) - { - //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id); - _saveItemCommand.GetParameter(index++).Value = topParent.Id.ToString("N"); - } - else - { - //Logger.Debug("Item {0} has null top parent", item.Id); - _saveItemCommand.GetParameter(index++).Value = null; - } - - var isByName = false; - var byName = item as IItemByName; - if (byName != null) - { - var dualAccess = item as IHasDualAccess; - isByName = dualAccess == null || dualAccess.IsAccessedByName; - } - _saveItemCommand.GetParameter(index++).Value = isByName; - - _saveItemCommand.GetParameter(index++).Value = item.SourceType.ToString(); - - var trailer = item as Trailer; - if (trailer != null && trailer.TrailerTypes.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", trailer.TrailerTypes.Select(i => i.ToString()).ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.CriticRating; - _saveItemCommand.GetParameter(index++).Value = item.CriticRatingSummary; - - var inheritedTags = item.GetInheritedTags(); - if (inheritedTags.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", inheritedTags.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (string.IsNullOrWhiteSpace(item.Name)) - { - _saveItemCommand.GetParameter(index++).Value = null; - } - else - { - _saveItemCommand.GetParameter(index++).Value = GetCleanValue(item.Name); - } - - _saveItemCommand.GetParameter(index++).Value = item.GetPresentationUniqueKey(); - _saveItemCommand.GetParameter(index++).Value = item.SlugName; - _saveItemCommand.GetParameter(index++).Value = item.OriginalTitle; - - var video = item as Video; - if (video != null) - { - _saveItemCommand.GetParameter(index++).Value = video.PrimaryVersionId; - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - var folder = item as Folder; - if (folder != null && folder.DateLastMediaAdded.HasValue) - { - _saveItemCommand.GetParameter(index++).Value = folder.DateLastMediaAdded.Value; - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.Album; - - _saveItemCommand.GetParameter(index++).Value = item.IsVirtualItem; - - var hasSeries = item as IHasSeries; - if (hasSeries != null) - { - _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesName(); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.GetUserDataKeys().FirstOrDefault(); - - var episode = item as Episode; - if (episode != null) - { - _saveItemCommand.GetParameter(index++).Value = episode.FindSeasonName(); - _saveItemCommand.GetParameter(index++).Value = episode.FindSeasonId(); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (hasSeries != null) - { - _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesId(); - _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesSortName(); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.ExternalSeriesId; - _saveItemCommand.GetParameter(index++).Value = item.ShortOverview; - _saveItemCommand.GetParameter(index++).Value = item.Tagline; - - if (item.Keywords.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Keywords.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = SerializeProviderIds(item); - _saveItemCommand.GetParameter(index++).Value = SerializeImages(item); - - if (item.ProductionLocations.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ProductionLocations.ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (item.ThemeSongIds.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ThemeSongIds.Select(i => i.ToString("N")).ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - if (item.ThemeVideoIds.Count > 0) - { - _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ThemeVideoIds.Select(i => i.ToString("N")).ToArray()); - } - else - { - _saveItemCommand.GetParameter(index++).Value = null; - } - - _saveItemCommand.GetParameter(index++).Value = item.TotalBitrate; - _saveItemCommand.GetParameter(index++).Value = item.ExtraType; - - string artists = null; - var hasArtists = item as IHasArtist; - if (hasArtists != null) - { - if (hasArtists.Artists.Count > 0) - { - artists = string.Join("|", hasArtists.Artists.ToArray()); - } - } - _saveItemCommand.GetParameter(index++).Value = artists; - - string albumArtists = null; - var hasAlbumArtists = item as IHasAlbumArtist; - if (hasAlbumArtists != null) - { - if (hasAlbumArtists.AlbumArtists.Count > 0) - { - albumArtists = string.Join("|", hasAlbumArtists.AlbumArtists.ToArray()); - } - } - _saveItemCommand.GetParameter(index++).Value = albumArtists; - - _saveItemCommand.GetParameter(index++).Value = item.ExternalId; - - //Logger.Debug(_saveItemCommand.CommandText); - - _saveItemCommand.Transaction = transaction; - - _saveItemCommand.ExecuteNonQuery(); - - if (item.SupportsAncestors) - { - UpdateAncestors(item.Id, item.GetAncestorIds().Distinct().ToList(), transaction); - } - - UpdateItemValues(item.Id, GetItemValuesToSave(item), transaction); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save items:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - private string SerializeProviderIds(BaseItem item) - { - // Ideally we shouldn't need this IsNullOrWhiteSpace check but we're seeing some cases of bad data slip through - var ids = item.ProviderIds - .Where(i => !string.IsNullOrWhiteSpace(i.Value)) - .ToList(); - - if (ids.Count == 0) - { - return null; - } - - return string.Join("|", ids.Select(i => i.Key + "=" + i.Value).ToArray()); - } - - private void DeserializeProviderIds(string value, BaseItem item) - { - if (string.IsNullOrWhiteSpace(value)) - { - return; - } - - if (item.ProviderIds.Count > 0) - { - return; - } - - var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); - - foreach (var part in parts) - { - var idParts = part.Split('='); - - if (idParts.Length == 2) - { - item.SetProviderId(idParts[0], idParts[1]); - } - } - } - - private string SerializeImages(BaseItem item) - { - var images = item.ImageInfos.ToList(); - - if (images.Count == 0) - { - return null; - } - - return string.Join("|", images.Select(ToValueString).ToArray()); - } - - private void DeserializeImages(string value, BaseItem item) - { - if (string.IsNullOrWhiteSpace(value)) - { - return; - } - - if (item.ImageInfos.Count > 0) - { - return; - } - - var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); - - foreach (var part in parts) - { - item.ImageInfos.Add(ItemImageInfoFromValueString(part)); - } - } - - public string ToValueString(ItemImageInfo image) - { - var delimeter = "*"; - - return (image.Path ?? string.Empty) + - delimeter + - image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + - delimeter + - image.Type + - delimeter + - image.IsPlaceholder; - } - - public ItemImageInfo ItemImageInfoFromValueString(string value) - { - var parts = value.Split(new[] { '*' }, StringSplitOptions.None); - - var image = new ItemImageInfo(); - - image.Path = parts[0]; - image.DateModified = new DateTime(long.Parse(parts[1], CultureInfo.InvariantCulture), DateTimeKind.Utc); - image.Type = (ImageType)Enum.Parse(typeof(ImageType), parts[2], true); - image.IsPlaceholder = string.Equals(parts[3], true.ToString(), StringComparison.OrdinalIgnoreCase); - - return image; - } - - /// - /// Internal retrieve from items or users table - /// - /// The id. - /// BaseItem. - /// id - /// - public BaseItem RetrieveItem(Guid id) - { - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - CheckDisposed(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"; - cmd.Parameters.Add(cmd, "@guid", DbType.Guid).Value = id; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return GetItem(reader); - } - } - return null; - } - } - - private BaseItem GetItem(IDataReader reader) - { - return GetItem(reader, new InternalItemsQuery()); - } - - private bool TypeRequiresDeserialization(Type type) - { - if (_config.Configuration.SkipDeserializationForBasicTypes) - { - if (type == typeof(MusicGenre)) - { - return false; - } - if (type == typeof(GameGenre)) - { - return false; - } - if (type == typeof(Genre)) - { - return false; - } - if (type == typeof(Studio)) - { - return false; - } - if (type == typeof(Year)) - { - return false; - } - if (type == typeof(Book)) - { - return false; - } - if (type == typeof(Person)) - { - return false; - } - if (type == typeof(RecordingGroup)) - { - return false; - } - if (type == typeof(Channel)) - { - return false; - } - if (type == typeof(ManualCollectionsFolder)) - { - return false; - } - if (type == typeof(CameraUploadsFolder)) - { - return false; - } - if (type == typeof(PlaylistsFolder)) - { - return false; - } - if (type == typeof(UserRootFolder)) - { - return false; - } - if (type == typeof(PhotoAlbum)) - { - return false; - } - if (type == typeof(Season)) - { - return false; - } - if (type == typeof(MusicArtist)) - { - return false; - } - } - if (_config.Configuration.SkipDeserializationForPrograms) - { - if (type == typeof(LiveTvProgram)) - { - return false; - } - } - if (_config.Configuration.SkipDeserializationForAudio) - { - if (type == typeof(Audio)) - { - return false; - } - if (type == typeof(LiveTvAudioRecording)) - { - return false; - } - if (type == typeof(AudioPodcast)) - { - return false; - } - if (type == typeof(MusicAlbum)) - { - return false; - } - } - - return true; - } - - private BaseItem GetItem(IDataReader reader, InternalItemsQuery query) - { - var typeString = reader.GetString(0); - - var type = _typeMapper.GetType(typeString); - - if (type == null) - { - //Logger.Debug("Unknown type {0}", typeString); - - return null; - } - - BaseItem item = null; - - if (TypeRequiresDeserialization(type)) - { - using (var stream = reader.GetMemoryStream(1, _memoryStreamProvider)) - { - try - { - item = _jsonSerializer.DeserializeFromStream(stream, type) as BaseItem; - } - catch (SerializationException ex) - { - Logger.ErrorException("Error deserializing item", ex); - } - } - } - - if (item == null) - { - try - { - item = Activator.CreateInstance(type) as BaseItem; - } - catch - { - } - } - - if (item == null) - { - return null; - } - - if (!reader.IsDBNull(2)) - { - var hasStartDate = item as IHasStartDate; - if (hasStartDate != null) - { - hasStartDate.StartDate = reader.GetDateTime(2).ToUniversalTime(); - } - } - - if (!reader.IsDBNull(3)) - { - item.EndDate = reader.GetDateTime(3).ToUniversalTime(); - } - - if (!reader.IsDBNull(4)) - { - item.IsOffline = reader.GetBoolean(4); - } - - if (!reader.IsDBNull(5)) - { - item.ChannelId = reader.GetString(5); - } - - var hasProgramAttributes = item as IHasProgramAttributes; - if (hasProgramAttributes != null) - { - if (!reader.IsDBNull(6)) - { - hasProgramAttributes.IsMovie = reader.GetBoolean(6); - } - - if (!reader.IsDBNull(7)) - { - hasProgramAttributes.IsSports = reader.GetBoolean(7); - } - - if (!reader.IsDBNull(8)) - { - hasProgramAttributes.IsKids = reader.GetBoolean(8); - } - - if (!reader.IsDBNull(9)) - { - hasProgramAttributes.IsSeries = reader.GetBoolean(9); - } - - if (!reader.IsDBNull(10)) - { - hasProgramAttributes.IsLive = reader.GetBoolean(10); - } - - if (!reader.IsDBNull(11)) - { - hasProgramAttributes.IsNews = reader.GetBoolean(11); - } - - if (!reader.IsDBNull(12)) - { - hasProgramAttributes.IsPremiere = reader.GetBoolean(12); - } - - if (!reader.IsDBNull(13)) - { - hasProgramAttributes.EpisodeTitle = reader.GetString(13); - } - - if (!reader.IsDBNull(14)) - { - hasProgramAttributes.IsRepeat = reader.GetBoolean(14); - } - } - - var index = 15; - - if (!reader.IsDBNull(index)) - { - item.CommunityRating = reader.GetFloat(index); - } - index++; - - if (query.HasField(ItemFields.CustomRating)) - { - if (!reader.IsDBNull(index)) - { - item.CustomRating = reader.GetString(index); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.IndexNumber = reader.GetInt32(index); - } - index++; - - if (query.HasField(ItemFields.Settings)) - { - if (!reader.IsDBNull(index)) - { - item.IsLocked = reader.GetBoolean(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.PreferredMetadataLanguage = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.PreferredMetadataCountryCode = reader.GetString(index); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.IsHD = reader.GetBoolean(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.ExternalEtag = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.DateLastRefreshed = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.Name = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.Path = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.PremiereDate = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - - if (query.HasField(ItemFields.Overview)) - { - if (!reader.IsDBNull(index)) - { - item.Overview = reader.GetString(index); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.ParentIndexNumber = reader.GetInt32(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.ProductionYear = reader.GetInt32(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.OfficialRating = reader.GetString(index); - } - index++; - - if (query.HasField(ItemFields.OfficialRatingDescription)) - { - if (!reader.IsDBNull(index)) - { - item.OfficialRatingDescription = reader.GetString(index); - } - index++; - } - - if (query.HasField(ItemFields.HomePageUrl)) - { - if (!reader.IsDBNull(index)) - { - item.HomePageUrl = reader.GetString(index); - } - index++; - } - - if (query.HasField(ItemFields.DisplayMediaType)) - { - if (!reader.IsDBNull(index)) - { - item.DisplayMediaType = reader.GetString(index); - } - index++; - } - - if (query.HasField(ItemFields.SortName)) - { - if (!reader.IsDBNull(index)) - { - item.ForcedSortName = reader.GetString(index); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.RunTimeTicks = reader.GetInt64(index); - } - index++; - - if (query.HasField(ItemFields.VoteCount)) - { - if (!reader.IsDBNull(index)) - { - item.VoteCount = reader.GetInt32(index); - } - index++; - } - - if (query.HasField(ItemFields.DateCreated)) - { - if (!reader.IsDBNull(index)) - { - item.DateCreated = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.DateModified = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - - item.Id = reader.GetGuid(index); - index++; - - if (query.HasField(ItemFields.Genres)) - { - if (!reader.IsDBNull(index)) - { - item.Genres = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.ParentId = reader.GetGuid(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.Audio = (ProgramAudio)Enum.Parse(typeof(ProgramAudio), reader.GetString(index), true); - } - index++; - - // TODO: Even if not needed by apps, the server needs it internally - // But get this excluded from contexts where it is not needed - if (!reader.IsDBNull(index)) - { - item.ServiceName = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.IsInMixedFolder = reader.GetBoolean(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.DateLastSaved = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - - if (query.HasField(ItemFields.Settings)) - { - if (!reader.IsDBNull(index)) - { - item.LockedFields = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (MetadataFields)Enum.Parse(typeof(MetadataFields), i, true)).ToList(); - } - index++; - } - - if (query.HasField(ItemFields.Studios)) - { - if (!reader.IsDBNull(index)) - { - item.Studios = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - } - - if (query.HasField(ItemFields.Tags)) - { - if (!reader.IsDBNull(index)) - { - item.Tags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.SourceType = (SourceType)Enum.Parse(typeof(SourceType), reader.GetString(index), true); - } - index++; - - var trailer = item as Trailer; - if (trailer != null) - { - if (!reader.IsDBNull(index)) - { - trailer.TrailerTypes = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (TrailerType)Enum.Parse(typeof(TrailerType), i, true)).ToList(); - } - } - index++; - - if (query.HasField(ItemFields.OriginalTitle)) - { - if (!reader.IsDBNull(index)) - { - item.OriginalTitle = reader.GetString(index); - } - index++; - } - - var video = item as Video; - if (video != null) - { - if (!reader.IsDBNull(index)) - { - video.PrimaryVersionId = reader.GetString(index); - } - } - index++; - - if (query.HasField(ItemFields.DateLastMediaAdded)) - { - var folder = item as Folder; - if (folder != null && !reader.IsDBNull(index)) - { - folder.DateLastMediaAdded = reader.GetDateTime(index).ToUniversalTime(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.Album = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.CriticRating = reader.GetFloat(index); - } - index++; - - if (query.HasField(ItemFields.CriticRatingSummary)) - { - if (!reader.IsDBNull(index)) - { - item.CriticRatingSummary = reader.GetString(index); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.IsVirtualItem = reader.GetBoolean(index); - } - index++; - - var hasSeries = item as IHasSeries; - if (hasSeries != null) - { - if (!reader.IsDBNull(index)) - { - hasSeries.SeriesName = reader.GetString(index); - } - } - index++; - - var episode = item as Episode; - if (episode != null) - { - if (!reader.IsDBNull(index)) - { - episode.SeasonName = reader.GetString(index); - } - index++; - if (!reader.IsDBNull(index)) - { - episode.SeasonId = reader.GetGuid(index); - } - } - else - { - index++; - } - index++; - - if (hasSeries != null) - { - if (!reader.IsDBNull(index)) - { - hasSeries.SeriesId = reader.GetGuid(index); - } - } - index++; - - if (hasSeries != null) - { - if (!reader.IsDBNull(index)) - { - hasSeries.SeriesSortName = reader.GetString(index); - } - } - index++; - - if (!reader.IsDBNull(index)) - { - item.PresentationUniqueKey = reader.GetString(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.InheritedParentalRatingValue = reader.GetInt32(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.InheritedTags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.ExternalSeriesId = reader.GetString(index); - } - index++; - - if (query.HasField(ItemFields.ShortOverview)) - { - if (!reader.IsDBNull(index)) - { - item.ShortOverview = reader.GetString(index); - } - index++; - } - - if (query.HasField(ItemFields.Taglines)) - { - if (!reader.IsDBNull(index)) - { - item.Tagline = reader.GetString(index); - } - index++; - } - - if (query.HasField(ItemFields.Keywords)) - { - if (!reader.IsDBNull(index)) - { - item.Keywords = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - DeserializeProviderIds(reader.GetString(index), item); - } - index++; - - if (query.DtoOptions.EnableImages) - { - if (!reader.IsDBNull(index)) - { - DeserializeImages(reader.GetString(index), item); - } - index++; - } - - if (query.HasField(ItemFields.ProductionLocations)) - { - if (!reader.IsDBNull(index)) - { - item.ProductionLocations = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - } - - if (query.HasField(ItemFields.ThemeSongIds)) - { - if (!reader.IsDBNull(index)) - { - item.ThemeSongIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); - } - index++; - } - - if (query.HasField(ItemFields.ThemeVideoIds)) - { - if (!reader.IsDBNull(index)) - { - item.ThemeVideoIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); - } - index++; - } - - if (!reader.IsDBNull(index)) - { - item.TotalBitrate = reader.GetInt32(index); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.ExtraType = (ExtraType)Enum.Parse(typeof(ExtraType), reader.GetString(index), true); - } - index++; - - var hasArtists = item as IHasArtist; - if (hasArtists != null && !reader.IsDBNull(index)) - { - hasArtists.Artists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - - var hasAlbumArtists = item as IHasAlbumArtist; - if (hasAlbumArtists != null && !reader.IsDBNull(index)) - { - hasAlbumArtists.AlbumArtists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); - } - index++; - - if (!reader.IsDBNull(index)) - { - item.ExternalId = reader.GetString(index); - } - index++; - - if (string.IsNullOrWhiteSpace(item.Tagline)) - { - var movie = item as Movie; - if (movie != null && movie.Taglines.Count > 0) - { - movie.Tagline = movie.Taglines[0]; - } - } - - if (type == typeof(Person) && item.ProductionLocations.Count == 0) - { - var person = (Person)item; - if (!string.IsNullOrWhiteSpace(person.PlaceOfBirth)) - { - item.ProductionLocations = new List { person.PlaceOfBirth }; - } - } - - return item; - } - - /// - /// Gets the critic reviews. - /// - /// The item id. - /// Task{IEnumerable{ItemReview}}. - public IEnumerable GetCriticReviews(Guid itemId) - { - try - { - var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - - return _jsonSerializer.DeserializeFromFile>(path); - } - catch (DirectoryNotFoundException) - { - return new List(); - } - catch (FileNotFoundException) - { - return new List(); - } - } - - private readonly Task _cachedTask = Task.FromResult(true); - /// - /// Saves the critic reviews. - /// - /// The item id. - /// The critic reviews. - /// Task. - public Task SaveCriticReviews(Guid itemId, IEnumerable criticReviews) - { - Directory.CreateDirectory(_criticReviewsPath); - - var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - - _jsonSerializer.SerializeToFile(criticReviews.ToList(), path); - - return _cachedTask; - } - - /// - /// Gets chapters for an item - /// - /// The id. - /// IEnumerable{ChapterInfo}. - /// id - public IEnumerable GetChapters(Guid id) - { - CheckDisposed(); - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - var list = new List(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"; - - cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - list.Add(GetChapter(reader)); - } - } - } - - return list; - } - - /// - /// Gets a single chapter for an item - /// - /// The id. - /// The index. - /// ChapterInfo. - /// id - public ChapterInfo GetChapter(Guid id, int index) - { - CheckDisposed(); - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"; - - cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; - cmd.Parameters.Add(cmd, "@ChapterIndex", DbType.Int32).Value = index; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return GetChapter(reader); - } - } - return null; - } - } - - /// - /// Gets the chapter. - /// - /// The reader. - /// ChapterInfo. - private ChapterInfo GetChapter(IDataReader reader) - { - var chapter = new ChapterInfo - { - StartPositionTicks = reader.GetInt64(0) - }; - - if (!reader.IsDBNull(1)) - { - chapter.Name = reader.GetString(1); - } - - if (!reader.IsDBNull(2)) - { - chapter.ImagePath = reader.GetString(2); - } - - if (!reader.IsDBNull(3)) - { - chapter.ImageDateModified = reader.GetDateTime(3).ToUniversalTime(); - } - - return chapter; - } - - /// - /// Saves the chapters. - /// - /// The id. - /// The chapters. - /// The cancellation token. - /// Task. - /// - /// id - /// or - /// chapters - /// or - /// cancellationToken - /// - public async Task SaveChapters(Guid id, List chapters, CancellationToken cancellationToken) - { - CheckDisposed(); - - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - if (chapters == null) - { - throw new ArgumentNullException("chapters"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - // First delete chapters - _deleteChaptersCommand.GetParameter(0).Value = id; - - _deleteChaptersCommand.Transaction = transaction; - - _deleteChaptersCommand.ExecuteNonQuery(); - - var index = 0; - - foreach (var chapter in chapters) - { - cancellationToken.ThrowIfCancellationRequested(); - - _saveChapterCommand.GetParameter(0).Value = id; - _saveChapterCommand.GetParameter(1).Value = index; - _saveChapterCommand.GetParameter(2).Value = chapter.StartPositionTicks; - _saveChapterCommand.GetParameter(3).Value = chapter.Name; - _saveChapterCommand.GetParameter(4).Value = chapter.ImagePath; - _saveChapterCommand.GetParameter(5).Value = chapter.ImageDateModified; - - _saveChapterCommand.Transaction = transaction; - - _saveChapterCommand.ExecuteNonQuery(); - - index++; - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save chapters:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - protected override void CloseConnection() - { - if (_connection != null) - { - if (_connection.IsOpen()) - { - _connection.Close(); - } - - _connection.Dispose(); - _connection = null; - } - } - - private bool EnableJoinUserData(InternalItemsQuery query) - { - if (query.User == null) - { - return false; - } - - if (query.SimilarTo != null && query.User != null) - { - return true; - } - - var sortingFields = query.SortBy.ToList(); - sortingFields.AddRange(query.OrderBy.Select(i => i.Item1)); - - if (sortingFields.Contains(ItemSortBy.IsFavoriteOrLiked, StringComparer.OrdinalIgnoreCase)) - { - return true; - } - if (sortingFields.Contains(ItemSortBy.IsPlayed, StringComparer.OrdinalIgnoreCase)) - { - return true; - } - if (sortingFields.Contains(ItemSortBy.IsUnplayed, StringComparer.OrdinalIgnoreCase)) - { - return true; - } - if (sortingFields.Contains(ItemSortBy.PlayCount, StringComparer.OrdinalIgnoreCase)) - { - return true; - } - if (sortingFields.Contains(ItemSortBy.DatePlayed, StringComparer.OrdinalIgnoreCase)) - { - return true; - } - - if (query.IsFavoriteOrLiked.HasValue) - { - return true; - } - - if (query.IsFavorite.HasValue) - { - return true; - } - - if (query.IsResumable.HasValue) - { - return true; - } - - if (query.IsPlayed.HasValue) - { - return true; - } - - if (query.IsLiked.HasValue) - { - return true; - } - - return false; - } - - private List allFields = Enum.GetNames(typeof(ItemFields)) - .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) - .ToList(); - - private IEnumerable GetColumnNamesFromField(ItemFields field) - { - if (field == ItemFields.Settings) - { - return new[] { "IsLocked", "PreferredMetadataCountryCode", "PreferredMetadataLanguage", "LockedFields" }; - } - if (field == ItemFields.ServiceName) - { - return new[] { "ExternalServiceId" }; - } - if (field == ItemFields.SortName) - { - return new[] { "ForcedSortName" }; - } - if (field == ItemFields.Taglines) - { - return new[] { "Tagline" }; - } - - return new[] { field.ToString() }; - } - - private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns, IDbCommand cmd) - { - var list = startColumns.ToList(); - - foreach (var field in allFields) - { - if (!query.HasField(field)) - { - foreach (var fieldToRemove in GetColumnNamesFromField(field).ToList()) - { - list.Remove(fieldToRemove); - } - } - } - - if (!query.DtoOptions.EnableImages) - { - list.Remove("Images"); - } - - if (EnableJoinUserData(query)) - { - list.Add("UserDataDb.UserData.UserId"); - list.Add("UserDataDb.UserData.lastPlayedDate"); - list.Add("UserDataDb.UserData.playbackPositionTicks"); - list.Add("UserDataDb.UserData.playcount"); - list.Add("UserDataDb.UserData.isFavorite"); - list.Add("UserDataDb.UserData.played"); - list.Add("UserDataDb.UserData.rating"); - } - - if (query.SimilarTo != null) - { - var item = query.SimilarTo; - - var builder = new StringBuilder(); - builder.Append("("); - - builder.Append("((OfficialRating=@ItemOfficialRating) * 10)"); - //builder.Append("+ ((ProductionYear=@ItemProductionYear) * 10)"); - - builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 10 Then 2 Else 0 End )"); - builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 5 Then 2 Else 0 End )"); - - //// genres - builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=2 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=2)) * 10)"); - - //// tags - builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=4 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=4)) * 10)"); - - builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=5 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=5)) * 10)"); - - builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=3 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=3)) * 3)"); - - //builder.Append("+ ((Select count(Name) from People where ItemId=Guid and Name in (select Name from People where ItemId=@SimilarItemId)) * 3)"); - - ////builder.Append("(select group_concat((Select Name from People where ItemId=Guid and Name in (Select Name from People where ItemId=@SimilarItemId)), '|'))"); - - builder.Append(") as SimilarityScore"); - - list.Add(builder.ToString()); - cmd.Parameters.Add(cmd, "@ItemOfficialRating", DbType.String).Value = item.OfficialRating; - cmd.Parameters.Add(cmd, "@ItemProductionYear", DbType.Int32).Value = item.ProductionYear ?? 0; - cmd.Parameters.Add(cmd, "@SimilarItemId", DbType.Guid).Value = item.Id; - - var excludeIds = query.ExcludeItemIds.ToList(); - excludeIds.Add(item.Id.ToString("N")); - query.ExcludeItemIds = excludeIds.ToArray(); - - query.ExcludeProviderIds = item.ProviderIds; - } - - return list.ToArray(); - } - - private string GetJoinUserDataText(InternalItemsQuery query) - { - if (!EnableJoinUserData(query)) - { - return string.Empty; - } - - return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; - } - - private string GetGroupBy(InternalItemsQuery query) - { - var groups = new List(); - - if (EnableGroupByPresentationUniqueKey(query)) - { - groups.Add("PresentationUniqueKey"); - } - - if (groups.Count > 0) - { - return " Group by " + string.Join(",", groups.ToArray()); - } - - return string.Empty; - } - - private string GetFromText(string alias = "A") - { - return " from TypedBaseItems " + alias; - } - - public List GetItemList(InternalItemsQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - var now = DateTime.UtcNow; - - var list = new List(); - - // Hack for right now since we currently don't support filtering out these duplicates within a query - if (query.Limit.HasValue && query.EnableGroupByMetadataKey) - { - query.Limit = query.Limit.Value + 4; - } - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText(); - cmd.CommandText += GetJoinUserDataText(query); - - if (EnableJoinUserData(query)) - { - cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - } - - var whereClauses = GetWhereClauses(query, cmd); - - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - cmd.CommandText += whereText; - - cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += GetOrderByText(query); - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - LogQueryTime("GetItemList", cmd, now); - - while (reader.Read()) - { - var item = GetItem(reader, query); - if (item != null) - { - list.Add(item); - } - } - } - } - - // Hack for right now since we currently don't support filtering out these duplicates within a query - if (query.EnableGroupByMetadataKey) - { - var limit = query.Limit ?? int.MaxValue; - limit -= 4; - var newList = new List(); - - foreach (var item in list) - { - AddItem(newList, item); - - if (newList.Count >= limit) - { - break; - } - } - - list = newList; - } - - return list; - } - - private void AddItem(List items, BaseItem newItem) - { - var providerIds = newItem.ProviderIds.ToList(); - - for (var i = 0; i < items.Count; i++) - { - var item = items[i]; - - foreach (var providerId in providerIds) - { - if (providerId.Key == MetadataProviders.TmdbCollection.ToString()) - { - continue; - } - if (item.GetProviderId(providerId.Key) == providerId.Value) - { - if (newItem.SourceType == SourceType.Library) - { - items[i] = newItem; - } - return; - } - } - } - - items.Add(newItem); - } - - private void LogQueryTime(string methodName, IDbCommand cmd, DateTime startDate) - { - var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds; - - var slowThreshold = 1000; - -#if DEBUG - slowThreshold = 50; -#endif - - if (elapsed >= slowThreshold) - { - Logger.Debug("{2} query time (slow): {0}ms. Query: {1}", - Convert.ToInt32(elapsed), - cmd.CommandText, - methodName); - } - else - { - //Logger.Debug("{2} query time: {0}ms. Query: {1}", - // Convert.ToInt32(elapsed), - // cmd.CommandText, - // methodName); - } - } - - public QueryResult GetItems(InternalItemsQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) - { - var list = GetItemList(query); - return new QueryResult - { - Items = list.ToArray(), - TotalRecordCount = list.Count - }; - } - - var now = DateTime.UtcNow; - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText(); - cmd.CommandText += GetJoinUserDataText(query); - - if (EnableJoinUserData(query)) - { - cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - } - - var whereClauses = GetWhereClauses(query, cmd); - - var whereTextWithoutPaging = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - cmd.CommandText += whereText; - - cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += GetOrderByText(query); - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - cmd.CommandText += ";"; - - var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - - if (isReturningZeroItems) - { - cmd.CommandText = ""; - } - - if (EnableGroupByPresentationUniqueKey(query)) - { - cmd.CommandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); - } - else - { - cmd.CommandText += " select count (guid)" + GetFromText(); - } - - cmd.CommandText += GetJoinUserDataText(query); - cmd.CommandText += whereTextWithoutPaging; - - var list = new List(); - var count = 0; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - LogQueryTime("GetItems", cmd, now); - - if (isReturningZeroItems) - { - if (reader.Read()) - { - count = reader.GetInt32(0); - } - } - else - { - while (reader.Read()) - { - var item = GetItem(reader, query); - if (item != null) - { - list.Add(item); - } - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - - private string GetOrderByText(InternalItemsQuery query) - { - var orderBy = query.OrderBy.ToList(); - var enableOrderInversion = true; - - if (orderBy.Count == 0) - { - orderBy.AddRange(query.SortBy.Select(i => new Tuple(i, query.SortOrder))); - } - else - { - enableOrderInversion = false; - } - - if (query.SimilarTo != null) - { - if (orderBy.Count == 0) - { - orderBy.Add(new Tuple("SimilarityScore", SortOrder.Descending)); - orderBy.Add(new Tuple(ItemSortBy.Random, SortOrder.Ascending)); - query.SortOrder = SortOrder.Descending; - enableOrderInversion = false; - } - } - - query.OrderBy = orderBy; - - if (orderBy.Count == 0) - { - return string.Empty; - } - - return " ORDER BY " + string.Join(",", orderBy.Select(i => - { - var columnMap = MapOrderByField(i.Item1, query); - var columnAscending = i.Item2 == SortOrder.Ascending; - if (columnMap.Item2 && enableOrderInversion) - { - columnAscending = !columnAscending; - } - - var sortOrder = columnAscending ? "ASC" : "DESC"; - - return columnMap.Item1 + " " + sortOrder; - }).ToArray()); - } - - private Tuple MapOrderByField(string name, InternalItemsQuery query) - { - if (string.Equals(name, ItemSortBy.AirTime, StringComparison.OrdinalIgnoreCase)) - { - // TODO - return new Tuple("SortName", false); - } - if (string.Equals(name, ItemSortBy.Runtime, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("RuntimeTicks", false); - } - if (string.Equals(name, ItemSortBy.Random, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("RANDOM()", false); - } - if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("LastPlayedDate", false); - } - if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("PlayCount", false); - } - if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("IsFavorite", true); - } - if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("IsFolder", true); - } - if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("played", true); - } - if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("played", false); - } - if (string.Equals(name, ItemSortBy.DateLastContentAdded, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("DateLastMediaAdded", false); - } - if (string.Equals(name, ItemSortBy.Artist, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false); - } - if (string.Equals(name, ItemSortBy.AlbumArtist, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false); - } - if (string.Equals(name, ItemSortBy.OfficialRating, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("InheritedParentalRatingValue", false); - } - if (string.Equals(name, ItemSortBy.Studio, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=3 LIMIT 1)", false); - } - if (string.Equals(name, ItemSortBy.SeriesDatePlayed, StringComparison.OrdinalIgnoreCase)) - { - return new Tuple("(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where B.Guid in (Select ItemId from AncestorIds where AncestorId in (select guid from typedbaseitems c where C.Type = 'MediaBrowser.Controller.Entities.TV.Series' And C.Guid in (Select AncestorId from AncestorIds where ItemId=A.Guid))))", false); - } - - return new Tuple(name, false); - } - - public List GetItemIdsList(InternalItemsQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - var now = DateTime.UtcNow; - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText(); - cmd.CommandText += GetJoinUserDataText(query); - - if (EnableJoinUserData(query)) - { - cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - } - - var whereClauses = GetWhereClauses(query, cmd); - - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - cmd.CommandText += whereText; - - cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += GetOrderByText(query); - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - var list = new List(); - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - LogQueryTime("GetItemIdsList", cmd, now); - - while (reader.Read()) - { - list.Add(reader.GetGuid(0)); - } - } - - return list; - } - } - - public QueryResult> GetItemIdsWithPath(InternalItemsQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select guid,path from TypedBaseItems"; - - var whereClauses = GetWhereClauses(query, cmd); - - var whereTextWithoutPaging = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - cmd.CommandText += whereText; - - cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += GetOrderByText(query); - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging; - - var list = new List>(); - var count = 0; - - Logger.Debug(cmd.CommandText); - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - while (reader.Read()) - { - var id = reader.GetGuid(0); - string path = null; - - if (!reader.IsDBNull(1)) - { - path = reader.GetString(1); - } - list.Add(new Tuple(id, path)); - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - - return new QueryResult>() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - - public QueryResult GetItemIds(InternalItemsQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) - { - var list = GetItemIdsList(query); - return new QueryResult - { - Items = list.ToArray(), - TotalRecordCount = list.Count - }; - } - - var now = DateTime.UtcNow; - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText(); - - var whereClauses = GetWhereClauses(query, cmd); - cmd.CommandText += GetJoinUserDataText(query); - - if (EnableJoinUserData(query)) - { - cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - } - - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - cmd.CommandText += whereText; - - cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += GetOrderByText(query); - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - if (EnableGroupByPresentationUniqueKey(query)) - { - cmd.CommandText += "; select count (distinct PresentationUniqueKey)" + GetFromText(); - } - else - { - cmd.CommandText += "; select count (guid)" + GetFromText(); - } - - cmd.CommandText += GetJoinUserDataText(query); - cmd.CommandText += whereText; - - var list = new List(); - var count = 0; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - LogQueryTime("GetItemIds", cmd, now); - - while (reader.Read()) - { - list.Add(reader.GetGuid(0)); - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - - private List GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, string paramSuffix = "") - { - var whereClauses = new List(); - - if (EnableJoinUserData(query)) - { - //whereClauses.Add("(UserId is null or UserId=@UserId)"); - } - if (query.IsHD.HasValue) - { - whereClauses.Add("IsHD=@IsHD"); - cmd.Parameters.Add(cmd, "@IsHD", DbType.Boolean).Value = query.IsHD; - } - if (query.IsLocked.HasValue) - { - whereClauses.Add("IsLocked=@IsLocked"); - cmd.Parameters.Add(cmd, "@IsLocked", DbType.Boolean).Value = query.IsLocked; - } - if (query.IsOffline.HasValue) - { - whereClauses.Add("IsOffline=@IsOffline"); - cmd.Parameters.Add(cmd, "@IsOffline", DbType.Boolean).Value = query.IsOffline; - } - - var exclusiveProgramAttribtues = !(query.IsMovie ?? true) || - !(query.IsSports ?? true) || - !(query.IsKids ?? true) || - !(query.IsNews ?? true) || - !(query.IsSeries ?? true); - - if (exclusiveProgramAttribtues) - { - if (query.IsMovie.HasValue) - { - var alternateTypes = new List(); - if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) - { - alternateTypes.Add(typeof(Movie).FullName); - } - if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) - { - alternateTypes.Add(typeof(Trailer).FullName); - } - - if (alternateTypes.Count == 0) - { - whereClauses.Add("IsMovie=@IsMovie"); - cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = query.IsMovie; - } - else - { - whereClauses.Add("(IsMovie is null OR IsMovie=@IsMovie)"); - cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = query.IsMovie; - } - } - if (query.IsSeries.HasValue) - { - whereClauses.Add("IsSeries=@IsSeries"); - cmd.Parameters.Add(cmd, "@IsSeries", DbType.Boolean).Value = query.IsSeries; - } - if (query.IsNews.HasValue) - { - whereClauses.Add("IsNews=@IsNews"); - cmd.Parameters.Add(cmd, "@IsNews", DbType.Boolean).Value = query.IsNews; - } - if (query.IsKids.HasValue) - { - whereClauses.Add("IsKids=@IsKids"); - cmd.Parameters.Add(cmd, "@IsKids", DbType.Boolean).Value = query.IsKids; - } - if (query.IsSports.HasValue) - { - whereClauses.Add("IsSports=@IsSports"); - cmd.Parameters.Add(cmd, "@IsSports", DbType.Boolean).Value = query.IsSports; - } - } - else - { - var programAttribtues = new List(); - if (query.IsMovie ?? false) - { - var alternateTypes = new List(); - if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) - { - alternateTypes.Add(typeof(Movie).FullName); - } - if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) - { - alternateTypes.Add(typeof(Trailer).FullName); - } - - if (alternateTypes.Count == 0) - { - programAttribtues.Add("IsMovie=@IsMovie"); - } - else - { - programAttribtues.Add("(IsMovie is null OR IsMovie=@IsMovie)"); - } - - cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = true; - } - if (query.IsSports ?? false) - { - programAttribtues.Add("IsSports=@IsSports"); - cmd.Parameters.Add(cmd, "@IsSports", DbType.Boolean).Value = true; - } - if (query.IsNews ?? false) - { - programAttribtues.Add("IsNews=@IsNews"); - cmd.Parameters.Add(cmd, "@IsNews", DbType.Boolean).Value = true; - } - if (query.IsSeries ?? false) - { - programAttribtues.Add("IsSeries=@IsSeries"); - cmd.Parameters.Add(cmd, "@IsSeries", DbType.Boolean).Value = true; - } - if (query.IsKids ?? false) - { - programAttribtues.Add("IsKids=@IsKids"); - cmd.Parameters.Add(cmd, "@IsKids", DbType.Boolean).Value = true; - } - if (programAttribtues.Count > 0) - { - whereClauses.Add("(" + string.Join(" OR ", programAttribtues.ToArray()) + ")"); - } - } - - if (query.SimilarTo != null) - { - whereClauses.Add("SimilarityScore > 0"); - } - - if (query.IsFolder.HasValue) - { - whereClauses.Add("IsFolder=@IsFolder"); - cmd.Parameters.Add(cmd, "@IsFolder", DbType.Boolean).Value = query.IsFolder; - } - - var includeTypes = query.IncludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); - if (includeTypes.Length == 1) - { - whereClauses.Add("type=@type" + paramSuffix); - cmd.Parameters.Add(cmd, "@type" + paramSuffix, DbType.String).Value = includeTypes[0]; - } - else if (includeTypes.Length > 1) - { - var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add(string.Format("type in ({0})", inClause)); - } - - var excludeTypes = query.ExcludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); - if (excludeTypes.Length == 1) - { - whereClauses.Add("type<>@type"); - cmd.Parameters.Add(cmd, "@type", DbType.String).Value = excludeTypes[0]; - } - else if (excludeTypes.Length > 1) - { - var inClause = string.Join(",", excludeTypes.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add(string.Format("type not in ({0})", inClause)); - } - - if (query.ChannelIds.Length == 1) - { - whereClauses.Add("ChannelId=@ChannelId"); - cmd.Parameters.Add(cmd, "@ChannelId", DbType.String).Value = query.ChannelIds[0]; - } - if (query.ChannelIds.Length > 1) - { - var inClause = string.Join(",", query.ChannelIds.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add(string.Format("ChannelId in ({0})", inClause)); - } - - if (query.ParentId.HasValue) - { - whereClauses.Add("ParentId=@ParentId"); - cmd.Parameters.Add(cmd, "@ParentId", DbType.Guid).Value = query.ParentId.Value; - } - - if (!string.IsNullOrWhiteSpace(query.Path)) - { - whereClauses.Add("Path=@Path"); - cmd.Parameters.Add(cmd, "@Path", DbType.String).Value = query.Path; - } - - if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) - { - whereClauses.Add("PresentationUniqueKey=@PresentationUniqueKey"); - cmd.Parameters.Add(cmd, "@PresentationUniqueKey", DbType.String).Value = query.PresentationUniqueKey; - } - - if (query.MinCommunityRating.HasValue) - { - whereClauses.Add("CommunityRating>=@MinCommunityRating"); - cmd.Parameters.Add(cmd, "@MinCommunityRating", DbType.Double).Value = query.MinCommunityRating.Value; - } - - if (query.MinIndexNumber.HasValue) - { - whereClauses.Add("IndexNumber>=@MinIndexNumber"); - cmd.Parameters.Add(cmd, "@MinIndexNumber", DbType.Int32).Value = query.MinIndexNumber.Value; - } - - if (query.MinDateCreated.HasValue) - { - whereClauses.Add("DateCreated>=@MinDateCreated"); - cmd.Parameters.Add(cmd, "@MinDateCreated", DbType.DateTime).Value = query.MinDateCreated.Value; - } - - if (query.MinDateLastSaved.HasValue) - { - whereClauses.Add("DateLastSaved>=@MinDateLastSaved"); - cmd.Parameters.Add(cmd, "@MinDateLastSaved", DbType.DateTime).Value = query.MinDateLastSaved.Value; - } - - //if (query.MinPlayers.HasValue) - //{ - // whereClauses.Add("Players>=@MinPlayers"); - // cmd.Parameters.Add(cmd, "@MinPlayers", DbType.Int32).Value = query.MinPlayers.Value; - //} - - //if (query.MaxPlayers.HasValue) - //{ - // whereClauses.Add("Players<=@MaxPlayers"); - // cmd.Parameters.Add(cmd, "@MaxPlayers", DbType.Int32).Value = query.MaxPlayers.Value; - //} - - if (query.IndexNumber.HasValue) - { - whereClauses.Add("IndexNumber=@IndexNumber"); - cmd.Parameters.Add(cmd, "@IndexNumber", DbType.Int32).Value = query.IndexNumber.Value; - } - if (query.ParentIndexNumber.HasValue) - { - whereClauses.Add("ParentIndexNumber=@ParentIndexNumber"); - cmd.Parameters.Add(cmd, "@ParentIndexNumber", DbType.Int32).Value = query.ParentIndexNumber.Value; - } - if (query.ParentIndexNumberNotEquals.HasValue) - { - whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)"); - cmd.Parameters.Add(cmd, "@ParentIndexNumberNotEquals", DbType.Int32).Value = query.ParentIndexNumberNotEquals.Value; - } - if (query.MinEndDate.HasValue) - { - whereClauses.Add("EndDate>=@MinEndDate"); - cmd.Parameters.Add(cmd, "@MinEndDate", DbType.Date).Value = query.MinEndDate.Value; - } - - if (query.MaxEndDate.HasValue) - { - whereClauses.Add("EndDate<=@MaxEndDate"); - cmd.Parameters.Add(cmd, "@MaxEndDate", DbType.Date).Value = query.MaxEndDate.Value; - } - - if (query.MinStartDate.HasValue) - { - whereClauses.Add("StartDate>=@MinStartDate"); - cmd.Parameters.Add(cmd, "@MinStartDate", DbType.Date).Value = query.MinStartDate.Value; - } - - if (query.MaxStartDate.HasValue) - { - whereClauses.Add("StartDate<=@MaxStartDate"); - cmd.Parameters.Add(cmd, "@MaxStartDate", DbType.Date).Value = query.MaxStartDate.Value; - } - - if (query.MinPremiereDate.HasValue) - { - whereClauses.Add("PremiereDate>=@MinPremiereDate"); - cmd.Parameters.Add(cmd, "@MinPremiereDate", DbType.Date).Value = query.MinPremiereDate.Value; - } - if (query.MaxPremiereDate.HasValue) - { - whereClauses.Add("PremiereDate<=@MaxPremiereDate"); - cmd.Parameters.Add(cmd, "@MaxPremiereDate", DbType.Date).Value = query.MaxPremiereDate.Value; - } - - if (query.SourceTypes.Length == 1) - { - whereClauses.Add("SourceType=@SourceType"); - cmd.Parameters.Add(cmd, "@SourceType", DbType.String).Value = query.SourceTypes[0]; - } - else if (query.SourceTypes.Length > 1) - { - var inClause = string.Join(",", query.SourceTypes.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add(string.Format("SourceType in ({0})", inClause)); - } - - if (query.ExcludeSourceTypes.Length == 1) - { - whereClauses.Add("SourceType<>@SourceType"); - cmd.Parameters.Add(cmd, "@SourceType", DbType.String).Value = query.SourceTypes[0]; - } - else if (query.ExcludeSourceTypes.Length > 1) - { - var inClause = string.Join(",", query.ExcludeSourceTypes.Select(i => "'" + i + "'").ToArray()); - whereClauses.Add(string.Format("SourceType not in ({0})", inClause)); - } - - if (query.TrailerTypes.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var type in query.TrailerTypes) - { - clauses.Add("TrailerTypes like @TrailerTypes" + index); - cmd.Parameters.Add(cmd, "@TrailerTypes" + index, DbType.String).Value = "%" + type + "%"; - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.IsAiring.HasValue) - { - if (query.IsAiring.Value) - { - whereClauses.Add("StartDate<=@MaxStartDate"); - cmd.Parameters.Add(cmd, "@MaxStartDate", DbType.Date).Value = DateTime.UtcNow; - - whereClauses.Add("EndDate>=@MinEndDate"); - cmd.Parameters.Add(cmd, "@MinEndDate", DbType.Date).Value = DateTime.UtcNow; - } - else - { - whereClauses.Add("(StartDate>@IsAiringDate OR EndDate < @IsAiringDate)"); - cmd.Parameters.Add(cmd, "@IsAiringDate", DbType.Date).Value = DateTime.UtcNow; - } - } - - if (query.PersonIds.Length > 0) - { - // Todo: improve without having to do this - query.Person = query.PersonIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).FirstOrDefault(); - } - - if (!string.IsNullOrWhiteSpace(query.Person)) - { - whereClauses.Add("Guid in (select ItemId from People where Name=@PersonName)"); - cmd.Parameters.Add(cmd, "@PersonName", DbType.String).Value = query.Person; - } - - if (!string.IsNullOrWhiteSpace(query.SlugName)) - { - whereClauses.Add("SlugName=@SlugName"); - cmd.Parameters.Add(cmd, "@SlugName", DbType.String).Value = query.SlugName; - } - - if (!string.IsNullOrWhiteSpace(query.MinSortName)) - { - whereClauses.Add("SortName>=@MinSortName"); - cmd.Parameters.Add(cmd, "@MinSortName", DbType.String).Value = query.MinSortName; - } - - if (!string.IsNullOrWhiteSpace(query.ExternalSeriesId)) - { - whereClauses.Add("ExternalSeriesId=@ExternalSeriesId"); - cmd.Parameters.Add(cmd, "@ExternalSeriesId", DbType.String).Value = query.ExternalSeriesId; - } - - if (!string.IsNullOrWhiteSpace(query.Name)) - { - whereClauses.Add("CleanName=@Name"); - cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = GetCleanValue(query.Name); - } - - if (!string.IsNullOrWhiteSpace(query.NameContains)) - { - whereClauses.Add("CleanName like @NameContains"); - cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + GetCleanValue(query.NameContains) + "%"; - } - if (!string.IsNullOrWhiteSpace(query.NameStartsWith)) - { - whereClauses.Add("SortName like @NameStartsWith"); - cmd.Parameters.Add(cmd, "@NameStartsWith", DbType.String).Value = query.NameStartsWith + "%"; - } - if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater)) - { - whereClauses.Add("SortName >= @NameStartsWithOrGreater"); - // lowercase this because SortName is stored as lowercase - cmd.Parameters.Add(cmd, "@NameStartsWithOrGreater", DbType.String).Value = query.NameStartsWithOrGreater.ToLower(); - } - if (!string.IsNullOrWhiteSpace(query.NameLessThan)) - { - whereClauses.Add("SortName < @NameLessThan"); - // lowercase this because SortName is stored as lowercase - cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower(); - } - - if (query.ImageTypes.Length > 0) - { - foreach (var requiredImage in query.ImageTypes) - { - whereClauses.Add("Images like '%" + requiredImage + "%'"); - } - } - - if (query.IsLiked.HasValue) - { - if (query.IsLiked.Value) - { - whereClauses.Add("rating>=@UserRating"); - cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue; - } - else - { - whereClauses.Add("(rating is null or rating<@UserRating)"); - cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue; - } - } - - if (query.IsFavoriteOrLiked.HasValue) - { - if (query.IsFavoriteOrLiked.Value) - { - whereClauses.Add("IsFavorite=@IsFavoriteOrLiked"); - } - else - { - whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavoriteOrLiked)"); - } - cmd.Parameters.Add(cmd, "@IsFavoriteOrLiked", DbType.Boolean).Value = query.IsFavoriteOrLiked.Value; - } - - if (query.IsFavorite.HasValue) - { - if (query.IsFavorite.Value) - { - whereClauses.Add("IsFavorite=@IsFavorite"); - } - else - { - whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavorite)"); - } - cmd.Parameters.Add(cmd, "@IsFavorite", DbType.Boolean).Value = query.IsFavorite.Value; - } - - if (EnableJoinUserData(query)) - { - if (query.IsPlayed.HasValue) - { - if (query.IsPlayed.Value) - { - whereClauses.Add("(played=@IsPlayed)"); - } - else - { - whereClauses.Add("(played is null or played=@IsPlayed)"); - } - cmd.Parameters.Add(cmd, "@IsPlayed", DbType.Boolean).Value = query.IsPlayed.Value; - } - } - - if (query.IsResumable.HasValue) - { - if (query.IsResumable.Value) - { - whereClauses.Add("playbackPositionTicks > 0"); - } - else - { - whereClauses.Add("(playbackPositionTicks is null or playbackPositionTicks = 0)"); - } - } - - if (query.ArtistNames.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var artist in query.ArtistNames) - { - clauses.Add("@ArtistName" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); - cmd.Parameters.Add(cmd, "@ArtistName" + index, DbType.String).Value = GetCleanValue(artist); - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.ExcludeArtistIds.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var artistId in query.ExcludeArtistIds) - { - var artistItem = RetrieveItem(new Guid(artistId)); - if (artistItem != null) - { - clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); - cmd.Parameters.Add(cmd, "@ExcludeArtistName" + index, DbType.String).Value = GetCleanValue(artistItem.Name); - index++; - } - } - var clause = "(" + string.Join(" AND ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.GenreIds.Length > 0) - { - // Todo: improve without having to do this - query.Genres = query.GenreIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); - } - - if (query.Genres.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var item in query.Genres) - { - clauses.Add("@Genre" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=2)"); - cmd.Parameters.Add(cmd, "@Genre" + index, DbType.String).Value = GetCleanValue(item); - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.Tags.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var item in query.Tags) - { - clauses.Add("@Tag" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=4)"); - cmd.Parameters.Add(cmd, "@Tag" + index, DbType.String).Value = GetCleanValue(item); - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.StudioIds.Length > 0) - { - // Todo: improve without having to do this - query.Studios = query.StudioIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); - } - - if (query.Studios.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var item in query.Studios) - { - clauses.Add("@Studio" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=3)"); - cmd.Parameters.Add(cmd, "@Studio" + index, DbType.String).Value = GetCleanValue(item); - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.Keywords.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var item in query.Keywords) - { - clauses.Add("@Keyword" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=5)"); - cmd.Parameters.Add(cmd, "@Keyword" + index, DbType.String).Value = GetCleanValue(item); - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.OfficialRatings.Length > 0) - { - var clauses = new List(); - var index = 0; - foreach (var item in query.OfficialRatings) - { - clauses.Add("OfficialRating=@OfficialRating" + index); - cmd.Parameters.Add(cmd, "@OfficialRating" + index, DbType.String).Value = item; - index++; - } - var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; - whereClauses.Add(clause); - } - - if (query.MinParentalRating.HasValue) - { - whereClauses.Add("InheritedParentalRatingValue<=@MinParentalRating"); - cmd.Parameters.Add(cmd, "@MinParentalRating", DbType.Int32).Value = query.MinParentalRating.Value; - } - - if (query.MaxParentalRating.HasValue) - { - whereClauses.Add("InheritedParentalRatingValue<=@MaxParentalRating"); - cmd.Parameters.Add(cmd, "@MaxParentalRating", DbType.Int32).Value = query.MaxParentalRating.Value; - } - - if (query.HasParentalRating.HasValue) - { - if (query.HasParentalRating.Value) - { - whereClauses.Add("InheritedParentalRatingValue > 0"); - } - else - { - whereClauses.Add("InheritedParentalRatingValue = 0"); - } - } - - if (query.HasOverview.HasValue) - { - if (query.HasOverview.Value) - { - whereClauses.Add("(Overview not null AND Overview<>'')"); - } - else - { - whereClauses.Add("(Overview is null OR Overview='')"); - } - } - - if (query.HasDeadParentId.HasValue) - { - if (query.HasDeadParentId.Value) - { - whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)"); - } - } - - if (query.Years.Length == 1) - { - whereClauses.Add("ProductionYear=@Years"); - cmd.Parameters.Add(cmd, "@Years", DbType.Int32).Value = query.Years[0].ToString(); - } - else if (query.Years.Length > 1) - { - var val = string.Join(",", query.Years.ToArray()); - - whereClauses.Add("ProductionYear in (" + val + ")"); - } - - if (query.LocationTypes.Length == 1) - { - if (query.LocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) - { - query.IsVirtualItem = true; - } - else - { - whereClauses.Add("LocationType=@LocationType"); - cmd.Parameters.Add(cmd, "@LocationType", DbType.String).Value = query.LocationTypes[0].ToString(); - } - } - else if (query.LocationTypes.Length > 1) - { - var val = string.Join(",", query.LocationTypes.Select(i => "'" + i + "'").ToArray()); - - whereClauses.Add("LocationType in (" + val + ")"); - } - if (query.ExcludeLocationTypes.Length == 1) - { - if (query.ExcludeLocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) - { - query.IsVirtualItem = false; - } - else - { - whereClauses.Add("LocationType<>@ExcludeLocationTypes"); - cmd.Parameters.Add(cmd, "@ExcludeLocationTypes", DbType.String).Value = query.ExcludeLocationTypes[0].ToString(); - } - } - else if (query.ExcludeLocationTypes.Length > 1) - { - var val = string.Join(",", query.ExcludeLocationTypes.Select(i => "'" + i + "'").ToArray()); - - whereClauses.Add("LocationType not in (" + val + ")"); - } - if (query.IsVirtualItem.HasValue) - { - whereClauses.Add("IsVirtualItem=@IsVirtualItem"); - cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value; - } - if (query.IsSpecialSeason.HasValue) - { - if (query.IsSpecialSeason.Value) - { - whereClauses.Add("IndexNumber = 0"); - } - else - { - whereClauses.Add("IndexNumber <> 0"); - } - } - if (query.IsUnaired.HasValue) - { - if (query.IsUnaired.Value) - { - whereClauses.Add("PremiereDate >= DATETIME('now')"); - } - else - { - whereClauses.Add("PremiereDate < DATETIME('now')"); - } - } - if (query.IsMissing.HasValue) - { - if (query.IsMissing.Value) - { - whereClauses.Add("(IsVirtualItem=1 AND PremiereDate < DATETIME('now'))"); - } - else - { - whereClauses.Add("(IsVirtualItem=0 OR PremiereDate >= DATETIME('now'))"); - } - } - if (query.IsVirtualUnaired.HasValue) - { - if (query.IsVirtualUnaired.Value) - { - whereClauses.Add("(IsVirtualItem=1 AND PremiereDate >= DATETIME('now'))"); - } - else - { - whereClauses.Add("(IsVirtualItem=0 OR PremiereDate < DATETIME('now'))"); - } - } - if (query.MediaTypes.Length == 1) - { - whereClauses.Add("MediaType=@MediaTypes"); - cmd.Parameters.Add(cmd, "@MediaTypes", DbType.String).Value = query.MediaTypes[0]; - } - if (query.MediaTypes.Length > 1) - { - var val = string.Join(",", query.MediaTypes.Select(i => "'" + i + "'").ToArray()); - - whereClauses.Add("MediaType in (" + val + ")"); - } - if (query.ItemIds.Length > 0) - { - var includeIds = new List(); - - var index = 0; - foreach (var id in query.ItemIds) - { - includeIds.Add("Guid = @IncludeId" + index); - cmd.Parameters.Add(cmd, "@IncludeId" + index, DbType.Guid).Value = new Guid(id); - index++; - } - - whereClauses.Add(string.Join(" OR ", includeIds.ToArray())); - } - if (query.ExcludeItemIds.Length > 0) - { - var excludeIds = new List(); - - var index = 0; - foreach (var id in query.ExcludeItemIds) - { - excludeIds.Add("Guid <> @ExcludeId" + index); - cmd.Parameters.Add(cmd, "@ExcludeId" + index, DbType.Guid).Value = new Guid(id); - index++; - } - - whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); - } - - if (query.ExcludeProviderIds.Count > 0) - { - var excludeIds = new List(); - - var index = 0; - foreach (var pair in query.ExcludeProviderIds) - { - if (string.Equals(pair.Key, MetadataProviders.TmdbCollection.ToString(), StringComparison.OrdinalIgnoreCase)) - { - continue; - } - - var paramName = "@ExcludeProviderId" + index; - //excludeIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")"); - excludeIds.Add("ProviderIds not like " + paramName); - cmd.Parameters.Add(cmd, paramName, DbType.String).Value = "%" + pair.Key + "=" + pair.Value + "%"; - index++; - - break; - } - - whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); - } - - if (query.HasImdbId.HasValue) - { - whereClauses.Add("ProviderIds like '%imdb=%'"); - } - - if (query.HasTmdbId.HasValue) - { - whereClauses.Add("ProviderIds like '%tmdb=%'"); - } - - if (query.HasTvdbId.HasValue) - { - whereClauses.Add("ProviderIds like '%tvdb=%'"); - } - - if (query.AlbumNames.Length > 0) - { - var clause = "("; - - var index = 0; - foreach (var name in query.AlbumNames) - { - if (index > 0) - { - clause += " OR "; - } - clause += "Album=@AlbumName" + index; - cmd.Parameters.Add(cmd, "@AlbumName" + index, DbType.String).Value = name; - index++; - } - - clause += ")"; - whereClauses.Add(clause); - } - if (query.HasThemeSong.HasValue) - { - if (query.HasThemeSong.Value) - { - whereClauses.Add("ThemeSongIds not null"); - } - else - { - whereClauses.Add("ThemeSongIds is null"); - } - } - if (query.HasThemeVideo.HasValue) - { - if (query.HasThemeVideo.Value) - { - whereClauses.Add("ThemeVideoIds not null"); - } - else - { - whereClauses.Add("ThemeVideoIds is null"); - } - } - - //var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0; - var enableItemsByName = query.IncludeItemsByName ?? false; - - if (query.TopParentIds.Length == 1) - { - if (enableItemsByName) - { - whereClauses.Add("(TopParentId=@TopParentId or IsItemByName=@IsItemByName)"); - cmd.Parameters.Add(cmd, "@IsItemByName", DbType.Boolean).Value = true; - } - else - { - whereClauses.Add("(TopParentId=@TopParentId)"); - } - cmd.Parameters.Add(cmd, "@TopParentId", DbType.String).Value = query.TopParentIds[0]; - } - if (query.TopParentIds.Length > 1) - { - var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray()); - - if (enableItemsByName) - { - whereClauses.Add("(IsItemByName=@IsItemByName or TopParentId in (" + val + "))"); - cmd.Parameters.Add(cmd, "@IsItemByName", DbType.Boolean).Value = true; - } - else - { - whereClauses.Add("(TopParentId in (" + val + "))"); - } - } - - if (query.AncestorIds.Length == 1) - { - whereClauses.Add("Guid in (select itemId from AncestorIds where AncestorId=@AncestorId)"); - cmd.Parameters.Add(cmd, "@AncestorId", DbType.Guid).Value = new Guid(query.AncestorIds[0]); - } - if (query.AncestorIds.Length > 1) - { - var inClause = string.Join(",", query.AncestorIds.Select(i => "'" + new Guid(i).ToString("N") + "'").ToArray()); - whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause)); - } - if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)) - { - var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey"; - whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorId in ({0}))", inClause)); - cmd.Parameters.Add(cmd, "@AncestorWithPresentationUniqueKey", DbType.String).Value = query.AncestorWithPresentationUniqueKey; - } - - if (query.BlockUnratedItems.Length == 1) - { - whereClauses.Add("(InheritedParentalRatingValue > 0 or UnratedType <> @UnratedType)"); - cmd.Parameters.Add(cmd, "@UnratedType", DbType.String).Value = query.BlockUnratedItems[0].ToString(); - } - if (query.BlockUnratedItems.Length > 1) - { - var inClause = string.Join(",", query.BlockUnratedItems.Select(i => "'" + i.ToString() + "'").ToArray()); - whereClauses.Add(string.Format("(InheritedParentalRatingValue > 0 or UnratedType not in ({0}))", inClause)); - } - - var excludeTagIndex = 0; - foreach (var excludeTag in query.ExcludeTags) - { - whereClauses.Add("(Tags is null OR Tags not like @excludeTag" + excludeTagIndex + ")"); - cmd.Parameters.Add(cmd, "@excludeTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; - excludeTagIndex++; - } - - excludeTagIndex = 0; - foreach (var excludeTag in query.ExcludeInheritedTags) - { - whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex + ")"); - cmd.Parameters.Add(cmd, "@excludeInheritedTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; - excludeTagIndex++; - } - - return whereClauses; - } - - private string GetCleanValue(string value) - { - if (string.IsNullOrWhiteSpace(value)) - { - return value; - } - - return value.RemoveDiacritics().ToLower(); - } - - private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query) - { - if (!query.GroupByPresentationUniqueKey) - { - return false; - } - - if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) - { - return false; - } - - if (query.User == null) - { - return false; - } - - if (query.IncludeItemTypes.Length == 0) - { - return true; - } - - var types = new[] { - typeof(Episode).Name, - typeof(Video).Name , - typeof(Movie).Name , - typeof(MusicVideo).Name , - typeof(Series).Name , - typeof(Season).Name }; - - if (types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase))) - { - return true; - } - - return false; - } - - private static readonly Type[] KnownTypes = - { - typeof(LiveTvProgram), - typeof(LiveTvChannel), - typeof(LiveTvVideoRecording), - typeof(LiveTvAudioRecording), - typeof(Series), - typeof(Audio), - typeof(MusicAlbum), - typeof(MusicArtist), - typeof(MusicGenre), - typeof(MusicVideo), - typeof(Movie), - typeof(Playlist), - typeof(AudioPodcast), - typeof(Trailer), - typeof(BoxSet), - typeof(Episode), - typeof(Season), - typeof(Series), - typeof(Book), - typeof(CollectionFolder), - typeof(Folder), - typeof(Game), - typeof(GameGenre), - typeof(GameSystem), - typeof(Genre), - typeof(Person), - typeof(Photo), - typeof(PhotoAlbum), - typeof(Studio), - typeof(UserRootFolder), - typeof(UserView), - typeof(Video), - typeof(Year), - typeof(Channel), - typeof(AggregateFolder) - }; - - public async Task UpdateInheritedValues(CancellationToken cancellationToken) - { - await UpdateInheritedTags(cancellationToken).ConfigureAwait(false); - } - - private async Task UpdateInheritedTags(CancellationToken cancellationToken) - { - var newValues = new List>(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - var id = reader.GetGuid(0); - string value = reader.IsDBNull(2) ? null : reader.GetString(2); - - newValues.Add(new Tuple(id, value)); - } - } - } - - Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count); - if (newValues.Count == 0) - { - return; - } - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - foreach (var item in newValues) - { - _updateInheritedTagsCommand.GetParameter(0).Value = item.Item1; - _updateInheritedTagsCommand.GetParameter(1).Value = item.Item2; - - _updateInheritedTagsCommand.Transaction = transaction; - _updateInheritedTagsCommand.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Error running query:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - private static Dictionary GetTypeMapDictionary() - { - var dict = new Dictionary(StringComparer.OrdinalIgnoreCase); - - foreach (var t in KnownTypes) - { - dict[t.Name] = new[] { t.FullName }; - } - - dict["Recording"] = new[] { typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName }; - dict["Program"] = new[] { typeof(LiveTvProgram).FullName }; - dict["TvChannel"] = new[] { typeof(LiveTvChannel).FullName }; - - return dict; - } - - // Not crazy about having this all the way down here, but at least it's in one place - readonly Dictionary _types = GetTypeMapDictionary(); - - private IEnumerable MapIncludeItemTypes(string value) - { - string[] result; - if (_types.TryGetValue(value, out result)) - { - return result; - } - - return new[] { value }; - } - - public async Task DeleteItem(Guid id, CancellationToken cancellationToken) - { - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - CheckDisposed(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - // Delete people - _deletePeopleCommand.GetParameter(0).Value = id; - _deletePeopleCommand.Transaction = transaction; - _deletePeopleCommand.ExecuteNonQuery(); - - // Delete chapters - _deleteChaptersCommand.GetParameter(0).Value = id; - _deleteChaptersCommand.Transaction = transaction; - _deleteChaptersCommand.ExecuteNonQuery(); - - // Delete media streams - _deleteStreamsCommand.GetParameter(0).Value = id; - _deleteStreamsCommand.Transaction = transaction; - _deleteStreamsCommand.ExecuteNonQuery(); - - // Delete ancestors - _deleteAncestorsCommand.GetParameter(0).Value = id; - _deleteAncestorsCommand.Transaction = transaction; - _deleteAncestorsCommand.ExecuteNonQuery(); - - // Delete item values - _deleteItemValuesCommand.GetParameter(0).Value = id; - _deleteItemValuesCommand.Transaction = transaction; - _deleteItemValuesCommand.ExecuteNonQuery(); - - // Delete the item - _deleteItemCommand.GetParameter(0).Value = id; - _deleteItemCommand.Transaction = transaction; - _deleteItemCommand.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save children:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - public List GetPeopleNames(InternalPeopleQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select Distinct Name from People"; - - var whereClauses = GetPeopleWhereClauses(query, cmd); - - if (whereClauses.Count > 0) - { - cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } - - cmd.CommandText += " order by ListOrder"; - - var list = new List(); - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - list.Add(reader.GetString(0)); - } - } - - return list; - } - } - - public List GetPeople(InternalPeopleQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select ItemId, Name, Role, PersonType, SortOrder from People"; - - var whereClauses = GetPeopleWhereClauses(query, cmd); - - if (whereClauses.Count > 0) - { - cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } - - cmd.CommandText += " order by ListOrder"; - - var list = new List(); - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - list.Add(GetPerson(reader)); - } - } - - return list; - } - } - - private List GetPeopleWhereClauses(InternalPeopleQuery query, IDbCommand cmd) - { - var whereClauses = new List(); - - if (query.ItemId != Guid.Empty) - { - whereClauses.Add("ItemId=@ItemId"); - cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = query.ItemId; - } - if (query.AppearsInItemId != Guid.Empty) - { - whereClauses.Add("Name in (Select Name from People where ItemId=@AppearsInItemId)"); - cmd.Parameters.Add(cmd, "@AppearsInItemId", DbType.Guid).Value = query.AppearsInItemId; - } - if (query.PersonTypes.Count == 1) - { - whereClauses.Add("PersonType=@PersonType"); - cmd.Parameters.Add(cmd, "@PersonType", DbType.String).Value = query.PersonTypes[0]; - } - if (query.PersonTypes.Count > 1) - { - var val = string.Join(",", query.PersonTypes.Select(i => "'" + i + "'").ToArray()); - - whereClauses.Add("PersonType in (" + val + ")"); - } - if (query.ExcludePersonTypes.Count == 1) - { - whereClauses.Add("PersonType<>@PersonType"); - cmd.Parameters.Add(cmd, "@PersonType", DbType.String).Value = query.ExcludePersonTypes[0]; - } - if (query.ExcludePersonTypes.Count > 1) - { - var val = string.Join(",", query.ExcludePersonTypes.Select(i => "'" + i + "'").ToArray()); - - whereClauses.Add("PersonType not in (" + val + ")"); - } - if (query.MaxListOrder.HasValue) - { - whereClauses.Add("ListOrder<=@MaxListOrder"); - cmd.Parameters.Add(cmd, "@MaxListOrder", DbType.Int32).Value = query.MaxListOrder.Value; - } - if (!string.IsNullOrWhiteSpace(query.NameContains)) - { - whereClauses.Add("Name like @NameContains"); - cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%"; - } - if (query.SourceTypes.Length == 1) - { - whereClauses.Add("(select sourcetype from typedbaseitems where guid=ItemId) = @SourceTypes"); - cmd.Parameters.Add(cmd, "@SourceTypes", DbType.String).Value = query.SourceTypes[0].ToString(); - } - - return whereClauses; - } - - private void UpdateAncestors(Guid itemId, List ancestorIds, IDbTransaction transaction) - { - if (itemId == Guid.Empty) - { - throw new ArgumentNullException("itemId"); - } - - if (ancestorIds == null) - { - throw new ArgumentNullException("ancestorIds"); - } - - CheckDisposed(); - - // First delete - _deleteAncestorsCommand.GetParameter(0).Value = itemId; - _deleteAncestorsCommand.Transaction = transaction; - - _deleteAncestorsCommand.ExecuteNonQuery(); - - foreach (var ancestorId in ancestorIds) - { - _saveAncestorCommand.GetParameter(0).Value = itemId; - _saveAncestorCommand.GetParameter(1).Value = ancestorId; - _saveAncestorCommand.GetParameter(2).Value = ancestorId.ToString("N"); - - _saveAncestorCommand.Transaction = transaction; - - _saveAncestorCommand.ExecuteNonQuery(); - } - } - - public QueryResult> GetAllArtists(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName); - } - - public QueryResult> GetArtists(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName); - } - - public QueryResult> GetAlbumArtists(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName); - } - - public QueryResult> GetStudios(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName); - } - - public QueryResult> GetGenres(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName); - } - - public QueryResult> GetGameGenres(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 2 }, typeof(GameGenre).FullName); - } - - public QueryResult> GetMusicGenres(InternalItemsQuery query) - { - return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName); - } - - public List GetStudioNames() - { - return GetItemValueNames(new[] { 3 }, new List(), new List()); - } - - public List GetAllArtistNames() - { - return GetItemValueNames(new[] { 0, 1 }, new List(), new List()); - } - - public List GetMusicGenreNames() - { - return GetItemValueNames(new[] { 2 }, new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" }, new List()); - } - - public List GetGameGenreNames() - { - return GetItemValueNames(new[] { 2 }, new List { "Game" }, new List()); - } - - public List GetGenreNames() - { - return GetItemValueNames(new[] { 2 }, new List(), new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist", "Game", "GameSystem" }); - } - - private List GetItemValueNames(int[] itemValueTypes, List withItemTypes, List excludeItemTypes) - { - CheckDisposed(); - - withItemTypes = withItemTypes.SelectMany(MapIncludeItemTypes).ToList(); - excludeItemTypes = excludeItemTypes.SelectMany(MapIncludeItemTypes).ToList(); - - var now = DateTime.UtcNow; - - var typeClause = itemValueTypes.Length == 1 ? - ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : - ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); - - var list = new List(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "Select Value From ItemValues where " + typeClause; - - if (withItemTypes.Count > 0) - { - var typeString = string.Join(",", withItemTypes.Select(i => "'" + i + "'").ToArray()); - cmd.CommandText += " AND ItemId In (select guid from typedbaseitems where type in (" + typeString + "))"; - } - if (excludeItemTypes.Count > 0) - { - var typeString = string.Join(",", excludeItemTypes.Select(i => "'" + i + "'").ToArray()); - cmd.CommandText += " AND ItemId not In (select guid from typedbaseitems where type in (" + typeString + "))"; - } - - cmd.CommandText += " Group By CleanValue"; - - var commandBehavior = CommandBehavior.SequentialAccess | CommandBehavior.SingleResult; - - using (var reader = cmd.ExecuteReader(commandBehavior)) - { - LogQueryTime("GetItemValueNames", cmd, now); - - while (reader.Read()) - { - if (!reader.IsDBNull(0)) - { - list.Add(reader.GetString(0)); - } - } - } - - } - - return list; - } - - private QueryResult> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - if (!query.Limit.HasValue) - { - query.EnableTotalRecordCount = false; - } - - CheckDisposed(); - - var now = DateTime.UtcNow; - - var typeClause = itemValueTypes.Length == 1 ? - ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : - ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); - - using (var cmd = _connection.CreateCommand()) - { - var itemCountColumns = new List>(); - - var typesToCount = query.IncludeItemTypes.ToList(); - - if (typesToCount.Count > 0) - { - var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B"); - - var typeSubQuery = new InternalItemsQuery(query.User) - { - ExcludeItemTypes = query.ExcludeItemTypes, - IncludeItemTypes = query.IncludeItemTypes, - MediaTypes = query.MediaTypes, - AncestorIds = query.AncestorIds, - ExcludeItemIds = query.ExcludeItemIds, - ItemIds = query.ItemIds, - TopParentIds = query.TopParentIds, - ParentId = query.ParentId, - IsPlayed = query.IsPlayed - }; - var whereClauses = GetWhereClauses(typeSubQuery, cmd, "itemTypes"); - - whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND " + typeClause + ")"); - - var typeWhereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - itemCountColumnQuery += typeWhereText; - - //itemCountColumnQuery += ")"; - - itemCountColumns.Add(new Tuple("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes")); - } - - var columns = _retriveItemColumns.ToList(); - columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray()); - - cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray(), cmd)) + GetFromText(); - cmd.CommandText += GetJoinUserDataText(query); - - var innerQuery = new InternalItemsQuery(query.User) - { - ExcludeItemTypes = query.ExcludeItemTypes, - IncludeItemTypes = query.IncludeItemTypes, - MediaTypes = query.MediaTypes, - AncestorIds = query.AncestorIds, - ExcludeItemIds = query.ExcludeItemIds, - ItemIds = query.ItemIds, - TopParentIds = query.TopParentIds, - ParentId = query.ParentId, - IsPlayed = query.IsPlayed - }; - - var innerWhereClauses = GetWhereClauses(innerQuery, cmd); - - var innerWhereText = innerWhereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", innerWhereClauses.ToArray()); - - var whereText = " where Type=@SelectType"; - - if (typesToCount.Count == 0) - { - whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; - } - else - { - //whereText += " And itemTypes not null"; - whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; - } - - var outerQuery = new InternalItemsQuery(query.User) - { - IsFavorite = query.IsFavorite, - IsFavoriteOrLiked = query.IsFavoriteOrLiked, - IsLiked = query.IsLiked, - IsLocked = query.IsLocked, - NameLessThan = query.NameLessThan, - NameStartsWith = query.NameStartsWith, - NameStartsWithOrGreater = query.NameStartsWithOrGreater, - AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater, - Tags = query.Tags, - OfficialRatings = query.OfficialRatings, - GenreIds = query.GenreIds, - Genres = query.Genres, - Years = query.Years - }; - - var outerWhereClauses = GetWhereClauses(outerQuery, cmd); - - whereText += outerWhereClauses.Count == 0 ? - string.Empty : - " AND " + string.Join(" AND ", outerWhereClauses.ToArray()); - //cmd.CommandText += GetGroupBy(query); - - cmd.CommandText += whereText; - cmd.CommandText += " group by PresentationUniqueKey"; - - cmd.Parameters.Add(cmd, "@SelectType", DbType.String).Value = returnType; - - if (EnableJoinUserData(query)) - { - cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - } - - cmd.CommandText += " order by SortName"; - - if (query.Limit.HasValue || query.StartIndex.HasValue) - { - var offset = query.StartIndex ?? 0; - - if (query.Limit.HasValue || offset > 0) - { - cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - } - - if (offset > 0) - { - cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - } - } - - cmd.CommandText += ";"; - - var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - - if (isReturningZeroItems) - { - cmd.CommandText = ""; - } - - if (query.EnableTotalRecordCount) - { - cmd.CommandText += "select count (distinct PresentationUniqueKey)" + GetFromText(); - - cmd.CommandText += GetJoinUserDataText(query); - cmd.CommandText += whereText; - } - else - { - cmd.CommandText = cmd.CommandText.TrimEnd(';'); - } - - var list = new List>(); - var count = 0; - - var commandBehavior = isReturningZeroItems || !query.EnableTotalRecordCount - ? (CommandBehavior.SequentialAccess | CommandBehavior.SingleResult) - : CommandBehavior.SequentialAccess; - - //Logger.Debug("GetItemValues: " + cmd.CommandText); - - using (var reader = cmd.ExecuteReader(commandBehavior)) - { - LogQueryTime("GetItemValues", cmd, now); - - if (isReturningZeroItems) - { - if (reader.Read()) - { - count = reader.GetInt32(0); - } - } - else - { - while (reader.Read()) - { - var item = GetItem(reader); - if (item != null) - { - var countStartColumn = columns.Count - 1; - - list.Add(new Tuple(item, GetItemCounts(reader, countStartColumn, typesToCount))); - } - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - } - - if (count == 0) - { - count = list.Count; - } - - return new QueryResult> - { - Items = list.ToArray(), - TotalRecordCount = count - }; - - } - } - - private ItemCounts GetItemCounts(IDataReader reader, int countStartColumn, List typesToCount) - { - var counts = new ItemCounts(); - - if (typesToCount.Count == 0) - { - return counts; - } - - var typeString = reader.IsDBNull(countStartColumn) ? null : reader.GetString(countStartColumn); - - if (string.IsNullOrWhiteSpace(typeString)) - { - return counts; - } - - var allTypes = typeString.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries) - .ToLookup(i => i).ToList(); - - foreach (var type in allTypes) - { - var value = type.ToList().Count; - var typeName = type.Key; - - if (string.Equals(typeName, typeof(Series).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.SeriesCount = value; - } - else if (string.Equals(typeName, typeof(Episode).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.EpisodeCount = value; - } - else if (string.Equals(typeName, typeof(Movie).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.MovieCount = value; - } - else if (string.Equals(typeName, typeof(MusicAlbum).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.AlbumCount = value; - } - else if (string.Equals(typeName, typeof(MusicArtist).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.ArtistCount = value; - } - else if (string.Equals(typeName, typeof(Audio).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.SongCount = value; - } - else if (string.Equals(typeName, typeof(Game).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.GameCount = value; - } - else if (string.Equals(typeName, typeof(Trailer).FullName, StringComparison.OrdinalIgnoreCase)) - { - counts.TrailerCount = value; - } - counts.ItemCount += value; - } - - return counts; - } - - private List> GetItemValuesToSave(BaseItem item) - { - var list = new List>(); - - var hasArtist = item as IHasArtist; - if (hasArtist != null) - { - list.AddRange(hasArtist.Artists.Select(i => new Tuple(0, i))); - } - - var hasAlbumArtist = item as IHasAlbumArtist; - if (hasAlbumArtist != null) - { - list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple(1, i))); - } - - list.AddRange(item.Genres.Select(i => new Tuple(2, i))); - list.AddRange(item.Studios.Select(i => new Tuple(3, i))); - list.AddRange(item.Tags.Select(i => new Tuple(4, i))); - list.AddRange(item.Keywords.Select(i => new Tuple(5, i))); - - return list; - } - - private void UpdateItemValues(Guid itemId, List> values, IDbTransaction transaction) - { - if (itemId == Guid.Empty) - { - throw new ArgumentNullException("itemId"); - } - - if (values == null) - { - throw new ArgumentNullException("keys"); - } - - CheckDisposed(); - - // First delete - _deleteItemValuesCommand.GetParameter(0).Value = itemId; - _deleteItemValuesCommand.Transaction = transaction; - - _deleteItemValuesCommand.ExecuteNonQuery(); - - foreach (var pair in values) - { - _saveItemValuesCommand.GetParameter(0).Value = itemId; - _saveItemValuesCommand.GetParameter(1).Value = pair.Item1; - _saveItemValuesCommand.GetParameter(2).Value = pair.Item2; - if (pair.Item2 == null) - { - _saveItemValuesCommand.GetParameter(3).Value = null; - } - else - { - _saveItemValuesCommand.GetParameter(3).Value = GetCleanValue(pair.Item2); - } - _saveItemValuesCommand.Transaction = transaction; - - _saveItemValuesCommand.ExecuteNonQuery(); - } - } - - public async Task UpdatePeople(Guid itemId, List people) - { - if (itemId == Guid.Empty) - { - throw new ArgumentNullException("itemId"); - } - - if (people == null) - { - throw new ArgumentNullException("people"); - } - - CheckDisposed(); - - var cancellationToken = CancellationToken.None; - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - // First delete - _deletePeopleCommand.GetParameter(0).Value = itemId; - _deletePeopleCommand.Transaction = transaction; - - _deletePeopleCommand.ExecuteNonQuery(); - - var listIndex = 0; - - foreach (var person in people) - { - cancellationToken.ThrowIfCancellationRequested(); - - _savePersonCommand.GetParameter(0).Value = itemId; - _savePersonCommand.GetParameter(1).Value = person.Name; - _savePersonCommand.GetParameter(2).Value = person.Role; - _savePersonCommand.GetParameter(3).Value = person.Type; - _savePersonCommand.GetParameter(4).Value = person.SortOrder; - _savePersonCommand.GetParameter(5).Value = listIndex; - - _savePersonCommand.Transaction = transaction; - - _savePersonCommand.ExecuteNonQuery(); - listIndex++; - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save people:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - private PersonInfo GetPerson(IDataReader reader) - { - var item = new PersonInfo(); - - item.ItemId = reader.GetGuid(0); - item.Name = reader.GetString(1); - - if (!reader.IsDBNull(2)) - { - item.Role = reader.GetString(2); - } - - if (!reader.IsDBNull(3)) - { - item.Type = reader.GetString(3); - } - - if (!reader.IsDBNull(4)) - { - item.SortOrder = reader.GetInt32(4); - } - - return item; - } - - public IEnumerable GetMediaStreams(MediaStreamQuery query) - { - CheckDisposed(); - - if (query == null) - { - throw new ArgumentNullException("query"); - } - - var list = new List(); - - using (var cmd = _connection.CreateCommand()) - { - var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where"; - - cmdText += " ItemId=@ItemId"; - cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = query.ItemId; - - if (query.Type.HasValue) - { - cmdText += " AND StreamType=@StreamType"; - cmd.Parameters.Add(cmd, "@StreamType", DbType.String).Value = query.Type.Value.ToString(); - } - - if (query.Index.HasValue) - { - cmdText += " AND StreamIndex=@StreamIndex"; - cmd.Parameters.Add(cmd, "@StreamIndex", DbType.Int32).Value = query.Index.Value; - } - - cmdText += " order by StreamIndex ASC"; - - cmd.CommandText = cmdText; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - list.Add(GetMediaStream(reader)); - } - } - } - - return list; - } - - public async Task SaveMediaStreams(Guid id, List streams, CancellationToken cancellationToken) - { - CheckDisposed(); - - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - if (streams == null) - { - throw new ArgumentNullException("streams"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - // First delete chapters - _deleteStreamsCommand.GetParameter(0).Value = id; - - _deleteStreamsCommand.Transaction = transaction; - - _deleteStreamsCommand.ExecuteNonQuery(); - - foreach (var stream in streams) - { - cancellationToken.ThrowIfCancellationRequested(); - - var index = 0; - - _saveStreamCommand.GetParameter(index++).Value = id; - _saveStreamCommand.GetParameter(index++).Value = stream.Index; - _saveStreamCommand.GetParameter(index++).Value = stream.Type.ToString(); - _saveStreamCommand.GetParameter(index++).Value = stream.Codec; - _saveStreamCommand.GetParameter(index++).Value = stream.Language; - _saveStreamCommand.GetParameter(index++).Value = stream.ChannelLayout; - _saveStreamCommand.GetParameter(index++).Value = stream.Profile; - _saveStreamCommand.GetParameter(index++).Value = stream.AspectRatio; - _saveStreamCommand.GetParameter(index++).Value = stream.Path; - - _saveStreamCommand.GetParameter(index++).Value = stream.IsInterlaced; - - _saveStreamCommand.GetParameter(index++).Value = stream.BitRate; - _saveStreamCommand.GetParameter(index++).Value = stream.Channels; - _saveStreamCommand.GetParameter(index++).Value = stream.SampleRate; - - _saveStreamCommand.GetParameter(index++).Value = stream.IsDefault; - _saveStreamCommand.GetParameter(index++).Value = stream.IsForced; - _saveStreamCommand.GetParameter(index++).Value = stream.IsExternal; - - _saveStreamCommand.GetParameter(index++).Value = stream.Width; - _saveStreamCommand.GetParameter(index++).Value = stream.Height; - _saveStreamCommand.GetParameter(index++).Value = stream.AverageFrameRate; - _saveStreamCommand.GetParameter(index++).Value = stream.RealFrameRate; - _saveStreamCommand.GetParameter(index++).Value = stream.Level; - _saveStreamCommand.GetParameter(index++).Value = stream.PixelFormat; - _saveStreamCommand.GetParameter(index++).Value = stream.BitDepth; - _saveStreamCommand.GetParameter(index++).Value = stream.IsAnamorphic; - _saveStreamCommand.GetParameter(index++).Value = stream.RefFrames; - - _saveStreamCommand.GetParameter(index++).Value = stream.CodecTag; - _saveStreamCommand.GetParameter(index++).Value = stream.Comment; - _saveStreamCommand.GetParameter(index++).Value = stream.NalLengthSize; - _saveStreamCommand.GetParameter(index++).Value = stream.IsAVC; - _saveStreamCommand.GetParameter(index++).Value = stream.Title; - - _saveStreamCommand.GetParameter(index++).Value = stream.TimeBase; - _saveStreamCommand.GetParameter(index++).Value = stream.CodecTimeBase; - - _saveStreamCommand.Transaction = transaction; - _saveStreamCommand.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save media streams:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - /// - /// Gets the chapter. - /// - /// The reader. - /// ChapterInfo. - private MediaStream GetMediaStream(IDataReader reader) - { - var item = new MediaStream - { - Index = reader.GetInt32(1) - }; - - item.Type = (MediaStreamType)Enum.Parse(typeof(MediaStreamType), reader.GetString(2), true); - - if (!reader.IsDBNull(3)) - { - item.Codec = reader.GetString(3); - } - - if (!reader.IsDBNull(4)) - { - item.Language = reader.GetString(4); - } - - if (!reader.IsDBNull(5)) - { - item.ChannelLayout = reader.GetString(5); - } - - if (!reader.IsDBNull(6)) - { - item.Profile = reader.GetString(6); - } - - if (!reader.IsDBNull(7)) - { - item.AspectRatio = reader.GetString(7); - } - - if (!reader.IsDBNull(8)) - { - item.Path = reader.GetString(8); - } - - item.IsInterlaced = reader.GetBoolean(9); - - if (!reader.IsDBNull(10)) - { - item.BitRate = reader.GetInt32(10); - } - - if (!reader.IsDBNull(11)) - { - item.Channels = reader.GetInt32(11); - } - - if (!reader.IsDBNull(12)) - { - item.SampleRate = reader.GetInt32(12); - } - - item.IsDefault = reader.GetBoolean(13); - item.IsForced = reader.GetBoolean(14); - item.IsExternal = reader.GetBoolean(15); - - if (!reader.IsDBNull(16)) - { - item.Width = reader.GetInt32(16); - } - - if (!reader.IsDBNull(17)) - { - item.Height = reader.GetInt32(17); - } - - if (!reader.IsDBNull(18)) - { - item.AverageFrameRate = reader.GetFloat(18); - } - - if (!reader.IsDBNull(19)) - { - item.RealFrameRate = reader.GetFloat(19); - } - - if (!reader.IsDBNull(20)) - { - item.Level = reader.GetFloat(20); - } - - if (!reader.IsDBNull(21)) - { - item.PixelFormat = reader.GetString(21); - } - - if (!reader.IsDBNull(22)) - { - item.BitDepth = reader.GetInt32(22); - } - - if (!reader.IsDBNull(23)) - { - item.IsAnamorphic = reader.GetBoolean(23); - } - - if (!reader.IsDBNull(24)) - { - item.RefFrames = reader.GetInt32(24); - } - - if (!reader.IsDBNull(25)) - { - item.CodecTag = reader.GetString(25); - } - - if (!reader.IsDBNull(26)) - { - item.Comment = reader.GetString(26); - } - - if (!reader.IsDBNull(27)) - { - item.NalLengthSize = reader.GetString(27); - } - - if (!reader.IsDBNull(28)) - { - item.IsAVC = reader.GetBoolean(28); - } - - if (!reader.IsDBNull(29)) - { - item.Title = reader.GetString(29); - } - - if (!reader.IsDBNull(30)) - { - item.TimeBase = reader.GetString(30); - } - - if (!reader.IsDBNull(31)) - { - item.CodecTimeBase = reader.GetString(31); - } - - return item; - } - - } -} \ No newline at end of file diff --git a/Emby.Server.Core/Data/SqliteUserDataRepository.cs b/Emby.Server.Core/Data/SqliteUserDataRepository.cs deleted file mode 100644 index 2c883e043..000000000 --- a/Emby.Server.Core/Data/SqliteUserDataRepository.cs +++ /dev/null @@ -1,453 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Globalization; -using System.IO; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Common.Configuration; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Model.Logging; - -namespace Emby.Server.Core.Data -{ - public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository - { - private IDbConnection _connection; - - public SqliteUserDataRepository(ILogManager logManager, IApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector) - { - DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); - } - - protected override bool EnableConnectionPooling - { - get { return false; } - } - - /// - /// Gets the name of the repository - /// - /// The name. - public string Name - { - get - { - return "SQLite"; - } - } - - protected override async Task CreateConnection(bool isReadOnly = false) - { - var connection = await DbConnector.Connect(DbFilePath, false, false, 10000).ConfigureAwait(false); - - connection.RunQueries(new[] - { - "pragma temp_store = memory" - - }, Logger); - - return connection; - } - - /// - /// Opens the connection to the database - /// - /// Task. - public async Task Initialize(IDbConnection connection, SemaphoreSlim writeLock) - { - WriteLock.Dispose(); - WriteLock = writeLock; - _connection = connection; - - string[] queries = { - - "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", - - "drop index if exists UserDataDb.idx_userdata", - "drop index if exists UserDataDb.idx_userdata1", - "drop index if exists UserDataDb.idx_userdata2", - "drop index if exists UserDataDb.userdataindex1", - - "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", - "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", - "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", - "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", - - //pragmas - "pragma temp_store = memory", - - "pragma shrink_memory" - }; - - _connection.RunQueries(queries, Logger); - - _connection.AddColumn(Logger, "userdata", "AudioStreamIndex", "int"); - _connection.AddColumn(Logger, "userdata", "SubtitleStreamIndex", "int"); - } - - /// - /// Saves the user data. - /// - /// The user id. - /// The key. - /// The user data. - /// The cancellation token. - /// Task. - /// userData - /// or - /// cancellationToken - /// or - /// userId - /// or - /// userDataId - public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) - { - if (userData == null) - { - throw new ArgumentNullException("userData"); - } - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (string.IsNullOrEmpty(key)) - { - throw new ArgumentNullException("key"); - } - - return PersistUserData(userId, key, userData, cancellationToken); - } - - public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) - { - if (userData == null) - { - throw new ArgumentNullException("userData"); - } - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - - return PersistAllUserData(userId, userData, cancellationToken); - } - - /// - /// Persists the user data. - /// - /// The user id. - /// The key. - /// The user data. - /// The cancellation token. - /// Task. - public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; - - cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; - cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userData.Rating; - cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userData.Played; - cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userData.PlayCount; - cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userData.IsFavorite; - cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userData.PlaybackPositionTicks; - cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userData.LastPlayedDate; - cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userData.AudioStreamIndex; - cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userData.SubtitleStreamIndex; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save user data:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - /// - /// Persist all user data for the specified user - /// - /// - /// - /// - /// - private async Task PersistAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) - { - cancellationToken.ThrowIfCancellationRequested(); - - await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - - IDbTransaction transaction = null; - - try - { - transaction = _connection.BeginTransaction(); - - foreach (var userItemData in userData) - { - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"; - - cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userItemData.Key; - cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - cmd.Parameters.Add(cmd, "@rating", DbType.Double).Value = userItemData.Rating; - cmd.Parameters.Add(cmd, "@played", DbType.Boolean).Value = userItemData.Played; - cmd.Parameters.Add(cmd, "@playCount", DbType.Int32).Value = userItemData.PlayCount; - cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userItemData.IsFavorite; - cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userItemData.PlaybackPositionTicks; - cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userItemData.LastPlayedDate; - cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userItemData.AudioStreamIndex; - cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userItemData.SubtitleStreamIndex; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - } - - cancellationToken.ThrowIfCancellationRequested(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save user data:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - - WriteLock.Release(); - } - } - - /// - /// Gets the user data. - /// - /// The user id. - /// The key. - /// Task{UserItemData}. - /// - /// userId - /// or - /// key - /// - public UserItemData GetUserData(Guid userId, string key) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (string.IsNullOrEmpty(key)) - { - throw new ArgumentNullException("key"); - } - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = @key and userId=@userId"; - - cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key; - cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return ReadRow(reader); - } - } - - return null; - } - } - - public UserItemData GetUserData(Guid userId, List keys) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - if (keys == null) - { - throw new ArgumentNullException("keys"); - } - - using (var cmd = _connection.CreateCommand()) - { - var index = 0; - var userdataKeys = new List(); - var builder = new StringBuilder(); - foreach (var key in keys) - { - var paramName = "@Key" + index; - userdataKeys.Add("Key =" + paramName); - cmd.Parameters.Add(cmd, paramName, DbType.String).Value = key; - builder.Append(" WHEN Key=" + paramName + " THEN " + index); - index++; - break; - } - - var keyText = string.Join(" OR ", userdataKeys.ToArray()); - - cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId AND (" + keyText + ") "; - - cmd.CommandText += " ORDER BY (Case " + builder + " Else " + keys.Count.ToString(CultureInfo.InvariantCulture) + " End )"; - cmd.CommandText += " LIMIT 1"; - - cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return ReadRow(reader); - } - } - - return null; - } - } - - /// - /// Return all user-data associated with the given user - /// - /// - /// - public IEnumerable GetAllUserData(Guid userId) - { - if (userId == Guid.Empty) - { - throw new ArgumentNullException("userId"); - } - - using (var cmd = _connection.CreateCommand()) - { - cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId"; - - cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - yield return ReadRow(reader); - } - } - } - } - - /// - /// Read a row from the specified reader into the provided userData object - /// - /// - private UserItemData ReadRow(IDataReader reader) - { - var userData = new UserItemData(); - - userData.Key = reader.GetString(0); - userData.UserId = reader.GetGuid(1); - - if (!reader.IsDBNull(2)) - { - userData.Rating = reader.GetDouble(2); - } - - userData.Played = reader.GetBoolean(3); - userData.PlayCount = reader.GetInt32(4); - userData.IsFavorite = reader.GetBoolean(5); - userData.PlaybackPositionTicks = reader.GetInt64(6); - - if (!reader.IsDBNull(7)) - { - userData.LastPlayedDate = reader.GetDateTime(7).ToUniversalTime(); - } - - if (!reader.IsDBNull(8)) - { - userData.AudioStreamIndex = reader.GetInt32(8); - } - - if (!reader.IsDBNull(9)) - { - userData.SubtitleStreamIndex = reader.GetInt32(9); - } - - return userData; - } - - protected override void Dispose(bool dispose) - { - // handled by library database - } - - protected override void CloseConnection() - { - // handled by library database - } - } -} \ No newline at end of file diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs index 3f11b6eb0..5bc3a625f 100644 --- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs +++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs @@ -135,9 +135,9 @@ namespace Emby.Server.Implementations.Data }); var numComplete = 0; - var numItems = result.Items.Length; + var numItems = result.Count; - foreach (var item in result.Items) + foreach (var item in result) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index 657dadfe5..e4e91626d 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -173,6 +173,16 @@ namespace Emby.Server.Implementations.Data return result[index].ReadGuid(); } + private static void CheckName(string name) + { +#if DEBUG + //if (!name.IndexOf("@", StringComparison.OrdinalIgnoreCase) != 0) + { + throw new Exception("Invalid param name: " + name); + } +#endif + } + public static void TryBind(this IStatement statement, string name, double value) { IBindParameter bindParam; @@ -180,6 +190,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, string value) @@ -187,7 +201,18 @@ namespace Emby.Server.Implementations.Data IBindParameter bindParam; if (statement.BindParameters.TryGetValue(name, out bindParam)) { - bindParam.Bind(value); + if (value == null) + { + bindParam.BindNull(); + } + else + { + bindParam.Bind(value); + } + } + else + { + CheckName(name); } } @@ -198,6 +223,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, float value) @@ -207,6 +236,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, int value) @@ -216,6 +249,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, Guid value) @@ -225,6 +262,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value.ToGuidParamValue()); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, DateTime value) @@ -234,6 +275,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value.ToDateTimeParamValue()); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, long value) @@ -243,6 +288,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, byte[] value) @@ -252,6 +301,10 @@ namespace Emby.Server.Implementations.Data { bindParam.Bind(value); } + else + { + CheckName(name); + } } public static void TryBindNull(this IStatement statement, string name) @@ -261,6 +314,10 @@ namespace Emby.Server.Implementations.Data { bindParam.BindNull(); } + else + { + CheckName(name); + } } public static void TryBind(this IStatement statement, string name, DateTime? value) diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 32cfecfce..a3c1ee690 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -1,5299 +1,5332 @@ -//using System; -//using System.Collections.Generic; -//using System.Globalization; -//using System.IO; -//using System.Linq; -//using System.Runtime.Serialization; -//using System.Text; -//using System.Threading; -//using System.Threading.Tasks; -//using MediaBrowser.Controller.Channels; -//using MediaBrowser.Controller.Collections; -//using MediaBrowser.Controller.Configuration; -//using MediaBrowser.Controller.Entities; -//using MediaBrowser.Controller.Entities.Audio; -//using MediaBrowser.Controller.Entities.Movies; -//using MediaBrowser.Controller.Entities.TV; -//using MediaBrowser.Controller.Extensions; -//using MediaBrowser.Controller.LiveTv; -//using MediaBrowser.Controller.Persistence; -//using MediaBrowser.Controller.Playlists; -//using MediaBrowser.Model.Dto; -//using MediaBrowser.Model.Entities; -//using MediaBrowser.Model.IO; -//using MediaBrowser.Model.LiveTv; -//using MediaBrowser.Model.Logging; -//using MediaBrowser.Model.Querying; -//using MediaBrowser.Model.Serialization; -//using MediaBrowser.Server.Implementations.Devices; -//using MediaBrowser.Server.Implementations.Playlists; -//using MediaBrowser.Model.Reflection; -//using SQLitePCL.pretty; - -//namespace Emby.Server.Implementations.Data -//{ -// /// -// /// Class SQLiteItemRepository -// /// -// public class SqliteItemRepository : BaseSqliteRepository, IItemRepository -// { -// private SQLiteDatabaseConnection _connection; - -// private readonly TypeMapper _typeMapper; - -// /// -// /// Gets the name of the repository -// /// -// /// The name. -// public string Name -// { -// get -// { -// return "SQLite"; -// } -// } - -// /// -// /// Gets the json serializer. -// /// -// /// The json serializer. -// private readonly IJsonSerializer _jsonSerializer; - -// /// -// /// The _app paths -// /// -// private readonly IServerConfigurationManager _config; - -// /// -// /// The _save item command -// /// -// private IDbCommand _saveItemCommand; - -// private readonly string _criticReviewsPath; - -// private IDbCommand _deleteItemCommand; - -// private IDbCommand _deletePeopleCommand; -// private IDbCommand _savePersonCommand; - -// private IDbCommand _deleteChaptersCommand; -// private IDbCommand _saveChapterCommand; - -// private IDbCommand _deleteStreamsCommand; -// private IDbCommand _saveStreamCommand; - -// private IDbCommand _deleteAncestorsCommand; -// private IDbCommand _saveAncestorCommand; - -// private IDbCommand _deleteItemValuesCommand; -// private IDbCommand _saveItemValuesCommand; - -// private IDbCommand _updateInheritedTagsCommand; - -// public const int LatestSchemaVersion = 109; -// private readonly IMemoryStreamFactory _memoryStreamProvider; - -// /// -// /// Initializes a new instance of the class. -// /// -// public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo) -// : base(logger) -// { -// if (config == null) -// { -// throw new ArgumentNullException("config"); -// } -// if (jsonSerializer == null) -// { -// throw new ArgumentNullException("jsonSerializer"); -// } - -// _config = config; -// _jsonSerializer = jsonSerializer; -// _memoryStreamProvider = memoryStreamProvider; -// _typeMapper = new TypeMapper(assemblyInfo); - -// _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews"); -// DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db"); -// } - -// private const string ChaptersTableName = "Chapters2"; - -// protected override int? CacheSize -// { -// get -// { -// var cacheSize = _config.Configuration.SqliteCacheSize; -// if (cacheSize <= 0) -// { -// cacheSize = Math.Min(Environment.ProcessorCount * 50000, 100000); -// } - -// return 0 - cacheSize; -// } -// } - -// /// -// /// Opens the connection to the database -// /// -// /// Task. -// public async Task Initialize(SqliteUserDataRepository userDataRepo) -// { -// _connection = CreateConnection(false); - -// var createMediaStreamsTableCommand -// = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; - -// string[] queries = { - -// "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)", - -// "create table if not exists AncestorIds (ItemId GUID, AncestorId GUID, AncestorIdText TEXT, PRIMARY KEY (ItemId, AncestorId))", -// "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)", -// "create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)", - -// "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)", - -// "create table if not exists People (ItemId GUID, Name TEXT NOT NULL, Role TEXT, PersonType TEXT, SortOrder int, ListOrder int)", - -// "drop index if exists idxPeopleItemId", -// "create index if not exists idxPeopleItemId1 on People(ItemId,ListOrder)", -// "create index if not exists idxPeopleName on People(Name)", - -// "create table if not exists "+ChaptersTableName+" (ItemId GUID, ChapterIndex INT, StartPositionTicks BIGINT, Name TEXT, ImagePath TEXT, PRIMARY KEY (ItemId, ChapterIndex))", - -// createMediaStreamsTableCommand, - -// "create index if not exists idx_mediastreams1 on mediastreams(ItemId)" - -// }; - -// _connection.RunQueries(queries); - -// _connection.RunInTransaction(db => -// { -// var existingColumnNames = GetColumnNames(db, "AncestorIds"); -// AddColumn(db, "AncestorIds", "AncestorIdText", "Text", existingColumnNames); - -// existingColumnNames = GetColumnNames(db, "TypedBaseItems"); - -// AddColumn(db, "TypedBaseItems", "Path", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "StartDate", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "EndDate", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ChannelId", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsMovie", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsSports", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsKids", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "CommunityRating", "Float", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "CustomRating", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IndexNumber", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsLocked", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Name", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "OfficialRating", "Text", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "MediaType", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Overview", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ParentIndexNumber", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "PremiereDate", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ParentId", "GUID", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Genres", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SchemaVersion", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "OfficialRatingDescription", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "HomePageUrl", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "VoteCount", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "DisplayMediaType", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "DateCreated", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsOffline", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "LocationType", "Text", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsLive", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsNews", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsPremiere", "BIT", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "EpisodeTitle", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsRepeat", "BIT", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "PreferredMetadataLanguage", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "PreferredMetadataCountryCode", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsHD", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ExternalEtag", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "DateLastRefreshed", "DATETIME", existingColumnNames); - -// AddColumn(db, "TypedBaseItems", "DateLastSaved", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsInMixedFolder", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "LockedFields", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Studios", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Audio", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ExternalServiceId", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Tags", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsFolder", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "InheritedParentalRatingValue", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "UnratedType", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "TopParentId", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsItemByName", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SourceType", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "TrailerTypes", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "CriticRating", "Float", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "CriticRatingSummary", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "InheritedTags", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "CleanName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "PresentationUniqueKey", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SlugName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "OriginalTitle", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "PrimaryVersionId", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "DateLastMediaAdded", "DATETIME", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Album", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "IsVirtualItem", "BIT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SeriesName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "UserDataKey", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SeasonName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SeasonId", "GUID", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SeriesId", "GUID", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "SeriesSortName", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ExternalSeriesId", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ShortOverview", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Tagline", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Keywords", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ProviderIds", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Images", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ProductionLocations", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ThemeSongIds", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ThemeVideoIds", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "TotalBitrate", "INT", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ExtraType", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "Artists", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "AlbumArtists", "Text", existingColumnNames); -// AddColumn(db, "TypedBaseItems", "ExternalId", "Text", existingColumnNames); - -// existingColumnNames = GetColumnNames(db, "ItemValues"); -// AddColumn(db, "ItemValues", "CleanValue", "Text", existingColumnNames); - -// existingColumnNames = GetColumnNames(db, ChaptersTableName); -// AddColumn(db, ChaptersTableName, "ImageDateModified", "DATETIME", existingColumnNames); - -// existingColumnNames = GetColumnNames(db, "MediaStreams"); -// AddColumn(db, "MediaStreams", "IsAvc", "BIT", existingColumnNames); -// AddColumn(db, "MediaStreams", "TimeBase", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "CodecTimeBase", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "Title", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "NalLengthSize", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "Comment", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "CodecTag", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "PixelFormat", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "BitDepth", "INT", existingColumnNames); -// AddColumn(db, "MediaStreams", "RefFrames", "INT", existingColumnNames); -// AddColumn(db, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames); -// AddColumn(db, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames); -// }); - -// string[] postQueries = - -// { -// // obsolete -// "drop index if exists idx_TypedBaseItems", -// "drop index if exists idx_mediastreams", -// "drop index if exists idx_"+ChaptersTableName, -// "drop index if exists idx_UserDataKeys1", -// "drop index if exists idx_UserDataKeys2", -// "drop index if exists idx_TypeTopParentId3", -// "drop index if exists idx_TypeTopParentId2", -// "drop index if exists idx_TypeTopParentId4", -// "drop index if exists idx_Type", -// "drop index if exists idx_TypeTopParentId", -// "drop index if exists idx_GuidType", -// "drop index if exists idx_TopParentId", -// "drop index if exists idx_TypeTopParentId6", -// "drop index if exists idx_ItemValues2", -// "drop index if exists Idx_ProviderIds", -// "drop index if exists idx_ItemValues3", -// "drop index if exists idx_ItemValues4", -// "drop index if exists idx_ItemValues5", -// "drop index if exists idx_UserDataKeys3", -// "drop table if exists UserDataKeys", -// "drop table if exists ProviderIds", -// "drop index if exists Idx_ProviderIds1", -// "drop table if exists Images", -// "drop index if exists idx_Images", - -// "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", -// "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", - -// "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)", -// "create index if not exists idx_GuidTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,Type,IsFolder,IsVirtualItem)", -// //"create index if not exists idx_GuidMediaTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,MediaType,IsFolder,IsVirtualItem)", -// "create index if not exists idx_CleanNameType on TypedBaseItems(CleanName,Type)", - -// // covering index -// "create index if not exists idx_TopParentIdGuid on TypedBaseItems(TopParentId,Guid)", - -// // live tv programs -// "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)", - -// // covering index for getitemvalues -// "create index if not exists idx_TypeTopParentIdGuid on TypedBaseItems(Type,TopParentId,Guid)", - -// // used by movie suggestions -// "create index if not exists idx_TypeTopParentIdGroup on TypedBaseItems(Type,TopParentId,PresentationUniqueKey)", -// "create index if not exists idx_TypeTopParentId5 on TypedBaseItems(TopParentId,IsVirtualItem)", - -// // latest items -// "create index if not exists idx_TypeTopParentId9 on TypedBaseItems(TopParentId,Type,IsVirtualItem,PresentationUniqueKey,DateCreated)", -// "create index if not exists idx_TypeTopParentId8 on TypedBaseItems(TopParentId,IsFolder,IsVirtualItem,PresentationUniqueKey,DateCreated)", - -// // resume -// "create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)", - -// // items by name -// "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)", -// "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)" -// }; - -// _connection.RunQueries(postQueries); - -// PrepareStatements(); - -// SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); -// userDataRepo.Initialize(_connection, WriteLock); -// //await Vacuum(_connection).ConfigureAwait(false); -// } - -// private readonly string[] _retriveItemColumns = -// { -// "type", -// "data", -// "StartDate", -// "EndDate", -// "IsOffline", -// "ChannelId", -// "IsMovie", -// "IsSports", -// "IsKids", -// "IsSeries", -// "IsLive", -// "IsNews", -// "IsPremiere", -// "EpisodeTitle", -// "IsRepeat", -// "CommunityRating", -// "CustomRating", -// "IndexNumber", -// "IsLocked", -// "PreferredMetadataLanguage", -// "PreferredMetadataCountryCode", -// "IsHD", -// "ExternalEtag", -// "DateLastRefreshed", -// "Name", -// "Path", -// "PremiereDate", -// "Overview", -// "ParentIndexNumber", -// "ProductionYear", -// "OfficialRating", -// "OfficialRatingDescription", -// "HomePageUrl", -// "DisplayMediaType", -// "ForcedSortName", -// "RunTimeTicks", -// "VoteCount", -// "DateCreated", -// "DateModified", -// "guid", -// "Genres", -// "ParentId", -// "Audio", -// "ExternalServiceId", -// "IsInMixedFolder", -// "DateLastSaved", -// "LockedFields", -// "Studios", -// "Tags", -// "SourceType", -// "TrailerTypes", -// "OriginalTitle", -// "PrimaryVersionId", -// "DateLastMediaAdded", -// "Album", -// "CriticRating", -// "CriticRatingSummary", -// "IsVirtualItem", -// "SeriesName", -// "SeasonName", -// "SeasonId", -// "SeriesId", -// "SeriesSortName", -// "PresentationUniqueKey", -// "InheritedParentalRatingValue", -// "InheritedTags", -// "ExternalSeriesId", -// "ShortOverview", -// "Tagline", -// "Keywords", -// "ProviderIds", -// "Images", -// "ProductionLocations", -// "ThemeSongIds", -// "ThemeVideoIds", -// "TotalBitrate", -// "ExtraType", -// "Artists", -// "AlbumArtists", -// "ExternalId" -// }; - -// private readonly string[] _mediaStreamSaveColumns = -// { -// "ItemId", -// "StreamIndex", -// "StreamType", -// "Codec", -// "Language", -// "ChannelLayout", -// "Profile", -// "AspectRatio", -// "Path", -// "IsInterlaced", -// "BitRate", -// "Channels", -// "SampleRate", -// "IsDefault", -// "IsForced", -// "IsExternal", -// "Height", -// "Width", -// "AverageFrameRate", -// "RealFrameRate", -// "Level", -// "PixelFormat", -// "BitDepth", -// "IsAnamorphic", -// "RefFrames", -// "CodecTag", -// "Comment", -// "NalLengthSize", -// "IsAvc", -// "Title", -// "TimeBase", -// "CodecTimeBase" -// }; - -// /// -// /// Prepares the statements. -// /// -// private void PrepareStatements() -// { -// var saveColumns = new List -// { -// "guid", -// "type", -// "data", -// "Path", -// "StartDate", -// "EndDate", -// "ChannelId", -// "IsKids", -// "IsMovie", -// "IsSports", -// "IsSeries", -// "IsLive", -// "IsNews", -// "IsPremiere", -// "EpisodeTitle", -// "IsRepeat", -// "CommunityRating", -// "CustomRating", -// "IndexNumber", -// "IsLocked", -// "Name", -// "OfficialRating", -// "MediaType", -// "Overview", -// "ParentIndexNumber", -// "PremiereDate", -// "ProductionYear", -// "ParentId", -// "Genres", -// "InheritedParentalRatingValue", -// "SchemaVersion", -// "SortName", -// "RunTimeTicks", -// "OfficialRatingDescription", -// "HomePageUrl", -// "VoteCount", -// "DisplayMediaType", -// "DateCreated", -// "DateModified", -// "ForcedSortName", -// "IsOffline", -// "LocationType", -// "PreferredMetadataLanguage", -// "PreferredMetadataCountryCode", -// "IsHD", -// "ExternalEtag", -// "DateLastRefreshed", -// "DateLastSaved", -// "IsInMixedFolder", -// "LockedFields", -// "Studios", -// "Audio", -// "ExternalServiceId", -// "Tags", -// "IsFolder", -// "UnratedType", -// "TopParentId", -// "IsItemByName", -// "SourceType", -// "TrailerTypes", -// "CriticRating", -// "CriticRatingSummary", -// "InheritedTags", -// "CleanName", -// "PresentationUniqueKey", -// "SlugName", -// "OriginalTitle", -// "PrimaryVersionId", -// "DateLastMediaAdded", -// "Album", -// "IsVirtualItem", -// "SeriesName", -// "UserDataKey", -// "SeasonName", -// "SeasonId", -// "SeriesId", -// "SeriesSortName", -// "ExternalSeriesId", -// "ShortOverview", -// "Tagline", -// "Keywords", -// "ProviderIds", -// "Images", -// "ProductionLocations", -// "ThemeSongIds", -// "ThemeVideoIds", -// "TotalBitrate", -// "ExtraType", -// "Artists", -// "AlbumArtists", -// "ExternalId" -// }; -// _saveItemCommand = _connection.CreateCommand(); -// _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values ("; - -// for (var i = 1; i <= saveColumns.Count; i++) -// { -// if (i > 1) -// { -// _saveItemCommand.CommandText += ","; -// } -// _saveItemCommand.CommandText += "@" + i.ToString(CultureInfo.InvariantCulture); - -// _saveItemCommand.Parameters.Add(_saveItemCommand, "@" + i.ToString(CultureInfo.InvariantCulture)); -// } -// _saveItemCommand.CommandText += ")"; - -// _deleteItemCommand = _connection.CreateCommand(); -// _deleteItemCommand.CommandText = "delete from TypedBaseItems where guid=@Id"; -// _deleteItemCommand.Parameters.Add(_deleteItemCommand, "@Id"); - -// // People -// _deletePeopleCommand = _connection.CreateCommand(); -// _deletePeopleCommand.CommandText = "delete from People where ItemId=@Id"; -// _deletePeopleCommand.Parameters.Add(_deletePeopleCommand, "@Id"); - -// _savePersonCommand = _connection.CreateCommand(); -// _savePersonCommand.CommandText = "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)"; -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@ItemId"); -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@Name"); -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@Role"); -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@PersonType"); -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@SortOrder"); -// _savePersonCommand.Parameters.Add(_savePersonCommand, "@ListOrder"); - -// // Ancestors -// _deleteAncestorsCommand = _connection.CreateCommand(); -// _deleteAncestorsCommand.CommandText = "delete from AncestorIds where ItemId=@Id"; -// _deleteAncestorsCommand.Parameters.Add(_deleteAncestorsCommand, "@Id"); - -// _saveAncestorCommand = _connection.CreateCommand(); -// _saveAncestorCommand.CommandText = "insert into AncestorIds (ItemId, AncestorId, AncestorIdText) values (@ItemId, @AncestorId, @AncestorIdText)"; -// _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@ItemId"); -// _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@AncestorId"); -// _saveAncestorCommand.Parameters.Add(_saveAncestorCommand, "@AncestorIdText"); - -// // Chapters -// _deleteChaptersCommand = _connection.CreateCommand(); -// _deleteChaptersCommand.CommandText = "delete from " + ChaptersTableName + " where ItemId=@ItemId"; -// _deleteChaptersCommand.Parameters.Add(_deleteChaptersCommand, "@ItemId"); - -// _saveChapterCommand = _connection.CreateCommand(); -// _saveChapterCommand.CommandText = "replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath)"; - -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ItemId"); -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ChapterIndex"); -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@StartPositionTicks"); -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@Name"); -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImagePath"); -// _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImageDateModified"); - -// // MediaStreams -// _deleteStreamsCommand = _connection.CreateCommand(); -// _deleteStreamsCommand.CommandText = "delete from mediastreams where ItemId=@ItemId"; -// _deleteStreamsCommand.Parameters.Add(_deleteStreamsCommand, "@ItemId"); - -// _saveStreamCommand = _connection.CreateCommand(); - -// _saveStreamCommand.CommandText = string.Format("replace into mediastreams ({0}) values ({1})", -// string.Join(",", _mediaStreamSaveColumns), -// string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())); - -// foreach (var col in _mediaStreamSaveColumns) -// { -// _saveStreamCommand.Parameters.Add(_saveStreamCommand, "@" + col); -// } - -// _updateInheritedTagsCommand = _connection.CreateCommand(); -// _updateInheritedTagsCommand.CommandText = "Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"; -// _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@Guid"); -// _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@InheritedTags"); - -// // item values -// _deleteItemValuesCommand = _connection.CreateCommand(); -// _deleteItemValuesCommand.CommandText = "delete from ItemValues where ItemId=@Id"; -// _deleteItemValuesCommand.Parameters.Add(_deleteItemValuesCommand, "@Id"); - -// _saveItemValuesCommand = _connection.CreateCommand(); -// _saveItemValuesCommand.CommandText = "insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)"; -// _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@ItemId"); -// _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Type"); -// _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@Value"); -// _saveItemValuesCommand.Parameters.Add(_saveItemValuesCommand, "@CleanValue"); -// } - -// /// -// /// Save a standard item in the repo -// /// -// /// The item. -// /// The cancellation token. -// /// Task. -// /// item -// public Task SaveItem(BaseItem item, CancellationToken cancellationToken) -// { -// if (item == null) -// { -// throw new ArgumentNullException("item"); -// } - -// return SaveItems(new[] { item }, cancellationToken); -// } - -// /// -// /// Saves the items. -// /// -// /// The items. -// /// The cancellation token. -// /// Task. -// /// -// /// items -// /// or -// /// cancellationToken -// /// -// public async Task SaveItems(IEnumerable items, CancellationToken cancellationToken) -// { -// if (items == null) -// { -// throw new ArgumentNullException("items"); -// } - -// cancellationToken.ThrowIfCancellationRequested(); - -// CheckDisposed(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// foreach (var item in items) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// var index = 0; - -// _saveItemCommand.GetParameter(index++).Value = item.Id; -// _saveItemCommand.GetParameter(index++).Value = item.GetType().FullName; - -// if (TypeRequiresDeserialization(item.GetType())) -// { -// _saveItemCommand.GetParameter(index++).Value = _jsonSerializer.SerializeToBytes(item, _memoryStreamProvider); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.Path; - -// var hasStartDate = item as IHasStartDate; -// if (hasStartDate != null) -// { -// _saveItemCommand.GetParameter(index++).Value = hasStartDate.StartDate; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.EndDate; -// _saveItemCommand.GetParameter(index++).Value = item.ChannelId; - -// var hasProgramAttributes = item as IHasProgramAttributes; -// if (hasProgramAttributes != null) -// { -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsKids; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsMovie; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsSports; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsSeries; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsLive; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsNews; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsPremiere; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.EpisodeTitle; -// _saveItemCommand.GetParameter(index++).Value = hasProgramAttributes.IsRepeat; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.CommunityRating; -// _saveItemCommand.GetParameter(index++).Value = item.CustomRating; - -// _saveItemCommand.GetParameter(index++).Value = item.IndexNumber; -// _saveItemCommand.GetParameter(index++).Value = item.IsLocked; - -// _saveItemCommand.GetParameter(index++).Value = item.Name; -// _saveItemCommand.GetParameter(index++).Value = item.OfficialRating; - -// _saveItemCommand.GetParameter(index++).Value = item.MediaType; -// _saveItemCommand.GetParameter(index++).Value = item.Overview; -// _saveItemCommand.GetParameter(index++).Value = item.ParentIndexNumber; -// _saveItemCommand.GetParameter(index++).Value = item.PremiereDate; -// _saveItemCommand.GetParameter(index++).Value = item.ProductionYear; - -// if (item.ParentId == Guid.Empty) -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = item.ParentId; -// } - -// if (item.Genres.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Genres.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.GetInheritedParentalRatingValue() ?? 0; - -// _saveItemCommand.GetParameter(index++).Value = LatestSchemaVersion; -// _saveItemCommand.GetParameter(index++).Value = item.SortName; -// _saveItemCommand.GetParameter(index++).Value = item.RunTimeTicks; - -// _saveItemCommand.GetParameter(index++).Value = item.OfficialRatingDescription; -// _saveItemCommand.GetParameter(index++).Value = item.HomePageUrl; -// _saveItemCommand.GetParameter(index++).Value = item.VoteCount; -// _saveItemCommand.GetParameter(index++).Value = item.DisplayMediaType; -// _saveItemCommand.GetParameter(index++).Value = item.DateCreated; -// _saveItemCommand.GetParameter(index++).Value = item.DateModified; - -// _saveItemCommand.GetParameter(index++).Value = item.ForcedSortName; -// _saveItemCommand.GetParameter(index++).Value = item.IsOffline; -// _saveItemCommand.GetParameter(index++).Value = item.LocationType.ToString(); - -// _saveItemCommand.GetParameter(index++).Value = item.PreferredMetadataLanguage; -// _saveItemCommand.GetParameter(index++).Value = item.PreferredMetadataCountryCode; -// _saveItemCommand.GetParameter(index++).Value = item.IsHD; -// _saveItemCommand.GetParameter(index++).Value = item.ExternalEtag; - -// if (item.DateLastRefreshed == default(DateTime)) -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = item.DateLastRefreshed; -// } - -// if (item.DateLastSaved == default(DateTime)) -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = item.DateLastSaved; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.IsInMixedFolder; -// if (item.LockedFields.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.LockedFields.Select(i => i.ToString()).ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (item.Studios.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Studios.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (item.Audio.HasValue) -// { -// _saveItemCommand.GetParameter(index++).Value = item.Audio.Value.ToString(); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.ServiceName; - -// if (item.Tags.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Tags.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.IsFolder; - -// _saveItemCommand.GetParameter(index++).Value = item.GetBlockUnratedType().ToString(); - -// var topParent = item.GetTopParent(); -// if (topParent != null) -// { -// //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id); -// _saveItemCommand.GetParameter(index++).Value = topParent.Id.ToString("N"); -// } -// else -// { -// //Logger.Debug("Item {0} has null top parent", item.Id); -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// var isByName = false; -// var byName = item as IItemByName; -// if (byName != null) -// { -// var dualAccess = item as IHasDualAccess; -// isByName = dualAccess == null || dualAccess.IsAccessedByName; -// } -// _saveItemCommand.GetParameter(index++).Value = isByName; - -// _saveItemCommand.GetParameter(index++).Value = item.SourceType.ToString(); - -// var trailer = item as Trailer; -// if (trailer != null && trailer.TrailerTypes.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", trailer.TrailerTypes.Select(i => i.ToString()).ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.CriticRating; -// _saveItemCommand.GetParameter(index++).Value = item.CriticRatingSummary; - -// var inheritedTags = item.GetInheritedTags(); -// if (inheritedTags.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", inheritedTags.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (string.IsNullOrWhiteSpace(item.Name)) -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = GetCleanValue(item.Name); -// } - -// _saveItemCommand.GetParameter(index++).Value = item.GetPresentationUniqueKey(); -// _saveItemCommand.GetParameter(index++).Value = item.SlugName; -// _saveItemCommand.GetParameter(index++).Value = item.OriginalTitle; - -// var video = item as Video; -// if (video != null) -// { -// _saveItemCommand.GetParameter(index++).Value = video.PrimaryVersionId; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// var folder = item as Folder; -// if (folder != null && folder.DateLastMediaAdded.HasValue) -// { -// _saveItemCommand.GetParameter(index++).Value = folder.DateLastMediaAdded.Value; -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.Album; - -// _saveItemCommand.GetParameter(index++).Value = item.IsVirtualItem; - -// var hasSeries = item as IHasSeries; -// if (hasSeries != null) -// { -// _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesName(); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.GetUserDataKeys().FirstOrDefault(); - -// var episode = item as Episode; -// if (episode != null) -// { -// _saveItemCommand.GetParameter(index++).Value = episode.FindSeasonName(); -// _saveItemCommand.GetParameter(index++).Value = episode.FindSeasonId(); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (hasSeries != null) -// { -// _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesId(); -// _saveItemCommand.GetParameter(index++).Value = hasSeries.FindSeriesSortName(); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.ExternalSeriesId; -// _saveItemCommand.GetParameter(index++).Value = item.ShortOverview; -// _saveItemCommand.GetParameter(index++).Value = item.Tagline; - -// if (item.Keywords.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.Keywords.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = SerializeProviderIds(item); -// _saveItemCommand.GetParameter(index++).Value = SerializeImages(item); - -// if (item.ProductionLocations.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ProductionLocations.ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (item.ThemeSongIds.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ThemeSongIds.Select(i => i.ToString("N")).ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// if (item.ThemeVideoIds.Count > 0) -// { -// _saveItemCommand.GetParameter(index++).Value = string.Join("|", item.ThemeVideoIds.Select(i => i.ToString("N")).ToArray()); -// } -// else -// { -// _saveItemCommand.GetParameter(index++).Value = null; -// } - -// _saveItemCommand.GetParameter(index++).Value = item.TotalBitrate; -// _saveItemCommand.GetParameter(index++).Value = item.ExtraType; - -// string artists = null; -// var hasArtists = item as IHasArtist; -// if (hasArtists != null) -// { -// if (hasArtists.Artists.Count > 0) -// { -// artists = string.Join("|", hasArtists.Artists.ToArray()); -// } -// } -// _saveItemCommand.GetParameter(index++).Value = artists; - -// string albumArtists = null; -// var hasAlbumArtists = item as IHasAlbumArtist; -// if (hasAlbumArtists != null) -// { -// if (hasAlbumArtists.AlbumArtists.Count > 0) -// { -// albumArtists = string.Join("|", hasAlbumArtists.AlbumArtists.ToArray()); -// } -// } -// _saveItemCommand.GetParameter(index++).Value = albumArtists; - -// _saveItemCommand.GetParameter(index++).Value = item.ExternalId; - -// //Logger.Debug(_saveItemCommand.CommandText); - -// _saveItemCommand.Transaction = transaction; - -// _saveItemCommand.ExecuteNonQuery(); - -// if (item.SupportsAncestors) -// { -// UpdateAncestors(item.Id, item.GetAncestorIds().Distinct().ToList(), transaction); -// } - -// UpdateItemValues(item.Id, GetItemValuesToSave(item), transaction); -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save items:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// private string SerializeProviderIds(BaseItem item) -// { -// // Ideally we shouldn't need this IsNullOrWhiteSpace check but we're seeing some cases of bad data slip through -// var ids = item.ProviderIds -// .Where(i => !string.IsNullOrWhiteSpace(i.Value)) -// .ToList(); - -// if (ids.Count == 0) -// { -// return null; -// } - -// return string.Join("|", ids.Select(i => i.Key + "=" + i.Value).ToArray()); -// } - -// private void DeserializeProviderIds(string value, BaseItem item) -// { -// if (string.IsNullOrWhiteSpace(value)) -// { -// return; -// } - -// if (item.ProviderIds.Count > 0) -// { -// return; -// } - -// var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); - -// foreach (var part in parts) -// { -// var idParts = part.Split('='); - -// if (idParts.Length == 2) -// { -// item.SetProviderId(idParts[0], idParts[1]); -// } -// } -// } - -// private string SerializeImages(BaseItem item) -// { -// var images = item.ImageInfos.ToList(); - -// if (images.Count == 0) -// { -// return null; -// } - -// return string.Join("|", images.Select(ToValueString).ToArray()); -// } - -// private void DeserializeImages(string value, BaseItem item) -// { -// if (string.IsNullOrWhiteSpace(value)) -// { -// return; -// } - -// if (item.ImageInfos.Count > 0) -// { -// return; -// } - -// var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); - -// foreach (var part in parts) -// { -// item.ImageInfos.Add(ItemImageInfoFromValueString(part)); -// } -// } - -// public string ToValueString(ItemImageInfo image) -// { -// var delimeter = "*"; - -// return (image.Path ?? string.Empty) + -// delimeter + -// image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + -// delimeter + -// image.Type + -// delimeter + -// image.IsPlaceholder; -// } - -// public ItemImageInfo ItemImageInfoFromValueString(string value) -// { -// var parts = value.Split(new[] { '*' }, StringSplitOptions.None); - -// var image = new ItemImageInfo(); - -// image.Path = parts[0]; -// image.DateModified = new DateTime(long.Parse(parts[1], CultureInfo.InvariantCulture), DateTimeKind.Utc); -// image.Type = (ImageType)Enum.Parse(typeof(ImageType), parts[2], true); -// image.IsPlaceholder = string.Equals(parts[3], true.ToString(), StringComparison.OrdinalIgnoreCase); - -// return image; -// } - -// /// -// /// Internal retrieve from items or users table -// /// -// /// The id. -// /// BaseItem. -// /// id -// /// -// public BaseItem RetrieveItem(Guid id) -// { -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } - -// CheckDisposed(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"; -// cmd.Parameters.Add(cmd, "@guid", DbType.Guid).Value = id; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) -// { -// if (reader.Read()) -// { -// return GetItem(reader); -// } -// } -// return null; -// } -// } - -// private BaseItem GetItem(IDataReader reader) -// { -// return GetItem(reader, new InternalItemsQuery()); -// } - -// private bool TypeRequiresDeserialization(Type type) -// { -// if (_config.Configuration.SkipDeserializationForBasicTypes) -// { -// if (type == typeof(MusicGenre)) -// { -// return false; -// } -// if (type == typeof(GameGenre)) -// { -// return false; -// } -// if (type == typeof(Genre)) -// { -// return false; -// } -// if (type == typeof(Studio)) -// { -// return false; -// } -// if (type == typeof(Year)) -// { -// return false; -// } -// if (type == typeof(Book)) -// { -// return false; -// } -// if (type == typeof(Person)) -// { -// return false; -// } -// if (type == typeof(RecordingGroup)) -// { -// return false; -// } -// if (type == typeof(Channel)) -// { -// return false; -// } -// if (type == typeof(ManualCollectionsFolder)) -// { -// return false; -// } -// if (type == typeof(CameraUploadsFolder)) -// { -// return false; -// } -// if (type == typeof(PlaylistsFolder)) -// { -// return false; -// } -// if (type == typeof(UserRootFolder)) -// { -// return false; -// } -// if (type == typeof(PhotoAlbum)) -// { -// return false; -// } -// if (type == typeof(Season)) -// { -// return false; -// } -// if (type == typeof(MusicArtist)) -// { -// return false; -// } -// } -// if (_config.Configuration.SkipDeserializationForPrograms) -// { -// if (type == typeof(LiveTvProgram)) -// { -// return false; -// } -// } -// if (_config.Configuration.SkipDeserializationForAudio) -// { -// if (type == typeof(Audio)) -// { -// return false; -// } -// if (type == typeof(LiveTvAudioRecording)) -// { -// return false; -// } -// if (type == typeof(AudioPodcast)) -// { -// return false; -// } -// if (type == typeof(MusicAlbum)) -// { -// return false; -// } -// } - -// return true; -// } - -// private BaseItem GetItem(IDataReader reader, InternalItemsQuery query) -// { -// var typeString = reader.GetString(0); - -// var type = _typeMapper.GetType(typeString); - -// if (type == null) -// { -// //Logger.Debug("Unknown type {0}", typeString); - -// return null; -// } - -// BaseItem item = null; - -// if (TypeRequiresDeserialization(type)) -// { -// using (var stream = reader.GetMemoryStream(1, _memoryStreamProvider)) -// { -// try -// { -// item = _jsonSerializer.DeserializeFromStream(stream, type) as BaseItem; -// } -// catch (SerializationException ex) -// { -// Logger.ErrorException("Error deserializing item", ex); -// } -// } -// } - -// if (item == null) -// { -// try -// { -// item = Activator.CreateInstance(type) as BaseItem; -// } -// catch -// { -// } -// } - -// if (item == null) -// { -// return null; -// } - -// if (!reader.IsDBNull(2)) -// { -// var hasStartDate = item as IHasStartDate; -// if (hasStartDate != null) -// { -// hasStartDate.StartDate = reader.GetDateTime(2).ToUniversalTime(); -// } -// } - -// if (!reader.IsDBNull(3)) -// { -// item.EndDate = reader.GetDateTime(3).ToUniversalTime(); -// } - -// if (!reader.IsDBNull(4)) -// { -// item.IsOffline = reader.GetBoolean(4); -// } - -// if (!reader.IsDBNull(5)) -// { -// item.ChannelId = reader.GetString(5); -// } - -// var hasProgramAttributes = item as IHasProgramAttributes; -// if (hasProgramAttributes != null) -// { -// if (!reader.IsDBNull(6)) -// { -// hasProgramAttributes.IsMovie = reader.GetBoolean(6); -// } - -// if (!reader.IsDBNull(7)) -// { -// hasProgramAttributes.IsSports = reader.GetBoolean(7); -// } - -// if (!reader.IsDBNull(8)) -// { -// hasProgramAttributes.IsKids = reader.GetBoolean(8); -// } - -// if (!reader.IsDBNull(9)) -// { -// hasProgramAttributes.IsSeries = reader.GetBoolean(9); -// } - -// if (!reader.IsDBNull(10)) -// { -// hasProgramAttributes.IsLive = reader.GetBoolean(10); -// } - -// if (!reader.IsDBNull(11)) -// { -// hasProgramAttributes.IsNews = reader.GetBoolean(11); -// } - -// if (!reader.IsDBNull(12)) -// { -// hasProgramAttributes.IsPremiere = reader.GetBoolean(12); -// } - -// if (!reader.IsDBNull(13)) -// { -// hasProgramAttributes.EpisodeTitle = reader.GetString(13); -// } - -// if (!reader.IsDBNull(14)) -// { -// hasProgramAttributes.IsRepeat = reader.GetBoolean(14); -// } -// } - -// var index = 15; - -// if (!reader.IsDBNull(index)) -// { -// item.CommunityRating = reader.GetFloat(index); -// } -// index++; - -// if (query.HasField(ItemFields.CustomRating)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.CustomRating = reader.GetString(index); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.IndexNumber = reader.GetInt32(index); -// } -// index++; - -// if (query.HasField(ItemFields.Settings)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.IsLocked = reader.GetBoolean(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.PreferredMetadataLanguage = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.PreferredMetadataCountryCode = reader.GetString(index); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.IsHD = reader.GetBoolean(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.ExternalEtag = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.DateLastRefreshed = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.Name = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.Path = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.PremiereDate = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; - -// if (query.HasField(ItemFields.Overview)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Overview = reader.GetString(index); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.ParentIndexNumber = reader.GetInt32(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.ProductionYear = reader.GetInt32(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.OfficialRating = reader.GetString(index); -// } -// index++; - -// if (query.HasField(ItemFields.OfficialRatingDescription)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.OfficialRatingDescription = reader.GetString(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.HomePageUrl)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.HomePageUrl = reader.GetString(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.DisplayMediaType)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.DisplayMediaType = reader.GetString(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.SortName)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.ForcedSortName = reader.GetString(index); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.RunTimeTicks = reader.GetInt64(index); -// } -// index++; - -// if (query.HasField(ItemFields.VoteCount)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.VoteCount = reader.GetInt32(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.DateCreated)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.DateCreated = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.DateModified = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; - -// item.Id = reader.GetGuid(index); -// index++; - -// if (query.HasField(ItemFields.Genres)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Genres = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.ParentId = reader.GetGuid(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.Audio = (ProgramAudio)Enum.Parse(typeof(ProgramAudio), reader.GetString(index), true); -// } -// index++; - -// // TODO: Even if not needed by apps, the server needs it internally -// // But get this excluded from contexts where it is not needed -// if (!reader.IsDBNull(index)) -// { -// item.ServiceName = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.IsInMixedFolder = reader.GetBoolean(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.DateLastSaved = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; - -// if (query.HasField(ItemFields.Settings)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.LockedFields = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (MetadataFields)Enum.Parse(typeof(MetadataFields), i, true)).ToList(); -// } -// index++; -// } - -// if (query.HasField(ItemFields.Studios)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Studios = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; -// } - -// if (query.HasField(ItemFields.Tags)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Tags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.SourceType = (SourceType)Enum.Parse(typeof(SourceType), reader.GetString(index), true); -// } -// index++; - -// var trailer = item as Trailer; -// if (trailer != null) -// { -// if (!reader.IsDBNull(index)) -// { -// trailer.TrailerTypes = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (TrailerType)Enum.Parse(typeof(TrailerType), i, true)).ToList(); -// } -// } -// index++; - -// if (query.HasField(ItemFields.OriginalTitle)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.OriginalTitle = reader.GetString(index); -// } -// index++; -// } - -// var video = item as Video; -// if (video != null) -// { -// if (!reader.IsDBNull(index)) -// { -// video.PrimaryVersionId = reader.GetString(index); -// } -// } -// index++; - -// if (query.HasField(ItemFields.DateLastMediaAdded)) -// { -// var folder = item as Folder; -// if (folder != null && !reader.IsDBNull(index)) -// { -// folder.DateLastMediaAdded = reader.GetDateTime(index).ToUniversalTime(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.Album = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.CriticRating = reader.GetFloat(index); -// } -// index++; - -// if (query.HasField(ItemFields.CriticRatingSummary)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.CriticRatingSummary = reader.GetString(index); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.IsVirtualItem = reader.GetBoolean(index); -// } -// index++; - -// var hasSeries = item as IHasSeries; -// if (hasSeries != null) -// { -// if (!reader.IsDBNull(index)) -// { -// hasSeries.SeriesName = reader.GetString(index); -// } -// } -// index++; - -// var episode = item as Episode; -// if (episode != null) -// { -// if (!reader.IsDBNull(index)) -// { -// episode.SeasonName = reader.GetString(index); -// } -// index++; -// if (!reader.IsDBNull(index)) -// { -// episode.SeasonId = reader.GetGuid(index); -// } -// } -// else -// { -// index++; -// } -// index++; - -// if (hasSeries != null) -// { -// if (!reader.IsDBNull(index)) -// { -// hasSeries.SeriesId = reader.GetGuid(index); -// } -// } -// index++; - -// if (hasSeries != null) -// { -// if (!reader.IsDBNull(index)) -// { -// hasSeries.SeriesSortName = reader.GetString(index); -// } -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.PresentationUniqueKey = reader.GetString(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.InheritedParentalRatingValue = reader.GetInt32(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.InheritedTags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.ExternalSeriesId = reader.GetString(index); -// } -// index++; - -// if (query.HasField(ItemFields.ShortOverview)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.ShortOverview = reader.GetString(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.Taglines)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Tagline = reader.GetString(index); -// } -// index++; -// } - -// if (query.HasField(ItemFields.Keywords)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.Keywords = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// DeserializeProviderIds(reader.GetString(index), item); -// } -// index++; - -// if (query.DtoOptions.EnableImages) -// { -// if (!reader.IsDBNull(index)) -// { -// DeserializeImages(reader.GetString(index), item); -// } -// index++; -// } - -// if (query.HasField(ItemFields.ProductionLocations)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.ProductionLocations = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; -// } - -// if (query.HasField(ItemFields.ThemeSongIds)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.ThemeSongIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); -// } -// index++; -// } - -// if (query.HasField(ItemFields.ThemeVideoIds)) -// { -// if (!reader.IsDBNull(index)) -// { -// item.ThemeVideoIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); -// } -// index++; -// } - -// if (!reader.IsDBNull(index)) -// { -// item.TotalBitrate = reader.GetInt32(index); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.ExtraType = (ExtraType)Enum.Parse(typeof(ExtraType), reader.GetString(index), true); -// } -// index++; - -// var hasArtists = item as IHasArtist; -// if (hasArtists != null && !reader.IsDBNull(index)) -// { -// hasArtists.Artists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; - -// var hasAlbumArtists = item as IHasAlbumArtist; -// if (hasAlbumArtists != null && !reader.IsDBNull(index)) -// { -// hasAlbumArtists.AlbumArtists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); -// } -// index++; - -// if (!reader.IsDBNull(index)) -// { -// item.ExternalId = reader.GetString(index); -// } -// index++; - -// if (string.IsNullOrWhiteSpace(item.Tagline)) -// { -// var movie = item as Movie; -// if (movie != null && movie.Taglines.Count > 0) -// { -// movie.Tagline = movie.Taglines[0]; -// } -// } - -// if (type == typeof(Person) && item.ProductionLocations.Count == 0) -// { -// var person = (Person)item; -// if (!string.IsNullOrWhiteSpace(person.PlaceOfBirth)) -// { -// item.ProductionLocations = new List { person.PlaceOfBirth }; -// } -// } - -// return item; -// } - -// /// -// /// Gets the critic reviews. -// /// -// /// The item id. -// /// Task{IEnumerable{ItemReview}}. -// public IEnumerable GetCriticReviews(Guid itemId) -// { -// try -// { -// var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - -// return _jsonSerializer.DeserializeFromFile>(path); -// } -// catch (DirectoryNotFoundException) -// { -// return new List(); -// } -// catch (FileNotFoundException) -// { -// return new List(); -// } -// } - -// private readonly Task _cachedTask = Task.FromResult(true); -// /// -// /// Saves the critic reviews. -// /// -// /// The item id. -// /// The critic reviews. -// /// Task. -// public Task SaveCriticReviews(Guid itemId, IEnumerable criticReviews) -// { -// Directory.CreateDirectory(_criticReviewsPath); - -// var path = Path.Combine(_criticReviewsPath, itemId + ".json"); - -// _jsonSerializer.SerializeToFile(criticReviews.ToList(), path); - -// return _cachedTask; -// } - -// /// -// /// Gets chapters for an item -// /// -// /// The id. -// /// IEnumerable{ChapterInfo}. -// /// id -// public IEnumerable GetChapters(Guid id) -// { -// CheckDisposed(); -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } -// var list = new List(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"; - -// cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// list.Add(GetChapter(reader)); -// } -// } -// } - -// return list; -// } - -// /// -// /// Gets a single chapter for an item -// /// -// /// The id. -// /// The index. -// /// ChapterInfo. -// /// id -// public ChapterInfo GetChapter(Guid id, int index) -// { -// CheckDisposed(); -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"; - -// cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; -// cmd.Parameters.Add(cmd, "@ChapterIndex", DbType.Int32).Value = index; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) -// { -// if (reader.Read()) -// { -// return GetChapter(reader); -// } -// } -// return null; -// } -// } - -// /// -// /// Gets the chapter. -// /// -// /// The reader. -// /// ChapterInfo. -// private ChapterInfo GetChapter(IDataReader reader) -// { -// var chapter = new ChapterInfo -// { -// StartPositionTicks = reader.GetInt64(0) -// }; - -// if (!reader.IsDBNull(1)) -// { -// chapter.Name = reader.GetString(1); -// } - -// if (!reader.IsDBNull(2)) -// { -// chapter.ImagePath = reader.GetString(2); -// } - -// if (!reader.IsDBNull(3)) -// { -// chapter.ImageDateModified = reader.GetDateTime(3).ToUniversalTime(); -// } - -// return chapter; -// } - -// /// -// /// Saves the chapters. -// /// -// /// The id. -// /// The chapters. -// /// The cancellation token. -// /// Task. -// /// -// /// id -// /// or -// /// chapters -// /// or -// /// cancellationToken -// /// -// public async Task SaveChapters(Guid id, List chapters, CancellationToken cancellationToken) -// { -// CheckDisposed(); - -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } - -// if (chapters == null) -// { -// throw new ArgumentNullException("chapters"); -// } - -// cancellationToken.ThrowIfCancellationRequested(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// // First delete chapters -// _deleteChaptersCommand.GetParameter(0).Value = id; - -// _deleteChaptersCommand.Transaction = transaction; - -// _deleteChaptersCommand.ExecuteNonQuery(); - -// var index = 0; - -// foreach (var chapter in chapters) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// _saveChapterCommand.GetParameter(0).Value = id; -// _saveChapterCommand.GetParameter(1).Value = index; -// _saveChapterCommand.GetParameter(2).Value = chapter.StartPositionTicks; -// _saveChapterCommand.GetParameter(3).Value = chapter.Name; -// _saveChapterCommand.GetParameter(4).Value = chapter.ImagePath; -// _saveChapterCommand.GetParameter(5).Value = chapter.ImageDateModified; - -// _saveChapterCommand.Transaction = transaction; - -// _saveChapterCommand.ExecuteNonQuery(); - -// index++; -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save chapters:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// protected override void CloseConnection() -// { -// if (_connection != null) -// { -// if (_connection.IsOpen()) -// { -// _connection.Close(); -// } - -// _connection.Dispose(); -// _connection = null; -// } -// } - -// private bool EnableJoinUserData(InternalItemsQuery query) -// { -// if (query.User == null) -// { -// return false; -// } - -// if (query.SimilarTo != null && query.User != null) -// { -// return true; -// } - -// var sortingFields = query.SortBy.ToList(); -// sortingFields.AddRange(query.OrderBy.Select(i => i.Item1)); - -// if (sortingFields.Contains(ItemSortBy.IsFavoriteOrLiked, StringComparer.OrdinalIgnoreCase)) -// { -// return true; -// } -// if (sortingFields.Contains(ItemSortBy.IsPlayed, StringComparer.OrdinalIgnoreCase)) -// { -// return true; -// } -// if (sortingFields.Contains(ItemSortBy.IsUnplayed, StringComparer.OrdinalIgnoreCase)) -// { -// return true; -// } -// if (sortingFields.Contains(ItemSortBy.PlayCount, StringComparer.OrdinalIgnoreCase)) -// { -// return true; -// } -// if (sortingFields.Contains(ItemSortBy.DatePlayed, StringComparer.OrdinalIgnoreCase)) -// { -// return true; -// } - -// if (query.IsFavoriteOrLiked.HasValue) -// { -// return true; -// } - -// if (query.IsFavorite.HasValue) -// { -// return true; -// } - -// if (query.IsResumable.HasValue) -// { -// return true; -// } - -// if (query.IsPlayed.HasValue) -// { -// return true; -// } - -// if (query.IsLiked.HasValue) -// { -// return true; -// } - -// return false; -// } - -// private List allFields = Enum.GetNames(typeof(ItemFields)) -// .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) -// .ToList(); - -// private IEnumerable GetColumnNamesFromField(ItemFields field) -// { -// if (field == ItemFields.Settings) -// { -// return new[] { "IsLocked", "PreferredMetadataCountryCode", "PreferredMetadataLanguage", "LockedFields" }; -// } -// if (field == ItemFields.ServiceName) -// { -// return new[] { "ExternalServiceId" }; -// } -// if (field == ItemFields.SortName) -// { -// return new[] { "ForcedSortName" }; -// } -// if (field == ItemFields.Taglines) -// { -// return new[] { "Tagline" }; -// } - -// return new[] { field.ToString() }; -// } - -// private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns, IDbCommand cmd) -// { -// var list = startColumns.ToList(); - -// foreach (var field in allFields) -// { -// if (!query.HasField(field)) -// { -// foreach (var fieldToRemove in GetColumnNamesFromField(field).ToList()) -// { -// list.Remove(fieldToRemove); -// } -// } -// } - -// if (!query.DtoOptions.EnableImages) -// { -// list.Remove("Images"); -// } - -// if (EnableJoinUserData(query)) -// { -// list.Add("UserDataDb.UserData.UserId"); -// list.Add("UserDataDb.UserData.lastPlayedDate"); -// list.Add("UserDataDb.UserData.playbackPositionTicks"); -// list.Add("UserDataDb.UserData.playcount"); -// list.Add("UserDataDb.UserData.isFavorite"); -// list.Add("UserDataDb.UserData.played"); -// list.Add("UserDataDb.UserData.rating"); -// } - -// if (query.SimilarTo != null) -// { -// var item = query.SimilarTo; - -// var builder = new StringBuilder(); -// builder.Append("("); - -// builder.Append("((OfficialRating=@ItemOfficialRating) * 10)"); -// //builder.Append("+ ((ProductionYear=@ItemProductionYear) * 10)"); - -// builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 10 Then 2 Else 0 End )"); -// builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 5 Then 2 Else 0 End )"); - -// //// genres -// builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=2 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=2)) * 10)"); - -// //// tags -// builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=4 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=4)) * 10)"); - -// builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=5 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=5)) * 10)"); - -// builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=3 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=3)) * 3)"); - -// //builder.Append("+ ((Select count(Name) from People where ItemId=Guid and Name in (select Name from People where ItemId=@SimilarItemId)) * 3)"); - -// ////builder.Append("(select group_concat((Select Name from People where ItemId=Guid and Name in (Select Name from People where ItemId=@SimilarItemId)), '|'))"); - -// builder.Append(") as SimilarityScore"); - -// list.Add(builder.ToString()); -// cmd.Parameters.Add(cmd, "@ItemOfficialRating", DbType.String).Value = item.OfficialRating; -// cmd.Parameters.Add(cmd, "@ItemProductionYear", DbType.Int32).Value = item.ProductionYear ?? 0; -// cmd.Parameters.Add(cmd, "@SimilarItemId", DbType.Guid).Value = item.Id; - -// var excludeIds = query.ExcludeItemIds.ToList(); -// excludeIds.Add(item.Id.ToString("N")); -// query.ExcludeItemIds = excludeIds.ToArray(); - -// query.ExcludeProviderIds = item.ProviderIds; -// } - -// return list.ToArray(); -// } - -// private string GetJoinUserDataText(InternalItemsQuery query) -// { -// if (!EnableJoinUserData(query)) -// { -// return string.Empty; -// } - -// return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; -// } - -// private string GetGroupBy(InternalItemsQuery query) -// { -// var groups = new List(); - -// if (EnableGroupByPresentationUniqueKey(query)) -// { -// groups.Add("PresentationUniqueKey"); -// } - -// if (groups.Count > 0) -// { -// return " Group by " + string.Join(",", groups.ToArray()); -// } - -// return string.Empty; -// } - -// private string GetFromText(string alias = "A") -// { -// return " from TypedBaseItems " + alias; -// } - -// public List GetItemList(InternalItemsQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// var now = DateTime.UtcNow; - -// var list = new List(); - -// // Hack for right now since we currently don't support filtering out these duplicates within a query -// if (query.Limit.HasValue && query.EnableGroupByMetadataKey) -// { -// query.Limit = query.Limit.Value + 4; -// } - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText(); -// cmd.CommandText += GetJoinUserDataText(query); - -// if (EnableJoinUserData(query)) -// { -// cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; -// } - -// var whereClauses = GetWhereClauses(query, cmd); - -// var whereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// cmd.CommandText += whereText; - -// cmd.CommandText += GetGroupBy(query); - -// cmd.CommandText += GetOrderByText(query); - -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; - -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } - -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// LogQueryTime("GetItemList", cmd, now); - -// while (reader.Read()) -// { -// var item = GetItem(reader, query); -// if (item != null) -// { -// list.Add(item); -// } -// } -// } -// } - -// // Hack for right now since we currently don't support filtering out these duplicates within a query -// if (query.EnableGroupByMetadataKey) -// { -// var limit = query.Limit ?? int.MaxValue; -// limit -= 4; -// var newList = new List(); - -// foreach (var item in list) -// { -// AddItem(newList, item); - -// if (newList.Count >= limit) -// { -// break; -// } -// } - -// list = newList; -// } - -// return list; -// } - -// private void AddItem(List items, BaseItem newItem) -// { -// var providerIds = newItem.ProviderIds.ToList(); - -// for (var i = 0; i < items.Count; i++) -// { -// var item = items[i]; - -// foreach (var providerId in providerIds) -// { -// if (providerId.Key == MetadataProviders.TmdbCollection.ToString()) -// { -// continue; -// } -// if (item.GetProviderId(providerId.Key) == providerId.Value) -// { -// if (newItem.SourceType == SourceType.Library) -// { -// items[i] = newItem; -// } -// return; -// } -// } -// } - -// items.Add(newItem); -// } - -// private void LogQueryTime(string methodName, IDbCommand cmd, DateTime startDate) -// { -// var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds; - -// var slowThreshold = 1000; - -//#if DEBUG -// slowThreshold = 50; -//#endif - -// if (elapsed >= slowThreshold) -// { -// Logger.Debug("{2} query time (slow): {0}ms. Query: {1}", -// Convert.ToInt32(elapsed), -// cmd.CommandText, -// methodName); -// } -// else -// { -// //Logger.Debug("{2} query time: {0}ms. Query: {1}", -// // Convert.ToInt32(elapsed), -// // cmd.CommandText, -// // methodName); -// } -// } - -// public QueryResult GetItems(InternalItemsQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) -// { -// var list = GetItemList(query); -// return new QueryResult -// { -// Items = list.ToArray(), -// TotalRecordCount = list.Count -// }; -// } - -// var now = DateTime.UtcNow; - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns, cmd)) + GetFromText(); -// cmd.CommandText += GetJoinUserDataText(query); - -// if (EnableJoinUserData(query)) -// { -// cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; -// } - -// var whereClauses = GetWhereClauses(query, cmd); - -// var whereTextWithoutPaging = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// var whereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// cmd.CommandText += whereText; - -// cmd.CommandText += GetGroupBy(query); - -// cmd.CommandText += GetOrderByText(query); - -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; - -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } - -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// cmd.CommandText += ";"; - -// var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - -// if (isReturningZeroItems) -// { -// cmd.CommandText = ""; -// } - -// if (EnableGroupByPresentationUniqueKey(query)) -// { -// cmd.CommandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); -// } -// else -// { -// cmd.CommandText += " select count (guid)" + GetFromText(); -// } - -// cmd.CommandText += GetJoinUserDataText(query); -// cmd.CommandText += whereTextWithoutPaging; - -// var list = new List(); -// var count = 0; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) -// { -// LogQueryTime("GetItems", cmd, now); - -// if (isReturningZeroItems) -// { -// if (reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } -// else -// { -// while (reader.Read()) -// { -// var item = GetItem(reader, query); -// if (item != null) -// { -// list.Add(item); -// } -// } - -// if (reader.NextResult() && reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } -// } - -// return new QueryResult() -// { -// Items = list.ToArray(), -// TotalRecordCount = count -// }; -// } -// } - -// private string GetOrderByText(InternalItemsQuery query) -// { -// var orderBy = query.OrderBy.ToList(); -// var enableOrderInversion = true; - -// if (orderBy.Count == 0) -// { -// orderBy.AddRange(query.SortBy.Select(i => new Tuple(i, query.SortOrder))); -// } -// else -// { -// enableOrderInversion = false; -// } - -// if (query.SimilarTo != null) -// { -// if (orderBy.Count == 0) -// { -// orderBy.Add(new Tuple("SimilarityScore", SortOrder.Descending)); -// orderBy.Add(new Tuple(ItemSortBy.Random, SortOrder.Ascending)); -// query.SortOrder = SortOrder.Descending; -// enableOrderInversion = false; -// } -// } - -// query.OrderBy = orderBy; - -// if (orderBy.Count == 0) -// { -// return string.Empty; -// } - -// return " ORDER BY " + string.Join(",", orderBy.Select(i => -// { -// var columnMap = MapOrderByField(i.Item1, query); -// var columnAscending = i.Item2 == SortOrder.Ascending; -// if (columnMap.Item2 && enableOrderInversion) -// { -// columnAscending = !columnAscending; -// } - -// var sortOrder = columnAscending ? "ASC" : "DESC"; - -// return columnMap.Item1 + " " + sortOrder; -// }).ToArray()); -// } - -// private Tuple MapOrderByField(string name, InternalItemsQuery query) -// { -// if (string.Equals(name, ItemSortBy.AirTime, StringComparison.OrdinalIgnoreCase)) -// { -// // TODO -// return new Tuple("SortName", false); -// } -// if (string.Equals(name, ItemSortBy.Runtime, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("RuntimeTicks", false); -// } -// if (string.Equals(name, ItemSortBy.Random, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("RANDOM()", false); -// } -// if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("LastPlayedDate", false); -// } -// if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("PlayCount", false); -// } -// if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("IsFavorite", true); -// } -// if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("IsFolder", true); -// } -// if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("played", true); -// } -// if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("played", false); -// } -// if (string.Equals(name, ItemSortBy.DateLastContentAdded, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("DateLastMediaAdded", false); -// } -// if (string.Equals(name, ItemSortBy.Artist, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false); -// } -// if (string.Equals(name, ItemSortBy.AlbumArtist, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false); -// } -// if (string.Equals(name, ItemSortBy.OfficialRating, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("InheritedParentalRatingValue", false); -// } -// if (string.Equals(name, ItemSortBy.Studio, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=3 LIMIT 1)", false); -// } -// if (string.Equals(name, ItemSortBy.SeriesDatePlayed, StringComparison.OrdinalIgnoreCase)) -// { -// return new Tuple("(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where B.Guid in (Select ItemId from AncestorIds where AncestorId in (select guid from typedbaseitems c where C.Type = 'MediaBrowser.Controller.Entities.TV.Series' And C.Guid in (Select AncestorId from AncestorIds where ItemId=A.Guid))))", false); -// } - -// return new Tuple(name, false); -// } - -// public List GetItemIdsList(InternalItemsQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// var now = DateTime.UtcNow; - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText(); -// cmd.CommandText += GetJoinUserDataText(query); - -// if (EnableJoinUserData(query)) -// { -// cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; -// } - -// var whereClauses = GetWhereClauses(query, cmd); - -// var whereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// cmd.CommandText += whereText; - -// cmd.CommandText += GetGroupBy(query); - -// cmd.CommandText += GetOrderByText(query); - -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; - -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } - -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// var list = new List(); - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// LogQueryTime("GetItemIdsList", cmd, now); - -// while (reader.Read()) -// { -// list.Add(reader.GetGuid(0)); -// } -// } - -// return list; -// } -// } - -// public QueryResult> GetItemIdsWithPath(InternalItemsQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select guid,path from TypedBaseItems"; - -// var whereClauses = GetWhereClauses(query, cmd); - -// var whereTextWithoutPaging = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// var whereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// cmd.CommandText += whereText; - -// cmd.CommandText += GetGroupBy(query); +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Controller.Channels; +using MediaBrowser.Controller.Collections; +using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Extensions; +using MediaBrowser.Controller.LiveTv; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Controller.Playlists; +using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.IO; +using MediaBrowser.Model.LiveTv; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Querying; +using MediaBrowser.Model.Serialization; +using MediaBrowser.Server.Implementations.Devices; +using MediaBrowser.Server.Implementations.Playlists; +using MediaBrowser.Model.Reflection; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Data +{ + /// + /// Class SQLiteItemRepository + /// + public class SqliteItemRepository : BaseSqliteRepository, IItemRepository + { + private SQLiteDatabaseConnection _connection; + + private readonly TypeMapper _typeMapper; + + /// + /// Gets the name of the repository + /// + /// The name. + public string Name + { + get + { + return "SQLite"; + } + } + + /// + /// Gets the json serializer. + /// + /// The json serializer. + private readonly IJsonSerializer _jsonSerializer; + + /// + /// The _app paths + /// + private readonly IServerConfigurationManager _config; + + private readonly string _criticReviewsPath; + + public const int LatestSchemaVersion = 109; + private readonly IMemoryStreamFactory _memoryStreamProvider; + private readonly IFileSystem _fileSystem; + + /// + /// Initializes a new instance of the class. + /// + public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem) + : base(logger) + { + if (config == null) + { + throw new ArgumentNullException("config"); + } + if (jsonSerializer == null) + { + throw new ArgumentNullException("jsonSerializer"); + } + + _config = config; + _jsonSerializer = jsonSerializer; + _memoryStreamProvider = memoryStreamProvider; + _fileSystem = fileSystem; + _typeMapper = new TypeMapper(assemblyInfo); + + _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews"); + DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db"); + } + + private const string ChaptersTableName = "Chapters2"; + + protected override int? CacheSize + { + get + { + var cacheSize = _config.Configuration.SqliteCacheSize; + if (cacheSize <= 0) + { + cacheSize = Math.Min(Environment.ProcessorCount * 50000, 100000); + } + + return 0 - cacheSize; + } + } + + /// + /// Opens the connection to the database + /// + /// Task. + public async Task Initialize(SqliteUserDataRepository userDataRepo) + { + _connection = CreateConnection(false); + + var createMediaStreamsTableCommand + = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; + + string[] queries = { + + "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)", + + "create table if not exists AncestorIds (ItemId GUID, AncestorId GUID, AncestorIdText TEXT, PRIMARY KEY (ItemId, AncestorId))", + "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)", + "create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)", + + "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)", + + "create table if not exists People (ItemId GUID, Name TEXT NOT NULL, Role TEXT, PersonType TEXT, SortOrder int, ListOrder int)", + + "drop index if exists idxPeopleItemId", + "create index if not exists idxPeopleItemId1 on People(ItemId,ListOrder)", + "create index if not exists idxPeopleName on People(Name)", + + "create table if not exists "+ChaptersTableName+" (ItemId GUID, ChapterIndex INT, StartPositionTicks BIGINT, Name TEXT, ImagePath TEXT, PRIMARY KEY (ItemId, ChapterIndex))", + + createMediaStreamsTableCommand, + + "create index if not exists idx_mediastreams1 on mediastreams(ItemId)" + + }; + + _connection.RunQueries(queries); + + _connection.RunInTransaction(db => + { + var existingColumnNames = GetColumnNames(db, "AncestorIds"); + AddColumn(db, "AncestorIds", "AncestorIdText", "Text", existingColumnNames); + + existingColumnNames = GetColumnNames(db, "TypedBaseItems"); + + AddColumn(db, "TypedBaseItems", "Path", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "StartDate", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "EndDate", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ChannelId", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsMovie", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsSports", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsKids", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "CommunityRating", "Float", existingColumnNames); + AddColumn(db, "TypedBaseItems", "CustomRating", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IndexNumber", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsLocked", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Name", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "OfficialRating", "Text", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "MediaType", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Overview", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ParentIndexNumber", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "PremiereDate", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ParentId", "GUID", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Genres", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SchemaVersion", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "OfficialRatingDescription", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "HomePageUrl", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "VoteCount", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "DisplayMediaType", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "DateCreated", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsOffline", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "LocationType", "Text", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsLive", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsNews", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsPremiere", "BIT", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "EpisodeTitle", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsRepeat", "BIT", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "PreferredMetadataLanguage", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "PreferredMetadataCountryCode", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsHD", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ExternalEtag", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "DateLastRefreshed", "DATETIME", existingColumnNames); + + AddColumn(db, "TypedBaseItems", "DateLastSaved", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsInMixedFolder", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "LockedFields", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Studios", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Audio", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ExternalServiceId", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Tags", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsFolder", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "InheritedParentalRatingValue", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "UnratedType", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "TopParentId", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsItemByName", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SourceType", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "TrailerTypes", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "CriticRating", "Float", existingColumnNames); + AddColumn(db, "TypedBaseItems", "CriticRatingSummary", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "InheritedTags", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "CleanName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "PresentationUniqueKey", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SlugName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "OriginalTitle", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "PrimaryVersionId", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "DateLastMediaAdded", "DATETIME", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Album", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "IsVirtualItem", "BIT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SeriesName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "UserDataKey", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SeasonName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SeasonId", "GUID", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SeriesId", "GUID", existingColumnNames); + AddColumn(db, "TypedBaseItems", "SeriesSortName", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ExternalSeriesId", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ShortOverview", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Tagline", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Keywords", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ProviderIds", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Images", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ProductionLocations", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ThemeSongIds", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ThemeVideoIds", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "TotalBitrate", "INT", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ExtraType", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "Artists", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "AlbumArtists", "Text", existingColumnNames); + AddColumn(db, "TypedBaseItems", "ExternalId", "Text", existingColumnNames); + + existingColumnNames = GetColumnNames(db, "ItemValues"); + AddColumn(db, "ItemValues", "CleanValue", "Text", existingColumnNames); + + existingColumnNames = GetColumnNames(db, ChaptersTableName); + AddColumn(db, ChaptersTableName, "ImageDateModified", "DATETIME", existingColumnNames); + + existingColumnNames = GetColumnNames(db, "MediaStreams"); + AddColumn(db, "MediaStreams", "IsAvc", "BIT", existingColumnNames); + AddColumn(db, "MediaStreams", "TimeBase", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "CodecTimeBase", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "Title", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "NalLengthSize", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "Comment", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "CodecTag", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "PixelFormat", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "BitDepth", "INT", existingColumnNames); + AddColumn(db, "MediaStreams", "RefFrames", "INT", existingColumnNames); + AddColumn(db, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames); + AddColumn(db, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames); + }); + + string[] postQueries = + + { + // obsolete + "drop index if exists idx_TypedBaseItems", + "drop index if exists idx_mediastreams", + "drop index if exists idx_"+ChaptersTableName, + "drop index if exists idx_UserDataKeys1", + "drop index if exists idx_UserDataKeys2", + "drop index if exists idx_TypeTopParentId3", + "drop index if exists idx_TypeTopParentId2", + "drop index if exists idx_TypeTopParentId4", + "drop index if exists idx_Type", + "drop index if exists idx_TypeTopParentId", + "drop index if exists idx_GuidType", + "drop index if exists idx_TopParentId", + "drop index if exists idx_TypeTopParentId6", + "drop index if exists idx_ItemValues2", + "drop index if exists Idx_ProviderIds", + "drop index if exists idx_ItemValues3", + "drop index if exists idx_ItemValues4", + "drop index if exists idx_ItemValues5", + "drop index if exists idx_UserDataKeys3", + "drop table if exists UserDataKeys", + "drop table if exists ProviderIds", + "drop index if exists Idx_ProviderIds1", + "drop table if exists Images", + "drop index if exists idx_Images", + + "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", + "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", + + "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)", + "create index if not exists idx_GuidTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,Type,IsFolder,IsVirtualItem)", + //"create index if not exists idx_GuidMediaTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,MediaType,IsFolder,IsVirtualItem)", + "create index if not exists idx_CleanNameType on TypedBaseItems(CleanName,Type)", + + // covering index + "create index if not exists idx_TopParentIdGuid on TypedBaseItems(TopParentId,Guid)", + + // live tv programs + "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)", + + // covering index for getitemvalues + "create index if not exists idx_TypeTopParentIdGuid on TypedBaseItems(Type,TopParentId,Guid)", + + // used by movie suggestions + "create index if not exists idx_TypeTopParentIdGroup on TypedBaseItems(Type,TopParentId,PresentationUniqueKey)", + "create index if not exists idx_TypeTopParentId5 on TypedBaseItems(TopParentId,IsVirtualItem)", + + // latest items + "create index if not exists idx_TypeTopParentId9 on TypedBaseItems(TopParentId,Type,IsVirtualItem,PresentationUniqueKey,DateCreated)", + "create index if not exists idx_TypeTopParentId8 on TypedBaseItems(TopParentId,IsFolder,IsVirtualItem,PresentationUniqueKey,DateCreated)", + + // resume + "create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)", + + // items by name + "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)", + "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)" + }; + + _connection.RunQueries(postQueries); + + SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); + userDataRepo.Initialize(_connection, WriteLock); + //await Vacuum(_connection).ConfigureAwait(false); + } + + protected override bool EnableConnectionPooling + { + get + { + return false; + } + } + + protected override bool EnableExclusiveMode + { + get + { + return true; + } + } + + private readonly string[] _retriveItemColumns = + { + "type", + "data", + "StartDate", + "EndDate", + "IsOffline", + "ChannelId", + "IsMovie", + "IsSports", + "IsKids", + "IsSeries", + "IsLive", + "IsNews", + "IsPremiere", + "EpisodeTitle", + "IsRepeat", + "CommunityRating", + "CustomRating", + "IndexNumber", + "IsLocked", + "PreferredMetadataLanguage", + "PreferredMetadataCountryCode", + "IsHD", + "ExternalEtag", + "DateLastRefreshed", + "Name", + "Path", + "PremiereDate", + "Overview", + "ParentIndexNumber", + "ProductionYear", + "OfficialRating", + "OfficialRatingDescription", + "HomePageUrl", + "DisplayMediaType", + "ForcedSortName", + "RunTimeTicks", + "VoteCount", + "DateCreated", + "DateModified", + "guid", + "Genres", + "ParentId", + "Audio", + "ExternalServiceId", + "IsInMixedFolder", + "DateLastSaved", + "LockedFields", + "Studios", + "Tags", + "SourceType", + "TrailerTypes", + "OriginalTitle", + "PrimaryVersionId", + "DateLastMediaAdded", + "Album", + "CriticRating", + "CriticRatingSummary", + "IsVirtualItem", + "SeriesName", + "SeasonName", + "SeasonId", + "SeriesId", + "SeriesSortName", + "PresentationUniqueKey", + "InheritedParentalRatingValue", + "InheritedTags", + "ExternalSeriesId", + "ShortOverview", + "Tagline", + "Keywords", + "ProviderIds", + "Images", + "ProductionLocations", + "ThemeSongIds", + "ThemeVideoIds", + "TotalBitrate", + "ExtraType", + "Artists", + "AlbumArtists", + "ExternalId" + }; + + private readonly string[] _mediaStreamSaveColumns = + { + "ItemId", + "StreamIndex", + "StreamType", + "Codec", + "Language", + "ChannelLayout", + "Profile", + "AspectRatio", + "Path", + "IsInterlaced", + "BitRate", + "Channels", + "SampleRate", + "IsDefault", + "IsForced", + "IsExternal", + "Height", + "Width", + "AverageFrameRate", + "RealFrameRate", + "Level", + "PixelFormat", + "BitDepth", + "IsAnamorphic", + "RefFrames", + "CodecTag", + "Comment", + "NalLengthSize", + "IsAvc", + "Title", + "TimeBase", + "CodecTimeBase" + }; + + private string GetSaveItemCommandText() + { + var saveColumns = new List + { + "guid", + "type", + "data", + "Path", + "StartDate", + "EndDate", + "ChannelId", + "IsKids", + "IsMovie", + "IsSports", + "IsSeries", + "IsLive", + "IsNews", + "IsPremiere", + "EpisodeTitle", + "IsRepeat", + "CommunityRating", + "CustomRating", + "IndexNumber", + "IsLocked", + "Name", + "OfficialRating", + "MediaType", + "Overview", + "ParentIndexNumber", + "PremiereDate", + "ProductionYear", + "ParentId", + "Genres", + "InheritedParentalRatingValue", + "SchemaVersion", + "SortName", + "RunTimeTicks", + "OfficialRatingDescription", + "HomePageUrl", + "VoteCount", + "DisplayMediaType", + "DateCreated", + "DateModified", + "ForcedSortName", + "IsOffline", + "LocationType", + "PreferredMetadataLanguage", + "PreferredMetadataCountryCode", + "IsHD", + "ExternalEtag", + "DateLastRefreshed", + "DateLastSaved", + "IsInMixedFolder", + "LockedFields", + "Studios", + "Audio", + "ExternalServiceId", + "Tags", + "IsFolder", + "UnratedType", + "TopParentId", + "IsItemByName", + "SourceType", + "TrailerTypes", + "CriticRating", + "CriticRatingSummary", + "InheritedTags", + "CleanName", + "PresentationUniqueKey", + "SlugName", + "OriginalTitle", + "PrimaryVersionId", + "DateLastMediaAdded", + "Album", + "IsVirtualItem", + "SeriesName", + "UserDataKey", + "SeasonName", + "SeasonId", + "SeriesId", + "SeriesSortName", + "ExternalSeriesId", + "ShortOverview", + "Tagline", + "Keywords", + "ProviderIds", + "Images", + "ProductionLocations", + "ThemeSongIds", + "ThemeVideoIds", + "TotalBitrate", + "ExtraType", + "Artists", + "AlbumArtists", + "ExternalId" + }; + + var saveItemCommandCommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values ("; + + for (var i = 0; i < saveColumns.Count; i++) + { + if (i > 0) + { + saveItemCommandCommandText += ","; + } + saveItemCommandCommandText += "@" + saveColumns[i]; + } + saveItemCommandCommandText += ")"; + return saveItemCommandCommandText; + } + + /// + /// Save a standard item in the repo + /// + /// The item. + /// The cancellation token. + /// Task. + /// item + public Task SaveItem(BaseItem item, CancellationToken cancellationToken) + { + if (item == null) + { + throw new ArgumentNullException("item"); + } + + return SaveItems(new List { item }, cancellationToken); + } + + /// + /// Saves the items. + /// + /// The items. + /// The cancellation token. + /// Task. + /// + /// items + /// or + /// cancellationToken + /// + public async Task SaveItems(List items, CancellationToken cancellationToken) + { + if (items == null) + { + throw new ArgumentNullException("items"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + CheckDisposed(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + SaveItemsInTranscation(db, items); + }); + } + } + + private void SaveItemsInTranscation(IDatabaseConnection db, List items) + { + if (items == null) + { + throw new ArgumentNullException("items"); + } + + var requiresReset = false; + + using (var saveItemStatement = db.PrepareStatement(GetSaveItemCommandText())) + { + using (var deleteAncestorsStatement = db.PrepareStatement("delete from AncestorIds where ItemId=@ItemId")) + { + using (var updateAncestorsStatement = db.PrepareStatement("insert into AncestorIds (ItemId, AncestorId, AncestorIdText) values (@ItemId, @AncestorId, @AncestorIdText)")) + { + foreach (var item in items) + { + if (requiresReset) + { + saveItemStatement.Reset(); + } + + SaveItem(item, saveItemStatement); + //Logger.Debug(_saveItemCommand.CommandText); + + if (item.SupportsAncestors) + { + UpdateAncestors(item.Id, item.GetAncestorIds().Distinct().ToList(), db, deleteAncestorsStatement, updateAncestorsStatement); + } + + UpdateItemValues(item.Id, GetItemValuesToSave(item), db); + + requiresReset = true; + } + } + } + } + } + + private void SaveItem(BaseItem item, IStatement saveItemStatement) + { + saveItemStatement.TryBind("@guid", item.Id); + saveItemStatement.TryBind("@type", item.GetType().FullName); + + if (TypeRequiresDeserialization(item.GetType())) + { + saveItemStatement.TryBind("@data", _jsonSerializer.SerializeToBytes(item, _memoryStreamProvider)); + } + else + { + saveItemStatement.TryBindNull("@data"); + } + + saveItemStatement.TryBind("@Path", item.Path); + + var hasStartDate = item as IHasStartDate; + if (hasStartDate != null) + { + saveItemStatement.TryBind("@StartDate", hasStartDate.StartDate); + } + else + { + saveItemStatement.TryBindNull("@StartDate"); + } + + if (item.EndDate.HasValue) + { + saveItemStatement.TryBind("@EndDate", item.EndDate.Value); + } + else + { + saveItemStatement.TryBindNull("@EndDate"); + } + + saveItemStatement.TryBind("@ChannelId", item.ChannelId); + + var hasProgramAttributes = item as IHasProgramAttributes; + if (hasProgramAttributes != null) + { + saveItemStatement.TryBind("@IsKids", hasProgramAttributes.IsKids); + saveItemStatement.TryBind("@IsMovie", hasProgramAttributes.IsMovie); + saveItemStatement.TryBind("@IsSports", hasProgramAttributes.IsSports); + saveItemStatement.TryBind("@IsSeries", hasProgramAttributes.IsSeries); + saveItemStatement.TryBind("@IsLive", hasProgramAttributes.IsLive); + saveItemStatement.TryBind("@IsNews", hasProgramAttributes.IsNews); + saveItemStatement.TryBind("@IsPremiere", hasProgramAttributes.IsPremiere); + saveItemStatement.TryBind("@EpisodeTitle", hasProgramAttributes.EpisodeTitle); + saveItemStatement.TryBind("@IsRepeat", hasProgramAttributes.IsRepeat); + } + else + { + saveItemStatement.TryBindNull("@IsKids"); + saveItemStatement.TryBindNull("@IsMovie"); + saveItemStatement.TryBindNull("@IsSports"); + saveItemStatement.TryBindNull("@IsSeries"); + saveItemStatement.TryBindNull("@IsLive"); + saveItemStatement.TryBindNull("@IsNews"); + saveItemStatement.TryBindNull("@IsPremiere"); + saveItemStatement.TryBindNull("@EpisodeTitle"); + saveItemStatement.TryBindNull("@IsRepeat"); + } + + saveItemStatement.TryBind("@CommunityRating", item.CommunityRating); + saveItemStatement.TryBind("@CustomRating", item.CustomRating); + saveItemStatement.TryBind("@IndexNumber", item.IndexNumber); + saveItemStatement.TryBind("@IsLocked", item.IsLocked); + saveItemStatement.TryBind("@Name", item.Name); + saveItemStatement.TryBind("@OfficialRating", item.OfficialRating); + saveItemStatement.TryBind("@MediaType", item.MediaType); + saveItemStatement.TryBind("@Overview", item.Overview); + saveItemStatement.TryBind("@ParentIndexNumber", item.ParentIndexNumber); + saveItemStatement.TryBind("@PremiereDate", item.PremiereDate); + saveItemStatement.TryBind("@ProductionYear", item.ProductionYear); + + if (item.ParentId == Guid.Empty) + { + saveItemStatement.TryBindNull("@ParentId"); + } + else + { + saveItemStatement.TryBind("@ParentId", item.ParentId); + } + + if (item.Genres.Count > 0) + { + saveItemStatement.TryBind("@Genres", string.Join("|", item.Genres.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@Genres"); + } + + saveItemStatement.TryBind("@InheritedParentalRatingValue", item.GetInheritedParentalRatingValue() ?? 0); + saveItemStatement.TryBind("@SchemaVersion", LatestSchemaVersion); + + saveItemStatement.TryBind("@SortName", item.SortName); + saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks); + + saveItemStatement.TryBind("@OfficialRatingDescription", item.OfficialRatingDescription); + saveItemStatement.TryBind("@HomePageUrl", item.HomePageUrl); + saveItemStatement.TryBind("@VoteCount", item.VoteCount); + saveItemStatement.TryBind("@DisplayMediaType", item.DisplayMediaType); + saveItemStatement.TryBind("@DateCreated", item.DateCreated); + saveItemStatement.TryBind("@DateModified", item.DateModified); + + saveItemStatement.TryBind("@ForcedSortName", item.ForcedSortName); + saveItemStatement.TryBind("@IsOffline", item.IsOffline); + saveItemStatement.TryBind("@LocationType", item.LocationType.ToString()); + + saveItemStatement.TryBind("@PreferredMetadataLanguage", item.PreferredMetadataLanguage); + saveItemStatement.TryBind("@PreferredMetadataCountryCode", item.PreferredMetadataCountryCode); + saveItemStatement.TryBind("@IsHD", item.IsHD); + saveItemStatement.TryBind("@ExternalEtag", item.ExternalEtag); + + if (item.DateLastRefreshed == default(DateTime)) + { + saveItemStatement.TryBind("@DateLastRefreshed", item.DateLastRefreshed); + } + else + { + saveItemStatement.TryBindNull("@DateLastRefreshed"); + } + + if (item.DateLastSaved == default(DateTime)) + { + saveItemStatement.TryBind("@DateLastSaved", item.DateLastRefreshed); + } + else + { + saveItemStatement.TryBindNull("@DateLastSaved"); + } + + saveItemStatement.TryBind("@IsInMixedFolder", item.IsInMixedFolder); + + if (item.LockedFields.Count > 0) + { + saveItemStatement.TryBind("@LockedFields", string.Join("|", item.LockedFields.Select(i => i.ToString()).ToArray())); + } + else + { + saveItemStatement.TryBindNull("@LockedFields"); + } + + if (item.Studios.Count > 0) + { + saveItemStatement.TryBind("@Studios", string.Join("|", item.Studios.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@Studios"); + } + + if (item.Audio.HasValue) + { + saveItemStatement.TryBind("@Audio", item.Audio.Value.ToString()); + } + else + { + saveItemStatement.TryBindNull("@Audio"); + } + + saveItemStatement.TryBind("@ExternalServiceId", item.ServiceName); + + if (item.Tags.Count > 0) + { + saveItemStatement.TryBind("@Tags", string.Join("|", item.Tags.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@Tags"); + } + + saveItemStatement.TryBind("@IsFolder", item.IsFolder); + + saveItemStatement.TryBind("@UnratedType", item.GetBlockUnratedType().ToString()); + + var topParent = item.GetTopParent(); + if (topParent != null) + { + //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id); + saveItemStatement.TryBind("@IsFolder", topParent.Id.ToString("N")); + } + else + { + //Logger.Debug("Item {0} has null top parent", item.Id); + saveItemStatement.TryBindNull("@TopParentId"); + } + + var isByName = false; + var byName = item as IItemByName; + if (byName != null) + { + var dualAccess = item as IHasDualAccess; + isByName = dualAccess == null || dualAccess.IsAccessedByName; + } + saveItemStatement.TryBind("@IsItemByName", isByName); + saveItemStatement.TryBind("@SourceType", item.SourceType.ToString()); + + var trailer = item as Trailer; + if (trailer != null && trailer.TrailerTypes.Count > 0) + { + saveItemStatement.TryBind("@TrailerTypes", string.Join("|", trailer.TrailerTypes.Select(i => i.ToString()).ToArray())); + } + else + { + saveItemStatement.TryBindNull("@TrailerTypes"); + } + + saveItemStatement.TryBind("@CriticRating", item.CriticRating); + saveItemStatement.TryBind("@CriticRatingSummary", item.CriticRatingSummary); + + var inheritedTags = item.GetInheritedTags(); + if (inheritedTags.Count > 0) + { + saveItemStatement.TryBind("@InheritedTags", string.Join("|", inheritedTags.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@InheritedTags"); + } + + if (string.IsNullOrWhiteSpace(item.Name)) + { + saveItemStatement.TryBindNull("@CleanName"); + } + else + { + saveItemStatement.TryBind("@CleanName", GetCleanValue(item.Name)); + } + + saveItemStatement.TryBind("@PresentationUniqueKey", item.GetPresentationUniqueKey()); + saveItemStatement.TryBind("@SlugName", item.SlugName); + saveItemStatement.TryBind("@OriginalTitle", item.OriginalTitle); + + var video = item as Video; + if (video != null) + { + saveItemStatement.TryBind("@PrimaryVersionId", video.PrimaryVersionId); + } + else + { + saveItemStatement.TryBindNull("@PrimaryVersionId"); + } + + var folder = item as Folder; + if (folder != null && folder.DateLastMediaAdded.HasValue) + { + saveItemStatement.TryBind("@DateLastMediaAdded", folder.DateLastMediaAdded.Value); + } + else + { + saveItemStatement.TryBindNull("@DateLastMediaAdded"); + } + + saveItemStatement.TryBind("@Album", item.Album); + saveItemStatement.TryBind("@IsVirtualItem", item.IsVirtualItem); + + var hasSeries = item as IHasSeries; + if (hasSeries != null) + { + saveItemStatement.TryBind("@SeriesName", hasSeries.FindSeriesName()); + } + else + { + saveItemStatement.TryBindNull("@SeriesName"); + } + + saveItemStatement.TryBind("@UserDataKey", item.GetUserDataKeys().FirstOrDefault()); + + var episode = item as Episode; + if (episode != null) + { + saveItemStatement.TryBind("@SeasonName", episode.FindSeasonName()); + saveItemStatement.TryBind("@SeasonId", episode.FindSeasonId()); + } + else + { + saveItemStatement.TryBindNull("@SeasonName"); + saveItemStatement.TryBindNull("@SeasonId"); + } + + if (hasSeries != null) + { + saveItemStatement.TryBind("@SeriesId", hasSeries.FindSeriesId()); + saveItemStatement.TryBind("@SeriesSortName", hasSeries.FindSeriesSortName()); + } + else + { + saveItemStatement.TryBindNull("@SeriesId"); + saveItemStatement.TryBindNull("@SeriesSortName"); + } + + saveItemStatement.TryBind("@ExternalSeriesId", item.ExternalSeriesId); + saveItemStatement.TryBind("@ShortOverview", item.ShortOverview); + saveItemStatement.TryBind("@Tagline", item.Tagline); + + if (item.Keywords.Count > 0) + { + saveItemStatement.TryBind("@Keywords", string.Join("|", item.Keywords.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@Keywords"); + } + + saveItemStatement.TryBind("@ProviderIds", SerializeProviderIds(item)); + saveItemStatement.TryBind("@Images", SerializeImages(item)); + + if (item.ProductionLocations.Count > 0) + { + saveItemStatement.TryBind("@ProductionLocations", string.Join("|", item.ProductionLocations.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@ProductionLocations"); + } + + if (item.ThemeSongIds.Count > 0) + { + saveItemStatement.TryBind("@ThemeSongIds", string.Join("|", item.ThemeSongIds.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@ThemeSongIds"); + } + + if (item.ThemeVideoIds.Count > 0) + { + saveItemStatement.TryBind("@ThemeVideoIds", string.Join("|", item.ThemeVideoIds.ToArray())); + } + else + { + saveItemStatement.TryBindNull("@ThemeVideoIds"); + } + + saveItemStatement.TryBind("@TotalBitrate", item.TotalBitrate); + if (item.ExtraType.HasValue) + { + saveItemStatement.TryBind("@ExtraType", item.ExtraType.Value.ToString()); + } + else + { + saveItemStatement.TryBindNull("@ExtraType"); + } + + string artists = null; + var hasArtists = item as IHasArtist; + if (hasArtists != null) + { + if (hasArtists.Artists.Count > 0) + { + artists = string.Join("|", hasArtists.Artists.ToArray()); + } + } + saveItemStatement.TryBind("@Artists", artists); + + string albumArtists = null; + var hasAlbumArtists = item as IHasAlbumArtist; + if (hasAlbumArtists != null) + { + if (hasAlbumArtists.AlbumArtists.Count > 0) + { + albumArtists = string.Join("|", hasAlbumArtists.AlbumArtists.ToArray()); + } + } + saveItemStatement.TryBind("@AlbumArtists", albumArtists); + saveItemStatement.TryBind("@ExternalId", item.ExternalId); + + saveItemStatement.MoveNext(); + } + + private string SerializeProviderIds(BaseItem item) + { + // Ideally we shouldn't need this IsNullOrWhiteSpace check but we're seeing some cases of bad data slip through + var ids = item.ProviderIds + .Where(i => !string.IsNullOrWhiteSpace(i.Value)) + .ToList(); + + if (ids.Count == 0) + { + return null; + } + + return string.Join("|", ids.Select(i => i.Key + "=" + i.Value).ToArray()); + } + + private void DeserializeProviderIds(string value, BaseItem item) + { + if (string.IsNullOrWhiteSpace(value)) + { + return; + } + + if (item.ProviderIds.Count > 0) + { + return; + } + + var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); + + foreach (var part in parts) + { + var idParts = part.Split('='); + + if (idParts.Length == 2) + { + item.SetProviderId(idParts[0], idParts[1]); + } + } + } + + private string SerializeImages(BaseItem item) + { + var images = item.ImageInfos.ToList(); + + if (images.Count == 0) + { + return null; + } + + return string.Join("|", images.Select(ToValueString).ToArray()); + } + + private void DeserializeImages(string value, BaseItem item) + { + if (string.IsNullOrWhiteSpace(value)) + { + return; + } + + if (item.ImageInfos.Count > 0) + { + return; + } + + var parts = value.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); + + foreach (var part in parts) + { + item.ImageInfos.Add(ItemImageInfoFromValueString(part)); + } + } + + public string ToValueString(ItemImageInfo image) + { + var delimeter = "*"; + + return (image.Path ?? string.Empty) + + delimeter + + image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + + delimeter + + image.Type + + delimeter + + image.IsPlaceholder; + } + + public ItemImageInfo ItemImageInfoFromValueString(string value) + { + var parts = value.Split(new[] { '*' }, StringSplitOptions.None); + + var image = new ItemImageInfo(); + + image.Path = parts[0]; + image.DateModified = new DateTime(long.Parse(parts[1], CultureInfo.InvariantCulture), DateTimeKind.Utc); + image.Type = (ImageType)Enum.Parse(typeof(ImageType), parts[2], true); + image.IsPlaceholder = string.Equals(parts[3], true.ToString(), StringComparison.OrdinalIgnoreCase); + + return image; + } + + /// + /// Internal retrieve from items or users table + /// + /// The id. + /// BaseItem. + /// id + /// + public BaseItem RetrieveItem(Guid id) + { + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) + { + statement.TryBind("@guid", id); + + foreach (var row in statement.ExecuteQuery()) + { + return GetItem(row); + } + } + } + return null; + } + + private BaseItem GetItem(IReadOnlyList reader) + { + return GetItem(reader, new InternalItemsQuery()); + } + + private bool TypeRequiresDeserialization(Type type) + { + if (_config.Configuration.SkipDeserializationForBasicTypes) + { + if (type == typeof(MusicGenre)) + { + return false; + } + if (type == typeof(GameGenre)) + { + return false; + } + if (type == typeof(Genre)) + { + return false; + } + if (type == typeof(Studio)) + { + return false; + } + if (type == typeof(Year)) + { + return false; + } + if (type == typeof(Book)) + { + return false; + } + if (type == typeof(Person)) + { + return false; + } + if (type == typeof(RecordingGroup)) + { + return false; + } + if (type == typeof(Channel)) + { + return false; + } + if (type == typeof(ManualCollectionsFolder)) + { + return false; + } + if (type == typeof(CameraUploadsFolder)) + { + return false; + } + if (type == typeof(PlaylistsFolder)) + { + return false; + } + if (type == typeof(UserRootFolder)) + { + return false; + } + if (type == typeof(PhotoAlbum)) + { + return false; + } + if (type == typeof(Season)) + { + return false; + } + if (type == typeof(MusicArtist)) + { + return false; + } + } + if (_config.Configuration.SkipDeserializationForPrograms) + { + if (type == typeof(LiveTvProgram)) + { + return false; + } + } + if (_config.Configuration.SkipDeserializationForAudio) + { + if (type == typeof(Audio)) + { + return false; + } + if (type == typeof(LiveTvAudioRecording)) + { + return false; + } + if (type == typeof(AudioPodcast)) + { + return false; + } + if (type == typeof(MusicAlbum)) + { + return false; + } + } + + return true; + } + + private BaseItem GetItem(IReadOnlyList reader, InternalItemsQuery query) + { + var typeString = reader.GetString(0); + + var type = _typeMapper.GetType(typeString); + + if (type == null) + { + //Logger.Debug("Unknown type {0}", typeString); + + return null; + } + + BaseItem item = null; + + if (TypeRequiresDeserialization(type)) + { + using (var stream = _memoryStreamProvider.CreateNew(reader[1].ToBlob())) + { + stream.Position = 0; + + try + { + item = _jsonSerializer.DeserializeFromStream(stream, type) as BaseItem; + } + catch (SerializationException ex) + { + Logger.ErrorException("Error deserializing item", ex); + } + } + } + + if (item == null) + { + try + { + item = Activator.CreateInstance(type) as BaseItem; + } + catch + { + } + } + + if (item == null) + { + return null; + } + + if (!reader.IsDBNull(2)) + { + var hasStartDate = item as IHasStartDate; + if (hasStartDate != null) + { + hasStartDate.StartDate = reader[2].ReadDateTime(); + } + } + + if (!reader.IsDBNull(3)) + { + item.EndDate = reader[3].ReadDateTime(); + } + + if (!reader.IsDBNull(4)) + { + item.IsOffline = reader.GetBoolean(4); + } + + if (!reader.IsDBNull(5)) + { + item.ChannelId = reader.GetString(5); + } + + var hasProgramAttributes = item as IHasProgramAttributes; + if (hasProgramAttributes != null) + { + if (!reader.IsDBNull(6)) + { + hasProgramAttributes.IsMovie = reader.GetBoolean(6); + } + + if (!reader.IsDBNull(7)) + { + hasProgramAttributes.IsSports = reader.GetBoolean(7); + } + + if (!reader.IsDBNull(8)) + { + hasProgramAttributes.IsKids = reader.GetBoolean(8); + } + + if (!reader.IsDBNull(9)) + { + hasProgramAttributes.IsSeries = reader.GetBoolean(9); + } + + if (!reader.IsDBNull(10)) + { + hasProgramAttributes.IsLive = reader.GetBoolean(10); + } + + if (!reader.IsDBNull(11)) + { + hasProgramAttributes.IsNews = reader.GetBoolean(11); + } + + if (!reader.IsDBNull(12)) + { + hasProgramAttributes.IsPremiere = reader.GetBoolean(12); + } + + if (!reader.IsDBNull(13)) + { + hasProgramAttributes.EpisodeTitle = reader.GetString(13); + } + + if (!reader.IsDBNull(14)) + { + hasProgramAttributes.IsRepeat = reader.GetBoolean(14); + } + } + + var index = 15; + + if (!reader.IsDBNull(index)) + { + item.CommunityRating = reader.GetFloat(index); + } + index++; + + if (query.HasField(ItemFields.CustomRating)) + { + if (!reader.IsDBNull(index)) + { + item.CustomRating = reader.GetString(index); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.IndexNumber = reader.GetInt32(index); + } + index++; + + if (query.HasField(ItemFields.Settings)) + { + if (!reader.IsDBNull(index)) + { + item.IsLocked = reader.GetBoolean(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.PreferredMetadataLanguage = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.PreferredMetadataCountryCode = reader.GetString(index); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.IsHD = reader.GetBoolean(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.ExternalEtag = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.DateLastRefreshed = reader[index].ReadDateTime(); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.Name = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.Path = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.PremiereDate = reader[index].ReadDateTime(); + } + index++; + + if (query.HasField(ItemFields.Overview)) + { + if (!reader.IsDBNull(index)) + { + item.Overview = reader.GetString(index); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.ParentIndexNumber = reader.GetInt32(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.ProductionYear = reader.GetInt32(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.OfficialRating = reader.GetString(index); + } + index++; + + if (query.HasField(ItemFields.OfficialRatingDescription)) + { + if (!reader.IsDBNull(index)) + { + item.OfficialRatingDescription = reader.GetString(index); + } + index++; + } + + if (query.HasField(ItemFields.HomePageUrl)) + { + if (!reader.IsDBNull(index)) + { + item.HomePageUrl = reader.GetString(index); + } + index++; + } + + if (query.HasField(ItemFields.DisplayMediaType)) + { + if (!reader.IsDBNull(index)) + { + item.DisplayMediaType = reader.GetString(index); + } + index++; + } + + if (query.HasField(ItemFields.SortName)) + { + if (!reader.IsDBNull(index)) + { + item.ForcedSortName = reader.GetString(index); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.RunTimeTicks = reader.GetInt64(index); + } + index++; + + if (query.HasField(ItemFields.VoteCount)) + { + if (!reader.IsDBNull(index)) + { + item.VoteCount = reader.GetInt32(index); + } + index++; + } + + if (query.HasField(ItemFields.DateCreated)) + { + if (!reader.IsDBNull(index)) + { + item.DateCreated = reader[index].ReadDateTime(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.DateModified = reader[index].ReadDateTime(); + } + index++; + + item.Id = reader.GetGuid(index); + index++; + + if (query.HasField(ItemFields.Genres)) + { + if (!reader.IsDBNull(index)) + { + item.Genres = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.ParentId = reader.GetGuid(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.Audio = (ProgramAudio)Enum.Parse(typeof(ProgramAudio), reader.GetString(index), true); + } + index++; + + // TODO: Even if not needed by apps, the server needs it internally + // But get this excluded from contexts where it is not needed + if (!reader.IsDBNull(index)) + { + item.ServiceName = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.IsInMixedFolder = reader.GetBoolean(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.DateLastSaved = reader[index].ReadDateTime(); + } + index++; + + if (query.HasField(ItemFields.Settings)) + { + if (!reader.IsDBNull(index)) + { + item.LockedFields = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (MetadataFields)Enum.Parse(typeof(MetadataFields), i, true)).ToList(); + } + index++; + } + + if (query.HasField(ItemFields.Studios)) + { + if (!reader.IsDBNull(index)) + { + item.Studios = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + } + + if (query.HasField(ItemFields.Tags)) + { + if (!reader.IsDBNull(index)) + { + item.Tags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.SourceType = (SourceType)Enum.Parse(typeof(SourceType), reader.GetString(index), true); + } + index++; + + var trailer = item as Trailer; + if (trailer != null) + { + if (!reader.IsDBNull(index)) + { + trailer.TrailerTypes = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => (TrailerType)Enum.Parse(typeof(TrailerType), i, true)).ToList(); + } + } + index++; + + if (query.HasField(ItemFields.OriginalTitle)) + { + if (!reader.IsDBNull(index)) + { + item.OriginalTitle = reader.GetString(index); + } + index++; + } + + var video = item as Video; + if (video != null) + { + if (!reader.IsDBNull(index)) + { + video.PrimaryVersionId = reader.GetString(index); + } + } + index++; + + if (query.HasField(ItemFields.DateLastMediaAdded)) + { + var folder = item as Folder; + if (folder != null && !reader.IsDBNull(index)) + { + folder.DateLastMediaAdded = reader[index].ReadDateTime(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.Album = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.CriticRating = reader.GetFloat(index); + } + index++; + + if (query.HasField(ItemFields.CriticRatingSummary)) + { + if (!reader.IsDBNull(index)) + { + item.CriticRatingSummary = reader.GetString(index); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.IsVirtualItem = reader.GetBoolean(index); + } + index++; + + var hasSeries = item as IHasSeries; + if (hasSeries != null) + { + if (!reader.IsDBNull(index)) + { + hasSeries.SeriesName = reader.GetString(index); + } + } + index++; + + var episode = item as Episode; + if (episode != null) + { + if (!reader.IsDBNull(index)) + { + episode.SeasonName = reader.GetString(index); + } + index++; + if (!reader.IsDBNull(index)) + { + episode.SeasonId = reader.GetGuid(index); + } + } + else + { + index++; + } + index++; + + if (hasSeries != null) + { + if (!reader.IsDBNull(index)) + { + hasSeries.SeriesId = reader.GetGuid(index); + } + } + index++; + + if (hasSeries != null) + { + if (!reader.IsDBNull(index)) + { + hasSeries.SeriesSortName = reader.GetString(index); + } + } + index++; + + if (!reader.IsDBNull(index)) + { + item.PresentationUniqueKey = reader.GetString(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.InheritedParentalRatingValue = reader.GetInt32(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.InheritedTags = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.ExternalSeriesId = reader.GetString(index); + } + index++; + + if (query.HasField(ItemFields.ShortOverview)) + { + if (!reader.IsDBNull(index)) + { + item.ShortOverview = reader.GetString(index); + } + index++; + } + + if (query.HasField(ItemFields.Taglines)) + { + if (!reader.IsDBNull(index)) + { + item.Tagline = reader.GetString(index); + } + index++; + } + + if (query.HasField(ItemFields.Keywords)) + { + if (!reader.IsDBNull(index)) + { + item.Keywords = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + DeserializeProviderIds(reader.GetString(index), item); + } + index++; + + if (query.DtoOptions.EnableImages) + { + if (!reader.IsDBNull(index)) + { + DeserializeImages(reader.GetString(index), item); + } + index++; + } + + if (query.HasField(ItemFields.ProductionLocations)) + { + if (!reader.IsDBNull(index)) + { + item.ProductionLocations = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + } + + if (query.HasField(ItemFields.ThemeSongIds)) + { + if (!reader.IsDBNull(index)) + { + item.ThemeSongIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); + } + index++; + } + + if (query.HasField(ItemFields.ThemeVideoIds)) + { + if (!reader.IsDBNull(index)) + { + item.ThemeVideoIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList(); + } + index++; + } + + if (!reader.IsDBNull(index)) + { + item.TotalBitrate = reader.GetInt32(index); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.ExtraType = (ExtraType)Enum.Parse(typeof(ExtraType), reader.GetString(index), true); + } + index++; + + var hasArtists = item as IHasArtist; + if (hasArtists != null && !reader.IsDBNull(index)) + { + hasArtists.Artists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + + var hasAlbumArtists = item as IHasAlbumArtist; + if (hasAlbumArtists != null && !reader.IsDBNull(index)) + { + hasAlbumArtists.AlbumArtists = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + } + index++; + + if (!reader.IsDBNull(index)) + { + item.ExternalId = reader.GetString(index); + } + index++; + + if (string.IsNullOrWhiteSpace(item.Tagline)) + { + var movie = item as Movie; + if (movie != null && movie.Taglines.Count > 0) + { + movie.Tagline = movie.Taglines[0]; + } + } + + if (type == typeof(Person) && item.ProductionLocations.Count == 0) + { + var person = (Person)item; + if (!string.IsNullOrWhiteSpace(person.PlaceOfBirth)) + { + item.ProductionLocations = new List { person.PlaceOfBirth }; + } + } + + return item; + } + + /// + /// Gets the critic reviews. + /// + /// The item id. + /// Task{IEnumerable{ItemReview}}. + public IEnumerable GetCriticReviews(Guid itemId) + { + try + { + var path = Path.Combine(_criticReviewsPath, itemId + ".json"); + + return _jsonSerializer.DeserializeFromFile>(path); + } + catch (FileNotFoundException) + { + return new List(); + } + catch (IOException) + { + return new List(); + } + } + + private readonly Task _cachedTask = Task.FromResult(true); + /// + /// Saves the critic reviews. + /// + /// The item id. + /// The critic reviews. + /// Task. + public Task SaveCriticReviews(Guid itemId, IEnumerable criticReviews) + { + _fileSystem.CreateDirectory(_criticReviewsPath); + + var path = Path.Combine(_criticReviewsPath, itemId + ".json"); + + _jsonSerializer.SerializeToFile(criticReviews.ToList(), path); + + return _cachedTask; + } + + /// + /// Gets chapters for an item + /// + /// The id. + /// IEnumerable{ChapterInfo}. + /// id + public IEnumerable GetChapters(Guid id) + { + CheckDisposed(); + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + var list = new List(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) + { + statement.TryBind("@ItemId", id); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetChapter(row)); + } + } + } + + return list; + } + + /// + /// Gets a single chapter for an item + /// + /// The id. + /// The index. + /// ChapterInfo. + /// id + public ChapterInfo GetChapter(Guid id, int index) + { + CheckDisposed(); + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex")) + { + statement.TryBind("@ItemId", id); + statement.TryBind("@ChapterIndex", index); + + foreach (var row in statement.ExecuteQuery()) + { + return GetChapter(row); + } + } + } + return null; + } + + /// + /// Gets the chapter. + /// + /// The reader. + /// ChapterInfo. + private ChapterInfo GetChapter(IReadOnlyList reader) + { + var chapter = new ChapterInfo + { + StartPositionTicks = reader.GetInt64(0) + }; + + if (!reader.IsDBNull(1)) + { + chapter.Name = reader.GetString(1); + } + + if (!reader.IsDBNull(2)) + { + chapter.ImagePath = reader.GetString(2); + } + + if (!reader.IsDBNull(3)) + { + chapter.ImageDateModified = reader[3].ReadDateTime(); + } + + return chapter; + } + + /// + /// Saves the chapters. + /// + /// The id. + /// The chapters. + /// The cancellation token. + /// Task. + /// + /// id + /// or + /// chapters + /// or + /// cancellationToken + /// + public async Task SaveChapters(Guid id, List chapters, CancellationToken cancellationToken) + { + CheckDisposed(); + + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + if (chapters == null) + { + throw new ArgumentNullException("chapters"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + var index = 0; + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + // First delete chapters + _connection.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue()); + + using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)")) + { + foreach (var chapter in chapters) + { + if (index > 0) + { + saveChapterStatement.Reset(); + } + + saveChapterStatement.TryBind("@ItemId", id.ToGuidParamValue()); + saveChapterStatement.TryBind("@ChapterIndex", index); + saveChapterStatement.TryBind("@StartPositionTicks", chapter.StartPositionTicks); + saveChapterStatement.TryBind("@Name", chapter.Name); + saveChapterStatement.TryBind("@ImagePath", chapter.ImagePath); + saveChapterStatement.TryBind("@ImageDateModified", chapter.ImageDateModified); + + saveChapterStatement.MoveNext(); + + index++; + } + } + }); + } + } + + protected override void CloseConnection() + { + if (_connection != null) + { + _connection.Dispose(); + _connection = null; + } + } + + private bool EnableJoinUserData(InternalItemsQuery query) + { + if (query.User == null) + { + return false; + } + + if (query.SimilarTo != null && query.User != null) + { + return true; + } + + var sortingFields = query.SortBy.ToList(); + sortingFields.AddRange(query.OrderBy.Select(i => i.Item1)); + + if (sortingFields.Contains(ItemSortBy.IsFavoriteOrLiked, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + if (sortingFields.Contains(ItemSortBy.IsPlayed, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + if (sortingFields.Contains(ItemSortBy.IsUnplayed, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + if (sortingFields.Contains(ItemSortBy.PlayCount, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + if (sortingFields.Contains(ItemSortBy.DatePlayed, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + + if (query.IsFavoriteOrLiked.HasValue) + { + return true; + } + + if (query.IsFavorite.HasValue) + { + return true; + } + + if (query.IsResumable.HasValue) + { + return true; + } + + if (query.IsPlayed.HasValue) + { + return true; + } + + if (query.IsLiked.HasValue) + { + return true; + } + + return false; + } + + private List allFields = Enum.GetNames(typeof(ItemFields)) + .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) + .ToList(); + + private IEnumerable GetColumnNamesFromField(ItemFields field) + { + if (field == ItemFields.Settings) + { + return new[] { "IsLocked", "PreferredMetadataCountryCode", "PreferredMetadataLanguage", "LockedFields" }; + } + if (field == ItemFields.ServiceName) + { + return new[] { "ExternalServiceId" }; + } + if (field == ItemFields.SortName) + { + return new[] { "ForcedSortName" }; + } + if (field == ItemFields.Taglines) + { + return new[] { "Tagline" }; + } + + return new[] { field.ToString() }; + } + + private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns) + { + var list = startColumns.ToList(); + + foreach (var field in allFields) + { + if (!query.HasField(field)) + { + foreach (var fieldToRemove in GetColumnNamesFromField(field).ToList()) + { + list.Remove(fieldToRemove); + } + } + } + + if (!query.DtoOptions.EnableImages) + { + list.Remove("Images"); + } + + if (EnableJoinUserData(query)) + { + list.Add("UserDataDb.UserData.UserId"); + list.Add("UserDataDb.UserData.lastPlayedDate"); + list.Add("UserDataDb.UserData.playbackPositionTicks"); + list.Add("UserDataDb.UserData.playcount"); + list.Add("UserDataDb.UserData.isFavorite"); + list.Add("UserDataDb.UserData.played"); + list.Add("UserDataDb.UserData.rating"); + } + + if (query.SimilarTo != null) + { + var item = query.SimilarTo; + + var builder = new StringBuilder(); + builder.Append("("); + + builder.Append("((OfficialRating=@ItemOfficialRating) * 10)"); + //builder.Append("+ ((ProductionYear=@ItemProductionYear) * 10)"); + + builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 10 Then 2 Else 0 End )"); + builder.Append("+(Select Case When Abs(COALESCE(ProductionYear, 0) - @ItemProductionYear) < 5 Then 2 Else 0 End )"); + + //// genres + builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=2 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=2)) * 10)"); + + //// tags + builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=4 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=4)) * 10)"); + + builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=5 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=5)) * 10)"); + + builder.Append("+ ((Select count(CleanValue) from ItemValues where ItemId=Guid and Type=3 and CleanValue in (select CleanValue from itemvalues where ItemId=@SimilarItemId and type=3)) * 3)"); + + //builder.Append("+ ((Select count(Name) from People where ItemId=Guid and Name in (select Name from People where ItemId=@SimilarItemId)) * 3)"); + + ////builder.Append("(select group_concat((Select Name from People where ItemId=Guid and Name in (Select Name from People where ItemId=@SimilarItemId)), '|'))"); + + builder.Append(") as SimilarityScore"); + + list.Add(builder.ToString()); + + var excludeIds = query.ExcludeItemIds.ToList(); + excludeIds.Add(item.Id.ToString("N")); + query.ExcludeItemIds = excludeIds.ToArray(); + + query.ExcludeProviderIds = item.ProviderIds; + } + + return list.ToArray(); + } + + private void BindSimilarParams(InternalItemsQuery query, IStatement statement) + { + var item = query.SimilarTo; + + if (item == null) + { + return; + } + + statement.TryBind("@ItemOfficialRating", item.OfficialRating); + statement.TryBind("@ItemProductionYear", item.ProductionYear ?? 0); + statement.TryBind("@SimilarItemId", item.Id); + } + + private string GetJoinUserDataText(InternalItemsQuery query) + { + if (!EnableJoinUserData(query)) + { + return string.Empty; + } + + return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; + } -// cmd.CommandText += GetOrderByText(query); + private string GetGroupBy(InternalItemsQuery query) + { + var groups = new List(); + + if (EnableGroupByPresentationUniqueKey(query)) + { + groups.Add("PresentationUniqueKey"); + } + + if (groups.Count > 0) + { + return " Group by " + string.Join(",", groups.ToArray()); + } + + return string.Empty; + } -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; + private string GetFromText(string alias = "A") + { + return " from TypedBaseItems " + alias; + } -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } + public List GetItemList(InternalItemsQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// cmd.CommandText += "; select count (guid) from TypedBaseItems" + whereTextWithoutPaging; - -// var list = new List>(); -// var count = 0; - -// Logger.Debug(cmd.CommandText); - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) -// { -// while (reader.Read()) -// { -// var id = reader.GetGuid(0); -// string path = null; - -// if (!reader.IsDBNull(1)) -// { -// path = reader.GetString(1); -// } -// list.Add(new Tuple(id, path)); -// } - -// if (reader.NextResult() && reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } - -// return new QueryResult>() -// { -// Items = list.ToArray(), -// TotalRecordCount = count -// }; -// } -// } - -// public QueryResult GetItemIds(InternalItemsQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) -// { -// var list = GetItemIdsList(query); -// return new QueryResult -// { -// Items = list.ToArray(), -// TotalRecordCount = list.Count -// }; -// } - -// var now = DateTime.UtcNow; - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" }, cmd)) + GetFromText(); - -// var whereClauses = GetWhereClauses(query, cmd); -// cmd.CommandText += GetJoinUserDataText(query); - -// if (EnableJoinUserData(query)) -// { -// cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; -// } - -// var whereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// cmd.CommandText += whereText; - -// cmd.CommandText += GetGroupBy(query); - -// cmd.CommandText += GetOrderByText(query); - -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; - -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } - -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// if (EnableGroupByPresentationUniqueKey(query)) -// { -// cmd.CommandText += "; select count (distinct PresentationUniqueKey)" + GetFromText(); -// } -// else -// { -// cmd.CommandText += "; select count (guid)" + GetFromText(); -// } - -// cmd.CommandText += GetJoinUserDataText(query); -// cmd.CommandText += whereText; - -// var list = new List(); -// var count = 0; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) -// { -// LogQueryTime("GetItemIds", cmd, now); - -// while (reader.Read()) -// { -// list.Add(reader.GetGuid(0)); -// } - -// if (reader.NextResult() && reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } - -// return new QueryResult() -// { -// Items = list.ToArray(), -// TotalRecordCount = count -// }; -// } -// } - -// private List GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, string paramSuffix = "") -// { -// var whereClauses = new List(); - -// if (EnableJoinUserData(query)) -// { -// //whereClauses.Add("(UserId is null or UserId=@UserId)"); -// } -// if (query.IsHD.HasValue) -// { -// whereClauses.Add("IsHD=@IsHD"); -// cmd.Parameters.Add(cmd, "@IsHD", DbType.Boolean).Value = query.IsHD; -// } -// if (query.IsLocked.HasValue) -// { -// whereClauses.Add("IsLocked=@IsLocked"); -// cmd.Parameters.Add(cmd, "@IsLocked", DbType.Boolean).Value = query.IsLocked; -// } -// if (query.IsOffline.HasValue) -// { -// whereClauses.Add("IsOffline=@IsOffline"); -// cmd.Parameters.Add(cmd, "@IsOffline", DbType.Boolean).Value = query.IsOffline; -// } - -// var exclusiveProgramAttribtues = !(query.IsMovie ?? true) || -// !(query.IsSports ?? true) || -// !(query.IsKids ?? true) || -// !(query.IsNews ?? true) || -// !(query.IsSeries ?? true); - -// if (exclusiveProgramAttribtues) -// { -// if (query.IsMovie.HasValue) -// { -// var alternateTypes = new List(); -// if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) -// { -// alternateTypes.Add(typeof(Movie).FullName); -// } -// if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) -// { -// alternateTypes.Add(typeof(Trailer).FullName); -// } - -// if (alternateTypes.Count == 0) -// { -// whereClauses.Add("IsMovie=@IsMovie"); -// cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = query.IsMovie; -// } -// else -// { -// whereClauses.Add("(IsMovie is null OR IsMovie=@IsMovie)"); -// cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = query.IsMovie; -// } -// } -// if (query.IsSeries.HasValue) -// { -// whereClauses.Add("IsSeries=@IsSeries"); -// cmd.Parameters.Add(cmd, "@IsSeries", DbType.Boolean).Value = query.IsSeries; -// } -// if (query.IsNews.HasValue) -// { -// whereClauses.Add("IsNews=@IsNews"); -// cmd.Parameters.Add(cmd, "@IsNews", DbType.Boolean).Value = query.IsNews; -// } -// if (query.IsKids.HasValue) -// { -// whereClauses.Add("IsKids=@IsKids"); -// cmd.Parameters.Add(cmd, "@IsKids", DbType.Boolean).Value = query.IsKids; -// } -// if (query.IsSports.HasValue) -// { -// whereClauses.Add("IsSports=@IsSports"); -// cmd.Parameters.Add(cmd, "@IsSports", DbType.Boolean).Value = query.IsSports; -// } -// } -// else -// { -// var programAttribtues = new List(); -// if (query.IsMovie ?? false) -// { -// var alternateTypes = new List(); -// if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) -// { -// alternateTypes.Add(typeof(Movie).FullName); -// } -// if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) -// { -// alternateTypes.Add(typeof(Trailer).FullName); -// } - -// if (alternateTypes.Count == 0) -// { -// programAttribtues.Add("IsMovie=@IsMovie"); -// } -// else -// { -// programAttribtues.Add("(IsMovie is null OR IsMovie=@IsMovie)"); -// } - -// cmd.Parameters.Add(cmd, "@IsMovie", DbType.Boolean).Value = true; -// } -// if (query.IsSports ?? false) -// { -// programAttribtues.Add("IsSports=@IsSports"); -// cmd.Parameters.Add(cmd, "@IsSports", DbType.Boolean).Value = true; -// } -// if (query.IsNews ?? false) -// { -// programAttribtues.Add("IsNews=@IsNews"); -// cmd.Parameters.Add(cmd, "@IsNews", DbType.Boolean).Value = true; -// } -// if (query.IsSeries ?? false) -// { -// programAttribtues.Add("IsSeries=@IsSeries"); -// cmd.Parameters.Add(cmd, "@IsSeries", DbType.Boolean).Value = true; -// } -// if (query.IsKids ?? false) -// { -// programAttribtues.Add("IsKids=@IsKids"); -// cmd.Parameters.Add(cmd, "@IsKids", DbType.Boolean).Value = true; -// } -// if (programAttribtues.Count > 0) -// { -// whereClauses.Add("(" + string.Join(" OR ", programAttribtues.ToArray()) + ")"); -// } -// } - -// if (query.SimilarTo != null) -// { -// whereClauses.Add("SimilarityScore > 0"); -// } - -// if (query.IsFolder.HasValue) -// { -// whereClauses.Add("IsFolder=@IsFolder"); -// cmd.Parameters.Add(cmd, "@IsFolder", DbType.Boolean).Value = query.IsFolder; -// } - -// var includeTypes = query.IncludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); -// if (includeTypes.Length == 1) -// { -// whereClauses.Add("type=@type" + paramSuffix); -// cmd.Parameters.Add(cmd, "@type" + paramSuffix, DbType.String).Value = includeTypes[0]; -// } -// else if (includeTypes.Length > 1) -// { -// var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'").ToArray()); -// whereClauses.Add(string.Format("type in ({0})", inClause)); -// } - -// var excludeTypes = query.ExcludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); -// if (excludeTypes.Length == 1) -// { -// whereClauses.Add("type<>@type"); -// cmd.Parameters.Add(cmd, "@type", DbType.String).Value = excludeTypes[0]; -// } -// else if (excludeTypes.Length > 1) -// { -// var inClause = string.Join(",", excludeTypes.Select(i => "'" + i + "'").ToArray()); -// whereClauses.Add(string.Format("type not in ({0})", inClause)); -// } - -// if (query.ChannelIds.Length == 1) -// { -// whereClauses.Add("ChannelId=@ChannelId"); -// cmd.Parameters.Add(cmd, "@ChannelId", DbType.String).Value = query.ChannelIds[0]; -// } -// if (query.ChannelIds.Length > 1) -// { -// var inClause = string.Join(",", query.ChannelIds.Select(i => "'" + i + "'").ToArray()); -// whereClauses.Add(string.Format("ChannelId in ({0})", inClause)); -// } - -// if (query.ParentId.HasValue) -// { -// whereClauses.Add("ParentId=@ParentId"); -// cmd.Parameters.Add(cmd, "@ParentId", DbType.Guid).Value = query.ParentId.Value; -// } - -// if (!string.IsNullOrWhiteSpace(query.Path)) -// { -// whereClauses.Add("Path=@Path"); -// cmd.Parameters.Add(cmd, "@Path", DbType.String).Value = query.Path; -// } - -// if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) -// { -// whereClauses.Add("PresentationUniqueKey=@PresentationUniqueKey"); -// cmd.Parameters.Add(cmd, "@PresentationUniqueKey", DbType.String).Value = query.PresentationUniqueKey; -// } - -// if (query.MinCommunityRating.HasValue) -// { -// whereClauses.Add("CommunityRating>=@MinCommunityRating"); -// cmd.Parameters.Add(cmd, "@MinCommunityRating", DbType.Double).Value = query.MinCommunityRating.Value; -// } - -// if (query.MinIndexNumber.HasValue) -// { -// whereClauses.Add("IndexNumber>=@MinIndexNumber"); -// cmd.Parameters.Add(cmd, "@MinIndexNumber", DbType.Int32).Value = query.MinIndexNumber.Value; -// } - -// if (query.MinDateCreated.HasValue) -// { -// whereClauses.Add("DateCreated>=@MinDateCreated"); -// cmd.Parameters.Add(cmd, "@MinDateCreated", DbType.DateTime).Value = query.MinDateCreated.Value; -// } - -// if (query.MinDateLastSaved.HasValue) -// { -// whereClauses.Add("DateLastSaved>=@MinDateLastSaved"); -// cmd.Parameters.Add(cmd, "@MinDateLastSaved", DbType.DateTime).Value = query.MinDateLastSaved.Value; -// } - -// //if (query.MinPlayers.HasValue) -// //{ -// // whereClauses.Add("Players>=@MinPlayers"); -// // cmd.Parameters.Add(cmd, "@MinPlayers", DbType.Int32).Value = query.MinPlayers.Value; -// //} - -// //if (query.MaxPlayers.HasValue) -// //{ -// // whereClauses.Add("Players<=@MaxPlayers"); -// // cmd.Parameters.Add(cmd, "@MaxPlayers", DbType.Int32).Value = query.MaxPlayers.Value; -// //} - -// if (query.IndexNumber.HasValue) -// { -// whereClauses.Add("IndexNumber=@IndexNumber"); -// cmd.Parameters.Add(cmd, "@IndexNumber", DbType.Int32).Value = query.IndexNumber.Value; -// } -// if (query.ParentIndexNumber.HasValue) -// { -// whereClauses.Add("ParentIndexNumber=@ParentIndexNumber"); -// cmd.Parameters.Add(cmd, "@ParentIndexNumber", DbType.Int32).Value = query.ParentIndexNumber.Value; -// } -// if (query.ParentIndexNumberNotEquals.HasValue) -// { -// whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)"); -// cmd.Parameters.Add(cmd, "@ParentIndexNumberNotEquals", DbType.Int32).Value = query.ParentIndexNumberNotEquals.Value; -// } -// if (query.MinEndDate.HasValue) -// { -// whereClauses.Add("EndDate>=@MinEndDate"); -// cmd.Parameters.Add(cmd, "@MinEndDate", DbType.Date).Value = query.MinEndDate.Value; -// } - -// if (query.MaxEndDate.HasValue) -// { -// whereClauses.Add("EndDate<=@MaxEndDate"); -// cmd.Parameters.Add(cmd, "@MaxEndDate", DbType.Date).Value = query.MaxEndDate.Value; -// } - -// if (query.MinStartDate.HasValue) -// { -// whereClauses.Add("StartDate>=@MinStartDate"); -// cmd.Parameters.Add(cmd, "@MinStartDate", DbType.Date).Value = query.MinStartDate.Value; -// } - -// if (query.MaxStartDate.HasValue) -// { -// whereClauses.Add("StartDate<=@MaxStartDate"); -// cmd.Parameters.Add(cmd, "@MaxStartDate", DbType.Date).Value = query.MaxStartDate.Value; -// } - -// if (query.MinPremiereDate.HasValue) -// { -// whereClauses.Add("PremiereDate>=@MinPremiereDate"); -// cmd.Parameters.Add(cmd, "@MinPremiereDate", DbType.Date).Value = query.MinPremiereDate.Value; -// } -// if (query.MaxPremiereDate.HasValue) -// { -// whereClauses.Add("PremiereDate<=@MaxPremiereDate"); -// cmd.Parameters.Add(cmd, "@MaxPremiereDate", DbType.Date).Value = query.MaxPremiereDate.Value; -// } - -// if (query.SourceTypes.Length == 1) -// { -// whereClauses.Add("SourceType=@SourceType"); -// cmd.Parameters.Add(cmd, "@SourceType", DbType.String).Value = query.SourceTypes[0]; -// } -// else if (query.SourceTypes.Length > 1) -// { -// var inClause = string.Join(",", query.SourceTypes.Select(i => "'" + i + "'").ToArray()); -// whereClauses.Add(string.Format("SourceType in ({0})", inClause)); -// } - -// if (query.ExcludeSourceTypes.Length == 1) -// { -// whereClauses.Add("SourceType<>@SourceType"); -// cmd.Parameters.Add(cmd, "@SourceType", DbType.String).Value = query.SourceTypes[0]; -// } -// else if (query.ExcludeSourceTypes.Length > 1) -// { -// var inClause = string.Join(",", query.ExcludeSourceTypes.Select(i => "'" + i + "'").ToArray()); -// whereClauses.Add(string.Format("SourceType not in ({0})", inClause)); -// } - -// if (query.TrailerTypes.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var type in query.TrailerTypes) -// { -// clauses.Add("TrailerTypes like @TrailerTypes" + index); -// cmd.Parameters.Add(cmd, "@TrailerTypes" + index, DbType.String).Value = "%" + type + "%"; -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.IsAiring.HasValue) -// { -// if (query.IsAiring.Value) -// { -// whereClauses.Add("StartDate<=@MaxStartDate"); -// cmd.Parameters.Add(cmd, "@MaxStartDate", DbType.Date).Value = DateTime.UtcNow; - -// whereClauses.Add("EndDate>=@MinEndDate"); -// cmd.Parameters.Add(cmd, "@MinEndDate", DbType.Date).Value = DateTime.UtcNow; -// } -// else -// { -// whereClauses.Add("(StartDate>@IsAiringDate OR EndDate < @IsAiringDate)"); -// cmd.Parameters.Add(cmd, "@IsAiringDate", DbType.Date).Value = DateTime.UtcNow; -// } -// } - -// if (query.PersonIds.Length > 0) -// { -// // Todo: improve without having to do this -// query.Person = query.PersonIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).FirstOrDefault(); -// } - -// if (!string.IsNullOrWhiteSpace(query.Person)) -// { -// whereClauses.Add("Guid in (select ItemId from People where Name=@PersonName)"); -// cmd.Parameters.Add(cmd, "@PersonName", DbType.String).Value = query.Person; -// } - -// if (!string.IsNullOrWhiteSpace(query.SlugName)) -// { -// whereClauses.Add("SlugName=@SlugName"); -// cmd.Parameters.Add(cmd, "@SlugName", DbType.String).Value = query.SlugName; -// } - -// if (!string.IsNullOrWhiteSpace(query.MinSortName)) -// { -// whereClauses.Add("SortName>=@MinSortName"); -// cmd.Parameters.Add(cmd, "@MinSortName", DbType.String).Value = query.MinSortName; -// } - -// if (!string.IsNullOrWhiteSpace(query.ExternalSeriesId)) -// { -// whereClauses.Add("ExternalSeriesId=@ExternalSeriesId"); -// cmd.Parameters.Add(cmd, "@ExternalSeriesId", DbType.String).Value = query.ExternalSeriesId; -// } - -// if (!string.IsNullOrWhiteSpace(query.Name)) -// { -// whereClauses.Add("CleanName=@Name"); -// cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = GetCleanValue(query.Name); -// } - -// if (!string.IsNullOrWhiteSpace(query.NameContains)) -// { -// whereClauses.Add("CleanName like @NameContains"); -// cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + GetCleanValue(query.NameContains) + "%"; -// } -// if (!string.IsNullOrWhiteSpace(query.NameStartsWith)) -// { -// whereClauses.Add("SortName like @NameStartsWith"); -// cmd.Parameters.Add(cmd, "@NameStartsWith", DbType.String).Value = query.NameStartsWith + "%"; -// } -// if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater)) -// { -// whereClauses.Add("SortName >= @NameStartsWithOrGreater"); -// // lowercase this because SortName is stored as lowercase -// cmd.Parameters.Add(cmd, "@NameStartsWithOrGreater", DbType.String).Value = query.NameStartsWithOrGreater.ToLower(); -// } -// if (!string.IsNullOrWhiteSpace(query.NameLessThan)) -// { -// whereClauses.Add("SortName < @NameLessThan"); -// // lowercase this because SortName is stored as lowercase -// cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower(); -// } - -// if (query.ImageTypes.Length > 0) -// { -// foreach (var requiredImage in query.ImageTypes) -// { -// whereClauses.Add("Images like '%" + requiredImage + "%'"); -// } -// } - -// if (query.IsLiked.HasValue) -// { -// if (query.IsLiked.Value) -// { -// whereClauses.Add("rating>=@UserRating"); -// cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue; -// } -// else -// { -// whereClauses.Add("(rating is null or rating<@UserRating)"); -// cmd.Parameters.Add(cmd, "@UserRating", DbType.Double).Value = UserItemData.MinLikeValue; -// } -// } - -// if (query.IsFavoriteOrLiked.HasValue) -// { -// if (query.IsFavoriteOrLiked.Value) -// { -// whereClauses.Add("IsFavorite=@IsFavoriteOrLiked"); -// } -// else -// { -// whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavoriteOrLiked)"); -// } -// cmd.Parameters.Add(cmd, "@IsFavoriteOrLiked", DbType.Boolean).Value = query.IsFavoriteOrLiked.Value; -// } - -// if (query.IsFavorite.HasValue) -// { -// if (query.IsFavorite.Value) -// { -// whereClauses.Add("IsFavorite=@IsFavorite"); -// } -// else -// { -// whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavorite)"); -// } -// cmd.Parameters.Add(cmd, "@IsFavorite", DbType.Boolean).Value = query.IsFavorite.Value; -// } - -// if (EnableJoinUserData(query)) -// { -// if (query.IsPlayed.HasValue) -// { -// if (query.IsPlayed.Value) -// { -// whereClauses.Add("(played=@IsPlayed)"); -// } -// else -// { -// whereClauses.Add("(played is null or played=@IsPlayed)"); -// } -// cmd.Parameters.Add(cmd, "@IsPlayed", DbType.Boolean).Value = query.IsPlayed.Value; -// } -// } - -// if (query.IsResumable.HasValue) -// { -// if (query.IsResumable.Value) -// { -// whereClauses.Add("playbackPositionTicks > 0"); -// } -// else -// { -// whereClauses.Add("(playbackPositionTicks is null or playbackPositionTicks = 0)"); -// } -// } - -// if (query.ArtistNames.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var artist in query.ArtistNames) -// { -// clauses.Add("@ArtistName" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); -// cmd.Parameters.Add(cmd, "@ArtistName" + index, DbType.String).Value = GetCleanValue(artist); -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.ExcludeArtistIds.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var artistId in query.ExcludeArtistIds) -// { -// var artistItem = RetrieveItem(new Guid(artistId)); -// if (artistItem != null) -// { -// clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); -// cmd.Parameters.Add(cmd, "@ExcludeArtistName" + index, DbType.String).Value = GetCleanValue(artistItem.Name); -// index++; -// } -// } -// var clause = "(" + string.Join(" AND ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.GenreIds.Length > 0) -// { -// // Todo: improve without having to do this -// query.Genres = query.GenreIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); -// } - -// if (query.Genres.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var item in query.Genres) -// { -// clauses.Add("@Genre" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=2)"); -// cmd.Parameters.Add(cmd, "@Genre" + index, DbType.String).Value = GetCleanValue(item); -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.Tags.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var item in query.Tags) -// { -// clauses.Add("@Tag" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=4)"); -// cmd.Parameters.Add(cmd, "@Tag" + index, DbType.String).Value = GetCleanValue(item); -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.StudioIds.Length > 0) -// { -// // Todo: improve without having to do this -// query.Studios = query.StudioIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); -// } - -// if (query.Studios.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var item in query.Studios) -// { -// clauses.Add("@Studio" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=3)"); -// cmd.Parameters.Add(cmd, "@Studio" + index, DbType.String).Value = GetCleanValue(item); -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.Keywords.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var item in query.Keywords) -// { -// clauses.Add("@Keyword" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=5)"); -// cmd.Parameters.Add(cmd, "@Keyword" + index, DbType.String).Value = GetCleanValue(item); -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.OfficialRatings.Length > 0) -// { -// var clauses = new List(); -// var index = 0; -// foreach (var item in query.OfficialRatings) -// { -// clauses.Add("OfficialRating=@OfficialRating" + index); -// cmd.Parameters.Add(cmd, "@OfficialRating" + index, DbType.String).Value = item; -// index++; -// } -// var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; -// whereClauses.Add(clause); -// } - -// if (query.MinParentalRating.HasValue) -// { -// whereClauses.Add("InheritedParentalRatingValue<=@MinParentalRating"); -// cmd.Parameters.Add(cmd, "@MinParentalRating", DbType.Int32).Value = query.MinParentalRating.Value; -// } - -// if (query.MaxParentalRating.HasValue) -// { -// whereClauses.Add("InheritedParentalRatingValue<=@MaxParentalRating"); -// cmd.Parameters.Add(cmd, "@MaxParentalRating", DbType.Int32).Value = query.MaxParentalRating.Value; -// } - -// if (query.HasParentalRating.HasValue) -// { -// if (query.HasParentalRating.Value) -// { -// whereClauses.Add("InheritedParentalRatingValue > 0"); -// } -// else -// { -// whereClauses.Add("InheritedParentalRatingValue = 0"); -// } -// } - -// if (query.HasOverview.HasValue) -// { -// if (query.HasOverview.Value) -// { -// whereClauses.Add("(Overview not null AND Overview<>'')"); -// } -// else -// { -// whereClauses.Add("(Overview is null OR Overview='')"); -// } -// } - -// if (query.HasDeadParentId.HasValue) -// { -// if (query.HasDeadParentId.Value) -// { -// whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)"); -// } -// } - -// if (query.Years.Length == 1) -// { -// whereClauses.Add("ProductionYear=@Years"); -// cmd.Parameters.Add(cmd, "@Years", DbType.Int32).Value = query.Years[0].ToString(); -// } -// else if (query.Years.Length > 1) -// { -// var val = string.Join(",", query.Years.ToArray()); - -// whereClauses.Add("ProductionYear in (" + val + ")"); -// } - -// if (query.LocationTypes.Length == 1) -// { -// if (query.LocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) -// { -// query.IsVirtualItem = true; -// } -// else -// { -// whereClauses.Add("LocationType=@LocationType"); -// cmd.Parameters.Add(cmd, "@LocationType", DbType.String).Value = query.LocationTypes[0].ToString(); -// } -// } -// else if (query.LocationTypes.Length > 1) -// { -// var val = string.Join(",", query.LocationTypes.Select(i => "'" + i + "'").ToArray()); - -// whereClauses.Add("LocationType in (" + val + ")"); -// } -// if (query.ExcludeLocationTypes.Length == 1) -// { -// if (query.ExcludeLocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) -// { -// query.IsVirtualItem = false; -// } -// else -// { -// whereClauses.Add("LocationType<>@ExcludeLocationTypes"); -// cmd.Parameters.Add(cmd, "@ExcludeLocationTypes", DbType.String).Value = query.ExcludeLocationTypes[0].ToString(); -// } -// } -// else if (query.ExcludeLocationTypes.Length > 1) -// { -// var val = string.Join(",", query.ExcludeLocationTypes.Select(i => "'" + i + "'").ToArray()); - -// whereClauses.Add("LocationType not in (" + val + ")"); -// } -// if (query.IsVirtualItem.HasValue) -// { -// whereClauses.Add("IsVirtualItem=@IsVirtualItem"); -// cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value; -// } -// if (query.IsSpecialSeason.HasValue) -// { -// if (query.IsSpecialSeason.Value) -// { -// whereClauses.Add("IndexNumber = 0"); -// } -// else -// { -// whereClauses.Add("IndexNumber <> 0"); -// } -// } -// if (query.IsUnaired.HasValue) -// { -// if (query.IsUnaired.Value) -// { -// whereClauses.Add("PremiereDate >= DATETIME('now')"); -// } -// else -// { -// whereClauses.Add("PremiereDate < DATETIME('now')"); -// } -// } -// if (query.IsMissing.HasValue) -// { -// if (query.IsMissing.Value) -// { -// whereClauses.Add("(IsVirtualItem=1 AND PremiereDate < DATETIME('now'))"); -// } -// else -// { -// whereClauses.Add("(IsVirtualItem=0 OR PremiereDate >= DATETIME('now'))"); -// } -// } -// if (query.IsVirtualUnaired.HasValue) -// { -// if (query.IsVirtualUnaired.Value) -// { -// whereClauses.Add("(IsVirtualItem=1 AND PremiereDate >= DATETIME('now'))"); -// } -// else -// { -// whereClauses.Add("(IsVirtualItem=0 OR PremiereDate < DATETIME('now'))"); -// } -// } -// if (query.MediaTypes.Length == 1) -// { -// whereClauses.Add("MediaType=@MediaTypes"); -// cmd.Parameters.Add(cmd, "@MediaTypes", DbType.String).Value = query.MediaTypes[0]; -// } -// if (query.MediaTypes.Length > 1) -// { -// var val = string.Join(",", query.MediaTypes.Select(i => "'" + i + "'").ToArray()); - -// whereClauses.Add("MediaType in (" + val + ")"); -// } -// if (query.ItemIds.Length > 0) -// { -// var includeIds = new List(); - -// var index = 0; -// foreach (var id in query.ItemIds) -// { -// includeIds.Add("Guid = @IncludeId" + index); -// cmd.Parameters.Add(cmd, "@IncludeId" + index, DbType.Guid).Value = new Guid(id); -// index++; -// } - -// whereClauses.Add(string.Join(" OR ", includeIds.ToArray())); -// } -// if (query.ExcludeItemIds.Length > 0) -// { -// var excludeIds = new List(); - -// var index = 0; -// foreach (var id in query.ExcludeItemIds) -// { -// excludeIds.Add("Guid <> @ExcludeId" + index); -// cmd.Parameters.Add(cmd, "@ExcludeId" + index, DbType.Guid).Value = new Guid(id); -// index++; -// } - -// whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); -// } - -// if (query.ExcludeProviderIds.Count > 0) -// { -// var excludeIds = new List(); - -// var index = 0; -// foreach (var pair in query.ExcludeProviderIds) -// { -// if (string.Equals(pair.Key, MetadataProviders.TmdbCollection.ToString(), StringComparison.OrdinalIgnoreCase)) -// { -// continue; -// } - -// var paramName = "@ExcludeProviderId" + index; -// //excludeIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")"); -// excludeIds.Add("ProviderIds not like " + paramName); -// cmd.Parameters.Add(cmd, paramName, DbType.String).Value = "%" + pair.Key + "=" + pair.Value + "%"; -// index++; - -// break; -// } - -// whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); -// } - -// if (query.HasImdbId.HasValue) -// { -// whereClauses.Add("ProviderIds like '%imdb=%'"); -// } - -// if (query.HasTmdbId.HasValue) -// { -// whereClauses.Add("ProviderIds like '%tmdb=%'"); -// } - -// if (query.HasTvdbId.HasValue) -// { -// whereClauses.Add("ProviderIds like '%tvdb=%'"); -// } - -// if (query.AlbumNames.Length > 0) -// { -// var clause = "("; - -// var index = 0; -// foreach (var name in query.AlbumNames) -// { -// if (index > 0) -// { -// clause += " OR "; -// } -// clause += "Album=@AlbumName" + index; -// cmd.Parameters.Add(cmd, "@AlbumName" + index, DbType.String).Value = name; -// index++; -// } - -// clause += ")"; -// whereClauses.Add(clause); -// } -// if (query.HasThemeSong.HasValue) -// { -// if (query.HasThemeSong.Value) -// { -// whereClauses.Add("ThemeSongIds not null"); -// } -// else -// { -// whereClauses.Add("ThemeSongIds is null"); -// } -// } -// if (query.HasThemeVideo.HasValue) -// { -// if (query.HasThemeVideo.Value) -// { -// whereClauses.Add("ThemeVideoIds not null"); -// } -// else -// { -// whereClauses.Add("ThemeVideoIds is null"); -// } -// } - -// //var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0; -// var enableItemsByName = query.IncludeItemsByName ?? false; - -// if (query.TopParentIds.Length == 1) -// { -// if (enableItemsByName) -// { -// whereClauses.Add("(TopParentId=@TopParentId or IsItemByName=@IsItemByName)"); -// cmd.Parameters.Add(cmd, "@IsItemByName", DbType.Boolean).Value = true; -// } -// else -// { -// whereClauses.Add("(TopParentId=@TopParentId)"); -// } -// cmd.Parameters.Add(cmd, "@TopParentId", DbType.String).Value = query.TopParentIds[0]; -// } -// if (query.TopParentIds.Length > 1) -// { -// var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray()); - -// if (enableItemsByName) -// { -// whereClauses.Add("(IsItemByName=@IsItemByName or TopParentId in (" + val + "))"); -// cmd.Parameters.Add(cmd, "@IsItemByName", DbType.Boolean).Value = true; -// } -// else -// { -// whereClauses.Add("(TopParentId in (" + val + "))"); -// } -// } - -// if (query.AncestorIds.Length == 1) -// { -// whereClauses.Add("Guid in (select itemId from AncestorIds where AncestorId=@AncestorId)"); -// cmd.Parameters.Add(cmd, "@AncestorId", DbType.Guid).Value = new Guid(query.AncestorIds[0]); -// } -// if (query.AncestorIds.Length > 1) -// { -// var inClause = string.Join(",", query.AncestorIds.Select(i => "'" + new Guid(i).ToString("N") + "'").ToArray()); -// whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause)); -// } -// if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)) -// { -// var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey"; -// whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorId in ({0}))", inClause)); -// cmd.Parameters.Add(cmd, "@AncestorWithPresentationUniqueKey", DbType.String).Value = query.AncestorWithPresentationUniqueKey; -// } - -// if (query.BlockUnratedItems.Length == 1) -// { -// whereClauses.Add("(InheritedParentalRatingValue > 0 or UnratedType <> @UnratedType)"); -// cmd.Parameters.Add(cmd, "@UnratedType", DbType.String).Value = query.BlockUnratedItems[0].ToString(); -// } -// if (query.BlockUnratedItems.Length > 1) -// { -// var inClause = string.Join(",", query.BlockUnratedItems.Select(i => "'" + i.ToString() + "'").ToArray()); -// whereClauses.Add(string.Format("(InheritedParentalRatingValue > 0 or UnratedType not in ({0}))", inClause)); -// } - -// var excludeTagIndex = 0; -// foreach (var excludeTag in query.ExcludeTags) -// { -// whereClauses.Add("(Tags is null OR Tags not like @excludeTag" + excludeTagIndex + ")"); -// cmd.Parameters.Add(cmd, "@excludeTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; -// excludeTagIndex++; -// } - -// excludeTagIndex = 0; -// foreach (var excludeTag in query.ExcludeInheritedTags) -// { -// whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex + ")"); -// cmd.Parameters.Add(cmd, "@excludeInheritedTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; -// excludeTagIndex++; -// } - -// return whereClauses; -// } - -// private string GetCleanValue(string value) -// { -// if (string.IsNullOrWhiteSpace(value)) -// { -// return value; -// } - -// return value.RemoveDiacritics().ToLower(); -// } - -// private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query) -// { -// if (!query.GroupByPresentationUniqueKey) -// { -// return false; -// } - -// if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) -// { -// return false; -// } - -// if (query.User == null) -// { -// return false; -// } - -// if (query.IncludeItemTypes.Length == 0) -// { -// return true; -// } - -// var types = new[] { -// typeof(Episode).Name, -// typeof(Video).Name , -// typeof(Movie).Name , -// typeof(MusicVideo).Name , -// typeof(Series).Name , -// typeof(Season).Name }; - -// if (types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase))) -// { -// return true; -// } - -// return false; -// } - -// private static readonly Type[] KnownTypes = -// { -// typeof(LiveTvProgram), -// typeof(LiveTvChannel), -// typeof(LiveTvVideoRecording), -// typeof(LiveTvAudioRecording), -// typeof(Series), -// typeof(Audio), -// typeof(MusicAlbum), -// typeof(MusicArtist), -// typeof(MusicGenre), -// typeof(MusicVideo), -// typeof(Movie), -// typeof(Playlist), -// typeof(AudioPodcast), -// typeof(Trailer), -// typeof(BoxSet), -// typeof(Episode), -// typeof(Season), -// typeof(Series), -// typeof(Book), -// typeof(CollectionFolder), -// typeof(Folder), -// typeof(Game), -// typeof(GameGenre), -// typeof(GameSystem), -// typeof(Genre), -// typeof(Person), -// typeof(Photo), -// typeof(PhotoAlbum), -// typeof(Studio), -// typeof(UserRootFolder), -// typeof(UserView), -// typeof(Video), -// typeof(Year), -// typeof(Channel), -// typeof(AggregateFolder) -// }; - -// public async Task UpdateInheritedValues(CancellationToken cancellationToken) -// { -// await UpdateInheritedTags(cancellationToken).ConfigureAwait(false); -// } - -// private async Task UpdateInheritedTags(CancellationToken cancellationToken) -// { -// var newValues = new List>(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// var id = reader.GetGuid(0); -// string value = reader.IsDBNull(2) ? null : reader.GetString(2); - -// newValues.Add(new Tuple(id, value)); -// } -// } -// } - -// Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count); -// if (newValues.Count == 0) -// { -// return; -// } - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// foreach (var item in newValues) -// { -// _updateInheritedTagsCommand.GetParameter(0).Value = item.Item1; -// _updateInheritedTagsCommand.GetParameter(1).Value = item.Item2; - -// _updateInheritedTagsCommand.Transaction = transaction; -// _updateInheritedTagsCommand.ExecuteNonQuery(); -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Error running query:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// private static Dictionary GetTypeMapDictionary() -// { -// var dict = new Dictionary(StringComparer.OrdinalIgnoreCase); - -// foreach (var t in KnownTypes) -// { -// dict[t.Name] = new[] { t.FullName }; -// } - -// dict["Recording"] = new[] { typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName }; -// dict["Program"] = new[] { typeof(LiveTvProgram).FullName }; -// dict["TvChannel"] = new[] { typeof(LiveTvChannel).FullName }; - -// return dict; -// } - -// // Not crazy about having this all the way down here, but at least it's in one place -// readonly Dictionary _types = GetTypeMapDictionary(); - -// private IEnumerable MapIncludeItemTypes(string value) -// { -// string[] result; -// if (_types.TryGetValue(value, out result)) -// { -// return result; -// } - -// return new[] { value }; -// } - -// public async Task DeleteItem(Guid id, CancellationToken cancellationToken) -// { -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } - -// CheckDisposed(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// // Delete people -// _deletePeopleCommand.GetParameter(0).Value = id; -// _deletePeopleCommand.Transaction = transaction; -// _deletePeopleCommand.ExecuteNonQuery(); - -// // Delete chapters -// _deleteChaptersCommand.GetParameter(0).Value = id; -// _deleteChaptersCommand.Transaction = transaction; -// _deleteChaptersCommand.ExecuteNonQuery(); - -// // Delete media streams -// _deleteStreamsCommand.GetParameter(0).Value = id; -// _deleteStreamsCommand.Transaction = transaction; -// _deleteStreamsCommand.ExecuteNonQuery(); - -// // Delete ancestors -// _deleteAncestorsCommand.GetParameter(0).Value = id; -// _deleteAncestorsCommand.Transaction = transaction; -// _deleteAncestorsCommand.ExecuteNonQuery(); - -// // Delete item values -// _deleteItemValuesCommand.GetParameter(0).Value = id; -// _deleteItemValuesCommand.Transaction = transaction; -// _deleteItemValuesCommand.ExecuteNonQuery(); - -// // Delete the item -// _deleteItemCommand.GetParameter(0).Value = id; -// _deleteItemCommand.Transaction = transaction; -// _deleteItemCommand.ExecuteNonQuery(); - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save children:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// public List GetPeopleNames(InternalPeopleQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select Distinct Name from People"; - -// var whereClauses = GetPeopleWhereClauses(query, cmd); - -// if (whereClauses.Count > 0) -// { -// cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); -// } - -// cmd.CommandText += " order by ListOrder"; - -// var list = new List(); - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// list.Add(reader.GetString(0)); -// } -// } - -// return list; -// } -// } - -// public List GetPeople(InternalPeopleQuery query) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// CheckDisposed(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "select ItemId, Name, Role, PersonType, SortOrder from People"; - -// var whereClauses = GetPeopleWhereClauses(query, cmd); - -// if (whereClauses.Count > 0) -// { -// cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); -// } - -// cmd.CommandText += " order by ListOrder"; - -// var list = new List(); - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// list.Add(GetPerson(reader)); -// } -// } - -// return list; -// } -// } - -// private List GetPeopleWhereClauses(InternalPeopleQuery query, IDbCommand cmd) -// { -// var whereClauses = new List(); - -// if (query.ItemId != Guid.Empty) -// { -// whereClauses.Add("ItemId=@ItemId"); -// cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = query.ItemId; -// } -// if (query.AppearsInItemId != Guid.Empty) -// { -// whereClauses.Add("Name in (Select Name from People where ItemId=@AppearsInItemId)"); -// cmd.Parameters.Add(cmd, "@AppearsInItemId", DbType.Guid).Value = query.AppearsInItemId; -// } -// if (query.PersonTypes.Count == 1) -// { -// whereClauses.Add("PersonType=@PersonType"); -// cmd.Parameters.Add(cmd, "@PersonType", DbType.String).Value = query.PersonTypes[0]; -// } -// if (query.PersonTypes.Count > 1) -// { -// var val = string.Join(",", query.PersonTypes.Select(i => "'" + i + "'").ToArray()); - -// whereClauses.Add("PersonType in (" + val + ")"); -// } -// if (query.ExcludePersonTypes.Count == 1) -// { -// whereClauses.Add("PersonType<>@PersonType"); -// cmd.Parameters.Add(cmd, "@PersonType", DbType.String).Value = query.ExcludePersonTypes[0]; -// } -// if (query.ExcludePersonTypes.Count > 1) -// { -// var val = string.Join(",", query.ExcludePersonTypes.Select(i => "'" + i + "'").ToArray()); - -// whereClauses.Add("PersonType not in (" + val + ")"); -// } -// if (query.MaxListOrder.HasValue) -// { -// whereClauses.Add("ListOrder<=@MaxListOrder"); -// cmd.Parameters.Add(cmd, "@MaxListOrder", DbType.Int32).Value = query.MaxListOrder.Value; -// } -// if (!string.IsNullOrWhiteSpace(query.NameContains)) -// { -// whereClauses.Add("Name like @NameContains"); -// cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%"; -// } -// if (query.SourceTypes.Length == 1) -// { -// whereClauses.Add("(select sourcetype from typedbaseitems where guid=ItemId) = @SourceTypes"); -// cmd.Parameters.Add(cmd, "@SourceTypes", DbType.String).Value = query.SourceTypes[0].ToString(); -// } - -// return whereClauses; -// } - -// private void UpdateAncestors(Guid itemId, List ancestorIds, IDbTransaction transaction) -// { -// if (itemId == Guid.Empty) -// { -// throw new ArgumentNullException("itemId"); -// } - -// if (ancestorIds == null) -// { -// throw new ArgumentNullException("ancestorIds"); -// } - -// CheckDisposed(); - -// // First delete -// _deleteAncestorsCommand.GetParameter(0).Value = itemId; -// _deleteAncestorsCommand.Transaction = transaction; - -// _deleteAncestorsCommand.ExecuteNonQuery(); - -// foreach (var ancestorId in ancestorIds) -// { -// _saveAncestorCommand.GetParameter(0).Value = itemId; -// _saveAncestorCommand.GetParameter(1).Value = ancestorId; -// _saveAncestorCommand.GetParameter(2).Value = ancestorId.ToString("N"); - -// _saveAncestorCommand.Transaction = transaction; - -// _saveAncestorCommand.ExecuteNonQuery(); -// } -// } - -// public QueryResult> GetAllArtists(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName); -// } - -// public QueryResult> GetArtists(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName); -// } - -// public QueryResult> GetAlbumArtists(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName); -// } - -// public QueryResult> GetStudios(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName); -// } - -// public QueryResult> GetGenres(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName); -// } - -// public QueryResult> GetGameGenres(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 2 }, typeof(GameGenre).FullName); -// } - -// public QueryResult> GetMusicGenres(InternalItemsQuery query) -// { -// return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName); -// } - -// public List GetStudioNames() -// { -// return GetItemValueNames(new[] { 3 }, new List(), new List()); -// } - -// public List GetAllArtistNames() -// { -// return GetItemValueNames(new[] { 0, 1 }, new List(), new List()); -// } - -// public List GetMusicGenreNames() -// { -// return GetItemValueNames(new[] { 2 }, new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" }, new List()); -// } - -// public List GetGameGenreNames() -// { -// return GetItemValueNames(new[] { 2 }, new List { "Game" }, new List()); -// } - -// public List GetGenreNames() -// { -// return GetItemValueNames(new[] { 2 }, new List(), new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist", "Game", "GameSystem" }); -// } - -// private List GetItemValueNames(int[] itemValueTypes, List withItemTypes, List excludeItemTypes) -// { -// CheckDisposed(); - -// withItemTypes = withItemTypes.SelectMany(MapIncludeItemTypes).ToList(); -// excludeItemTypes = excludeItemTypes.SelectMany(MapIncludeItemTypes).ToList(); - -// var now = DateTime.UtcNow; - -// var typeClause = itemValueTypes.Length == 1 ? -// ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : -// ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); - -// var list = new List(); - -// using (var cmd = _connection.CreateCommand()) -// { -// cmd.CommandText = "Select Value From ItemValues where " + typeClause; - -// if (withItemTypes.Count > 0) -// { -// var typeString = string.Join(",", withItemTypes.Select(i => "'" + i + "'").ToArray()); -// cmd.CommandText += " AND ItemId In (select guid from typedbaseitems where type in (" + typeString + "))"; -// } -// if (excludeItemTypes.Count > 0) -// { -// var typeString = string.Join(",", excludeItemTypes.Select(i => "'" + i + "'").ToArray()); -// cmd.CommandText += " AND ItemId not In (select guid from typedbaseitems where type in (" + typeString + "))"; -// } - -// cmd.CommandText += " Group By CleanValue"; - -// var commandBehavior = CommandBehavior.SequentialAccess | CommandBehavior.SingleResult; - -// using (var reader = cmd.ExecuteReader(commandBehavior)) -// { -// LogQueryTime("GetItemValueNames", cmd, now); - -// while (reader.Read()) -// { -// if (!reader.IsDBNull(0)) -// { -// list.Add(reader.GetString(0)); -// } -// } -// } - -// } - -// return list; -// } - -// private QueryResult> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType) -// { -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// if (!query.Limit.HasValue) -// { -// query.EnableTotalRecordCount = false; -// } - -// CheckDisposed(); - -// var now = DateTime.UtcNow; - -// var typeClause = itemValueTypes.Length == 1 ? -// ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : -// ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); - -// using (var cmd = _connection.CreateCommand()) -// { -// var itemCountColumns = new List>(); - -// var typesToCount = query.IncludeItemTypes.ToList(); - -// if (typesToCount.Count > 0) -// { -// var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B"); - -// var typeSubQuery = new InternalItemsQuery(query.User) -// { -// ExcludeItemTypes = query.ExcludeItemTypes, -// IncludeItemTypes = query.IncludeItemTypes, -// MediaTypes = query.MediaTypes, -// AncestorIds = query.AncestorIds, -// ExcludeItemIds = query.ExcludeItemIds, -// ItemIds = query.ItemIds, -// TopParentIds = query.TopParentIds, -// ParentId = query.ParentId, -// IsPlayed = query.IsPlayed -// }; -// var whereClauses = GetWhereClauses(typeSubQuery, cmd, "itemTypes"); - -// whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND " + typeClause + ")"); - -// var typeWhereText = whereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", whereClauses.ToArray()); - -// itemCountColumnQuery += typeWhereText; - -// //itemCountColumnQuery += ")"; - -// itemCountColumns.Add(new Tuple("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes")); -// } - -// var columns = _retriveItemColumns.ToList(); -// columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray()); - -// cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray(), cmd)) + GetFromText(); -// cmd.CommandText += GetJoinUserDataText(query); - -// var innerQuery = new InternalItemsQuery(query.User) -// { -// ExcludeItemTypes = query.ExcludeItemTypes, -// IncludeItemTypes = query.IncludeItemTypes, -// MediaTypes = query.MediaTypes, -// AncestorIds = query.AncestorIds, -// ExcludeItemIds = query.ExcludeItemIds, -// ItemIds = query.ItemIds, -// TopParentIds = query.TopParentIds, -// ParentId = query.ParentId, -// IsPlayed = query.IsPlayed -// }; - -// var innerWhereClauses = GetWhereClauses(innerQuery, cmd); - -// var innerWhereText = innerWhereClauses.Count == 0 ? -// string.Empty : -// " where " + string.Join(" AND ", innerWhereClauses.ToArray()); - -// var whereText = " where Type=@SelectType"; - -// if (typesToCount.Count == 0) -// { -// whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; -// } -// else -// { -// //whereText += " And itemTypes not null"; -// whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; -// } - -// var outerQuery = new InternalItemsQuery(query.User) -// { -// IsFavorite = query.IsFavorite, -// IsFavoriteOrLiked = query.IsFavoriteOrLiked, -// IsLiked = query.IsLiked, -// IsLocked = query.IsLocked, -// NameLessThan = query.NameLessThan, -// NameStartsWith = query.NameStartsWith, -// NameStartsWithOrGreater = query.NameStartsWithOrGreater, -// AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater, -// Tags = query.Tags, -// OfficialRatings = query.OfficialRatings, -// GenreIds = query.GenreIds, -// Genres = query.Genres, -// Years = query.Years -// }; - -// var outerWhereClauses = GetWhereClauses(outerQuery, cmd); - -// whereText += outerWhereClauses.Count == 0 ? -// string.Empty : -// " AND " + string.Join(" AND ", outerWhereClauses.ToArray()); -// //cmd.CommandText += GetGroupBy(query); - -// cmd.CommandText += whereText; -// cmd.CommandText += " group by PresentationUniqueKey"; - -// cmd.Parameters.Add(cmd, "@SelectType", DbType.String).Value = returnType; - -// if (EnableJoinUserData(query)) -// { -// cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; -// } - -// cmd.CommandText += " order by SortName"; - -// if (query.Limit.HasValue || query.StartIndex.HasValue) -// { -// var offset = query.StartIndex ?? 0; - -// if (query.Limit.HasValue || offset > 0) -// { -// cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); -// } - -// if (offset > 0) -// { -// cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); -// } -// } - -// cmd.CommandText += ";"; - -// var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - -// if (isReturningZeroItems) -// { -// cmd.CommandText = ""; -// } - -// if (query.EnableTotalRecordCount) -// { -// cmd.CommandText += "select count (distinct PresentationUniqueKey)" + GetFromText(); - -// cmd.CommandText += GetJoinUserDataText(query); -// cmd.CommandText += whereText; -// } -// else -// { -// cmd.CommandText = cmd.CommandText.TrimEnd(';'); -// } - -// var list = new List>(); -// var count = 0; - -// var commandBehavior = isReturningZeroItems || !query.EnableTotalRecordCount -// ? (CommandBehavior.SequentialAccess | CommandBehavior.SingleResult) -// : CommandBehavior.SequentialAccess; - -// //Logger.Debug("GetItemValues: " + cmd.CommandText); - -// using (var reader = cmd.ExecuteReader(commandBehavior)) -// { -// LogQueryTime("GetItemValues", cmd, now); - -// if (isReturningZeroItems) -// { -// if (reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } -// else -// { -// while (reader.Read()) -// { -// var item = GetItem(reader); -// if (item != null) -// { -// var countStartColumn = columns.Count - 1; - -// list.Add(new Tuple(item, GetItemCounts(reader, countStartColumn, typesToCount))); -// } -// } - -// if (reader.NextResult() && reader.Read()) -// { -// count = reader.GetInt32(0); -// } -// } -// } - -// if (count == 0) -// { -// count = list.Count; -// } - -// return new QueryResult> -// { -// Items = list.ToArray(), -// TotalRecordCount = count -// }; - -// } -// } - -// private ItemCounts GetItemCounts(IDataReader reader, int countStartColumn, List typesToCount) -// { -// var counts = new ItemCounts(); - -// if (typesToCount.Count == 0) -// { -// return counts; -// } - -// var typeString = reader.IsDBNull(countStartColumn) ? null : reader.GetString(countStartColumn); - -// if (string.IsNullOrWhiteSpace(typeString)) -// { -// return counts; -// } - -// var allTypes = typeString.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries) -// .ToLookup(i => i).ToList(); - -// foreach (var type in allTypes) -// { -// var value = type.ToList().Count; -// var typeName = type.Key; - -// if (string.Equals(typeName, typeof(Series).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.SeriesCount = value; -// } -// else if (string.Equals(typeName, typeof(Episode).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.EpisodeCount = value; -// } -// else if (string.Equals(typeName, typeof(Movie).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.MovieCount = value; -// } -// else if (string.Equals(typeName, typeof(MusicAlbum).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.AlbumCount = value; -// } -// else if (string.Equals(typeName, typeof(MusicArtist).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.ArtistCount = value; -// } -// else if (string.Equals(typeName, typeof(Audio).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.SongCount = value; -// } -// else if (string.Equals(typeName, typeof(Game).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.GameCount = value; -// } -// else if (string.Equals(typeName, typeof(Trailer).FullName, StringComparison.OrdinalIgnoreCase)) -// { -// counts.TrailerCount = value; -// } -// counts.ItemCount += value; -// } - -// return counts; -// } - -// private List> GetItemValuesToSave(BaseItem item) -// { -// var list = new List>(); - -// var hasArtist = item as IHasArtist; -// if (hasArtist != null) -// { -// list.AddRange(hasArtist.Artists.Select(i => new Tuple(0, i))); -// } - -// var hasAlbumArtist = item as IHasAlbumArtist; -// if (hasAlbumArtist != null) -// { -// list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple(1, i))); -// } - -// list.AddRange(item.Genres.Select(i => new Tuple(2, i))); -// list.AddRange(item.Studios.Select(i => new Tuple(3, i))); -// list.AddRange(item.Tags.Select(i => new Tuple(4, i))); -// list.AddRange(item.Keywords.Select(i => new Tuple(5, i))); - -// return list; -// } - -// private void UpdateItemValues(Guid itemId, List> values, IDbTransaction transaction) -// { -// if (itemId == Guid.Empty) -// { -// throw new ArgumentNullException("itemId"); -// } - -// if (values == null) -// { -// throw new ArgumentNullException("keys"); -// } - -// CheckDisposed(); - -// // First delete -// _deleteItemValuesCommand.GetParameter(0).Value = itemId; -// _deleteItemValuesCommand.Transaction = transaction; - -// _deleteItemValuesCommand.ExecuteNonQuery(); - -// foreach (var pair in values) -// { -// _saveItemValuesCommand.GetParameter(0).Value = itemId; -// _saveItemValuesCommand.GetParameter(1).Value = pair.Item1; -// _saveItemValuesCommand.GetParameter(2).Value = pair.Item2; -// if (pair.Item2 == null) -// { -// _saveItemValuesCommand.GetParameter(3).Value = null; -// } -// else -// { -// _saveItemValuesCommand.GetParameter(3).Value = GetCleanValue(pair.Item2); -// } -// _saveItemValuesCommand.Transaction = transaction; - -// _saveItemValuesCommand.ExecuteNonQuery(); -// } -// } - -// public async Task UpdatePeople(Guid itemId, List people) -// { -// if (itemId == Guid.Empty) -// { -// throw new ArgumentNullException("itemId"); -// } - -// if (people == null) -// { -// throw new ArgumentNullException("people"); -// } - -// CheckDisposed(); - -// var cancellationToken = CancellationToken.None; - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// // First delete -// _deletePeopleCommand.GetParameter(0).Value = itemId; -// _deletePeopleCommand.Transaction = transaction; - -// _deletePeopleCommand.ExecuteNonQuery(); - -// var listIndex = 0; - -// foreach (var person in people) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// _savePersonCommand.GetParameter(0).Value = itemId; -// _savePersonCommand.GetParameter(1).Value = person.Name; -// _savePersonCommand.GetParameter(2).Value = person.Role; -// _savePersonCommand.GetParameter(3).Value = person.Type; -// _savePersonCommand.GetParameter(4).Value = person.SortOrder; -// _savePersonCommand.GetParameter(5).Value = listIndex; - -// _savePersonCommand.Transaction = transaction; - -// _savePersonCommand.ExecuteNonQuery(); -// listIndex++; -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save people:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// private PersonInfo GetPerson(IDataReader reader) -// { -// var item = new PersonInfo(); - -// item.ItemId = reader.GetGuid(0); -// item.Name = reader.GetString(1); - -// if (!reader.IsDBNull(2)) -// { -// item.Role = reader.GetString(2); -// } + CheckDisposed(); -// if (!reader.IsDBNull(3)) -// { -// item.Type = reader.GetString(3); -// } - -// if (!reader.IsDBNull(4)) -// { -// item.SortOrder = reader.GetInt32(4); -// } + var now = DateTime.UtcNow; -// return item; -// } + var list = new List(); -// public IEnumerable GetMediaStreams(MediaStreamQuery query) -// { -// CheckDisposed(); + // Hack for right now since we currently don't support filtering out these duplicates within a query + if (query.Limit.HasValue && query.EnableGroupByMetadataKey) + { + query.Limit = query.Limit.Value + 4; + } -// if (query == null) -// { -// throw new ArgumentNullException("query"); -// } - -// var list = new List(); - -// using (var cmd = _connection.CreateCommand()) -// { -// var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where"; - -// cmdText += " ItemId=@ItemId"; -// cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = query.ItemId; - -// if (query.Type.HasValue) -// { -// cmdText += " AND StreamType=@StreamType"; -// cmd.Parameters.Add(cmd, "@StreamType", DbType.String).Value = query.Type.Value.ToString(); -// } - -// if (query.Index.HasValue) -// { -// cmdText += " AND StreamIndex=@StreamIndex"; -// cmd.Parameters.Add(cmd, "@StreamIndex", DbType.Int32).Value = query.Index.Value; -// } - -// cmdText += " order by StreamIndex ASC"; - -// cmd.CommandText = cmdText; - -// using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) -// { -// while (reader.Read()) -// { -// list.Add(GetMediaStream(reader)); -// } -// } -// } - -// return list; -// } - -// public async Task SaveMediaStreams(Guid id, List streams, CancellationToken cancellationToken) -// { -// CheckDisposed(); - -// if (id == Guid.Empty) -// { -// throw new ArgumentNullException("id"); -// } - -// if (streams == null) -// { -// throw new ArgumentNullException("streams"); -// } - -// cancellationToken.ThrowIfCancellationRequested(); - -// await WriteLock.WaitAsync(cancellationToken).ConfigureAwait(false); - -// IDbTransaction transaction = null; - -// try -// { -// transaction = _connection.BeginTransaction(); - -// // First delete chapters -// _deleteStreamsCommand.GetParameter(0).Value = id; - -// _deleteStreamsCommand.Transaction = transaction; - -// _deleteStreamsCommand.ExecuteNonQuery(); - -// foreach (var stream in streams) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// var index = 0; - -// _saveStreamCommand.GetParameter(index++).Value = id; -// _saveStreamCommand.GetParameter(index++).Value = stream.Index; -// _saveStreamCommand.GetParameter(index++).Value = stream.Type.ToString(); -// _saveStreamCommand.GetParameter(index++).Value = stream.Codec; -// _saveStreamCommand.GetParameter(index++).Value = stream.Language; -// _saveStreamCommand.GetParameter(index++).Value = stream.ChannelLayout; -// _saveStreamCommand.GetParameter(index++).Value = stream.Profile; -// _saveStreamCommand.GetParameter(index++).Value = stream.AspectRatio; -// _saveStreamCommand.GetParameter(index++).Value = stream.Path; - -// _saveStreamCommand.GetParameter(index++).Value = stream.IsInterlaced; - -// _saveStreamCommand.GetParameter(index++).Value = stream.BitRate; -// _saveStreamCommand.GetParameter(index++).Value = stream.Channels; -// _saveStreamCommand.GetParameter(index++).Value = stream.SampleRate; - -// _saveStreamCommand.GetParameter(index++).Value = stream.IsDefault; -// _saveStreamCommand.GetParameter(index++).Value = stream.IsForced; -// _saveStreamCommand.GetParameter(index++).Value = stream.IsExternal; - -// _saveStreamCommand.GetParameter(index++).Value = stream.Width; -// _saveStreamCommand.GetParameter(index++).Value = stream.Height; -// _saveStreamCommand.GetParameter(index++).Value = stream.AverageFrameRate; -// _saveStreamCommand.GetParameter(index++).Value = stream.RealFrameRate; -// _saveStreamCommand.GetParameter(index++).Value = stream.Level; -// _saveStreamCommand.GetParameter(index++).Value = stream.PixelFormat; -// _saveStreamCommand.GetParameter(index++).Value = stream.BitDepth; -// _saveStreamCommand.GetParameter(index++).Value = stream.IsAnamorphic; -// _saveStreamCommand.GetParameter(index++).Value = stream.RefFrames; - -// _saveStreamCommand.GetParameter(index++).Value = stream.CodecTag; -// _saveStreamCommand.GetParameter(index++).Value = stream.Comment; -// _saveStreamCommand.GetParameter(index++).Value = stream.NalLengthSize; -// _saveStreamCommand.GetParameter(index++).Value = stream.IsAVC; -// _saveStreamCommand.GetParameter(index++).Value = stream.Title; - -// _saveStreamCommand.GetParameter(index++).Value = stream.TimeBase; -// _saveStreamCommand.GetParameter(index++).Value = stream.CodecTimeBase; - -// _saveStreamCommand.Transaction = transaction; -// _saveStreamCommand.ExecuteNonQuery(); -// } - -// transaction.Commit(); -// } -// catch (OperationCanceledException) -// { -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// catch (Exception e) -// { -// Logger.ErrorException("Failed to save media streams:", e); - -// if (transaction != null) -// { -// transaction.Rollback(); -// } - -// throw; -// } -// finally -// { -// if (transaction != null) -// { -// transaction.Dispose(); -// } - -// WriteLock.Release(); -// } -// } - -// /// -// /// Gets the chapter. -// /// -// /// The reader. -// /// ChapterInfo. -// private MediaStream GetMediaStream(IDataReader reader) -// { -// var item = new MediaStream -// { -// Index = reader.GetInt32(1) -// }; - -// item.Type = (MediaStreamType)Enum.Parse(typeof(MediaStreamType), reader.GetString(2), true); - -// if (!reader.IsDBNull(3)) -// { -// item.Codec = reader.GetString(3); -// } - -// if (!reader.IsDBNull(4)) -// { -// item.Language = reader.GetString(4); -// } - -// if (!reader.IsDBNull(5)) -// { -// item.ChannelLayout = reader.GetString(5); -// } - -// if (!reader.IsDBNull(6)) -// { -// item.Profile = reader.GetString(6); -// } - -// if (!reader.IsDBNull(7)) -// { -// item.AspectRatio = reader.GetString(7); -// } - -// if (!reader.IsDBNull(8)) -// { -// item.Path = reader.GetString(8); -// } - -// item.IsInterlaced = reader.GetBoolean(9); - -// if (!reader.IsDBNull(10)) -// { -// item.BitRate = reader.GetInt32(10); -// } - -// if (!reader.IsDBNull(11)) -// { -// item.Channels = reader.GetInt32(11); -// } - -// if (!reader.IsDBNull(12)) -// { -// item.SampleRate = reader.GetInt32(12); -// } - -// item.IsDefault = reader.GetBoolean(13); -// item.IsForced = reader.GetBoolean(14); -// item.IsExternal = reader.GetBoolean(15); - -// if (!reader.IsDBNull(16)) -// { -// item.Width = reader.GetInt32(16); -// } - -// if (!reader.IsDBNull(17)) -// { -// item.Height = reader.GetInt32(17); -// } - -// if (!reader.IsDBNull(18)) -// { -// item.AverageFrameRate = reader.GetFloat(18); -// } - -// if (!reader.IsDBNull(19)) -// { -// item.RealFrameRate = reader.GetFloat(19); -// } - -// if (!reader.IsDBNull(20)) -// { -// item.Level = reader.GetFloat(20); -// } - -// if (!reader.IsDBNull(21)) -// { -// item.PixelFormat = reader.GetString(21); -// } - -// if (!reader.IsDBNull(22)) -// { -// item.BitDepth = reader.GetInt32(22); -// } - -// if (!reader.IsDBNull(23)) -// { -// item.IsAnamorphic = reader.GetBoolean(23); -// } - -// if (!reader.IsDBNull(24)) -// { -// item.RefFrames = reader.GetInt32(24); -// } - -// if (!reader.IsDBNull(25)) -// { -// item.CodecTag = reader.GetString(25); -// } - -// if (!reader.IsDBNull(26)) -// { -// item.Comment = reader.GetString(26); -// } - -// if (!reader.IsDBNull(27)) -// { -// item.NalLengthSize = reader.GetString(27); -// } - -// if (!reader.IsDBNull(28)) -// { -// item.IsAVC = reader.GetBoolean(28); -// } - -// if (!reader.IsDBNull(29)) -// { -// item.Title = reader.GetString(29); -// } - -// if (!reader.IsDBNull(30)) -// { -// item.TimeBase = reader.GetString(30); -// } - -// if (!reader.IsDBNull(31)) -// { -// item.CodecTimeBase = reader.GetString(31); -// } - -// return item; -// } - -// } -//} \ No newline at end of file + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns)) + GetFromText(); + commandText += GetJoinUserDataText(query); + + var whereClauses = GetWhereClauses(query, null); + + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + commandText += whereText; + + commandText += GetGroupBy(query); + + commandText += GetOrderByText(query); + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } + } + } + + LogQueryTime("GetItemList", commandText, now); + } + + // Hack for right now since we currently don't support filtering out these duplicates within a query + if (query.EnableGroupByMetadataKey) + { + var limit = query.Limit ?? int.MaxValue; + limit -= 4; + var newList = new List(); + + foreach (var item in list) + { + AddItem(newList, item); + + if (newList.Count >= limit) + { + break; + } + } + + list = newList; + } + + return list; + } + + private void AddItem(List items, BaseItem newItem) + { + var providerIds = newItem.ProviderIds.ToList(); + + for (var i = 0; i < items.Count; i++) + { + var item = items[i]; + + foreach (var providerId in providerIds) + { + if (providerId.Key == MetadataProviders.TmdbCollection.ToString()) + { + continue; + } + if (item.GetProviderId(providerId.Key) == providerId.Value) + { + if (newItem.SourceType == SourceType.Library) + { + items[i] = newItem; + } + return; + } + } + } + + items.Add(newItem); + } + + private void LogQueryTime(string methodName, string commandText, DateTime startDate) + { + var elapsed = (DateTime.UtcNow - startDate).TotalMilliseconds; + + var slowThreshold = 1000; + +#if DEBUG + slowThreshold = 50; +#endif + + if (elapsed >= slowThreshold) + { + Logger.Debug("{2} query time (slow): {0}ms. Query: {1}", + Convert.ToInt32(elapsed), + commandText, + methodName); + } + else + { + //Logger.Debug("{2} query time: {0}ms. Query: {1}", + // Convert.ToInt32(elapsed), + // cmd.CommandText, + // methodName); + } + } + + public QueryResult GetItems(InternalItemsQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) + { + var returnList = GetItemList(query); + return new QueryResult + { + Items = returnList.ToArray(), + TotalRecordCount = returnList.Count + }; + } + + var now = DateTime.UtcNow; + + var list = new List(); + + // Hack for right now since we currently don't support filtering out these duplicates within a query + if (query.Limit.HasValue && query.EnableGroupByMetadataKey) + { + query.Limit = query.Limit.Value + 4; + } + + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, _retriveItemColumns)) + GetFromText(); + commandText += GetJoinUserDataText(query); + + var whereClauses = GetWhereClauses(query, null); + + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + var whereTextWithoutPaging = whereText; + + commandText += whereText; + + commandText += GetGroupBy(query); + + commandText += GetOrderByText(query); + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + using (WriteLock.Write()) + { + var totalRecordCount = 0; + var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; + + if (!isReturningZeroItems) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } + } + } + } + + commandText = string.Empty; + + if (EnableGroupByPresentationUniqueKey(query)) + { + commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); + } + else + { + commandText += " select count (guid)" + GetFromText(); + } + + commandText += GetJoinUserDataText(query); + commandText += whereTextWithoutPaging; + + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } + + LogQueryTime("GetItems", commandText, now); + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = totalRecordCount + }; + } + } + + private string GetOrderByText(InternalItemsQuery query) + { + var orderBy = query.OrderBy.ToList(); + var enableOrderInversion = true; + + if (orderBy.Count == 0) + { + orderBy.AddRange(query.SortBy.Select(i => new Tuple(i, query.SortOrder))); + } + else + { + enableOrderInversion = false; + } + + if (query.SimilarTo != null) + { + if (orderBy.Count == 0) + { + orderBy.Add(new Tuple("SimilarityScore", SortOrder.Descending)); + orderBy.Add(new Tuple(ItemSortBy.Random, SortOrder.Ascending)); + query.SortOrder = SortOrder.Descending; + enableOrderInversion = false; + } + } + + query.OrderBy = orderBy; + + if (orderBy.Count == 0) + { + return string.Empty; + } + + return " ORDER BY " + string.Join(",", orderBy.Select(i => + { + var columnMap = MapOrderByField(i.Item1, query); + var columnAscending = i.Item2 == SortOrder.Ascending; + if (columnMap.Item2 && enableOrderInversion) + { + columnAscending = !columnAscending; + } + + var sortOrder = columnAscending ? "ASC" : "DESC"; + + return columnMap.Item1 + " " + sortOrder; + }).ToArray()); + } + + private Tuple MapOrderByField(string name, InternalItemsQuery query) + { + if (string.Equals(name, ItemSortBy.AirTime, StringComparison.OrdinalIgnoreCase)) + { + // TODO + return new Tuple("SortName", false); + } + if (string.Equals(name, ItemSortBy.Runtime, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("RuntimeTicks", false); + } + if (string.Equals(name, ItemSortBy.Random, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("RANDOM()", false); + } + if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("LastPlayedDate", false); + } + if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("PlayCount", false); + } + if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("IsFavorite", true); + } + if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("IsFolder", true); + } + if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("played", true); + } + if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("played", false); + } + if (string.Equals(name, ItemSortBy.DateLastContentAdded, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("DateLastMediaAdded", false); + } + if (string.Equals(name, ItemSortBy.Artist, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false); + } + if (string.Equals(name, ItemSortBy.AlbumArtist, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false); + } + if (string.Equals(name, ItemSortBy.OfficialRating, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("InheritedParentalRatingValue", false); + } + if (string.Equals(name, ItemSortBy.Studio, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("(select CleanValue from itemvalues where ItemId=Guid and Type=3 LIMIT 1)", false); + } + if (string.Equals(name, ItemSortBy.SeriesDatePlayed, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple("(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where B.Guid in (Select ItemId from AncestorIds where AncestorId in (select guid from typedbaseitems c where C.Type = 'MediaBrowser.Controller.Entities.TV.Series' And C.Guid in (Select AncestorId from AncestorIds where ItemId=A.Guid))))", false); + } + + return new Tuple(name, false); + } + + public List GetItemIdsList(InternalItemsQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + var now = DateTime.UtcNow; + + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" })) + GetFromText(); + commandText += GetJoinUserDataText(query); + + var whereClauses = GetWhereClauses(query, null); + + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + commandText += whereText; + + commandText += GetGroupBy(query); + + commandText += GetOrderByText(query); + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + var list = new List(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } + } + + LogQueryTime("GetItemList", commandText, now); + + return list; + } + } + + public List> GetItemIdsWithPath(InternalItemsQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + var now = DateTime.UtcNow; + + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid", "path" })) + GetFromText(); + + var whereClauses = GetWhereClauses(query, null); + + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + commandText += whereText; + + commandText += GetGroupBy(query); + + commandText += GetOrderByText(query); + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + var list = new List>(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + // Running this again will bind the params + GetWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + var id = row.GetGuid(0); + string path = null; + + if (!row.IsDBNull(1)) + { + path = row.GetString(1); + } + list.Add(new Tuple(id, path)); + } + } + + LogQueryTime("GetItemIdsWithPath", commandText, now); + + return list; + } + } + + public QueryResult GetItemIds(InternalItemsQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) + { + var returnList = GetItemIdsList(query); + return new QueryResult + { + Items = returnList.ToArray(), + TotalRecordCount = returnList.Count + }; + } + + var now = DateTime.UtcNow; + + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, new[] { "guid" })) + GetFromText(); + commandText += GetJoinUserDataText(query); + + var whereClauses = GetWhereClauses(query, null); + + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + var whereTextWithoutPaging = whereText; + + commandText += whereText; + + commandText += GetGroupBy(query); + + commandText += GetOrderByText(query); + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + var list = new List(); + + using (WriteLock.Write()) + { + var totalRecordCount = 0; + + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } + } + + commandText = string.Empty; + + if (EnableGroupByPresentationUniqueKey(query)) + { + commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); + } + else + { + commandText += " select count (guid)" + GetFromText(); + } + + commandText += GetJoinUserDataText(query); + commandText += whereTextWithoutPaging; + + using (var statement = _connection.PrepareStatement(commandText)) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + BindSimilarParams(query, statement); + + // Running this again will bind the params + GetWhereClauses(query, statement); + + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } + + LogQueryTime("GetItemIds", commandText, now); + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = totalRecordCount + }; + } + } + + private List GetWhereClauses(InternalItemsQuery query, IStatement statement, string paramSuffix = "") + { + var whereClauses = new List(); + + if (EnableJoinUserData(query)) + { + //whereClauses.Add("(UserId is null or UserId=@UserId)"); + } + if (query.IsHD.HasValue) + { + whereClauses.Add("IsHD=@IsHD"); + if (statement != null) + { + statement.TryBind("@IsHD", query.IsHD); + } + } + if (query.IsLocked.HasValue) + { + whereClauses.Add("IsLocked=@IsLocked"); + if (statement != null) + { + statement.TryBind("@IsLocked", query.IsLocked); + } + } + if (query.IsOffline.HasValue) + { + whereClauses.Add("IsOffline=@IsOffline"); + if (statement != null) + { + statement.TryBind("@IsOffline", query.IsOffline); + } + } + + var exclusiveProgramAttribtues = !(query.IsMovie ?? true) || + !(query.IsSports ?? true) || + !(query.IsKids ?? true) || + !(query.IsNews ?? true) || + !(query.IsSeries ?? true); + + if (exclusiveProgramAttribtues) + { + if (query.IsMovie.HasValue) + { + var alternateTypes = new List(); + if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) + { + alternateTypes.Add(typeof(Movie).FullName); + } + if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) + { + alternateTypes.Add(typeof(Trailer).FullName); + } + + if (alternateTypes.Count == 0) + { + whereClauses.Add("IsMovie=@IsMovie"); + if (statement != null) + { + statement.TryBind("@IsMovie", query.IsMovie); + } + } + else + { + whereClauses.Add("(IsMovie is null OR IsMovie=@IsMovie)"); + if (statement != null) + { + statement.TryBind("@IsMovie", query.IsMovie); + } + } + } + if (query.IsSeries.HasValue) + { + whereClauses.Add("IsSeries=@IsSeries"); + if (statement != null) + { + statement.TryBind("@IsSeries", query.IsSeries); + } + } + if (query.IsNews.HasValue) + { + whereClauses.Add("IsNews=@IsNews"); + if (statement != null) + { + statement.TryBind("@IsNews", query.IsNews); + } + } + if (query.IsKids.HasValue) + { + whereClauses.Add("IsKids=@IsKids"); + if (statement != null) + { + statement.TryBind("@IsKids", query.IsKids); + } + } + if (query.IsSports.HasValue) + { + whereClauses.Add("IsSports=@IsSports"); + if (statement != null) + { + statement.TryBind("@IsSports", query.IsSports); + } + } + } + else + { + var programAttribtues = new List(); + if (query.IsMovie ?? false) + { + var alternateTypes = new List(); + if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Movie).Name)) + { + alternateTypes.Add(typeof(Movie).FullName); + } + if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(typeof(Trailer).Name)) + { + alternateTypes.Add(typeof(Trailer).FullName); + } + + if (alternateTypes.Count == 0) + { + programAttribtues.Add("IsMovie=@IsMovie"); + } + else + { + programAttribtues.Add("(IsMovie is null OR IsMovie=@IsMovie)"); + } + + if (statement != null) + { + statement.TryBind("@IsMovie", true); + } + } + if (query.IsSports ?? false) + { + programAttribtues.Add("IsSports=@IsSports"); + if (statement != null) + { + statement.TryBind("@IsSports", query.IsSports); + } + } + if (query.IsNews ?? false) + { + programAttribtues.Add("IsNews=@IsNews"); + if (statement != null) + { + statement.TryBind("@IsNews", query.IsNews); + } + } + if (query.IsSeries ?? false) + { + programAttribtues.Add("IsSeries=@IsSeries"); + if (statement != null) + { + statement.TryBind("@IsSeries", query.IsSeries); + } + } + if (query.IsKids ?? false) + { + programAttribtues.Add("IsKids=@IsKids"); + if (statement != null) + { + statement.TryBind("@IsKids", query.IsKids); + } + } + if (programAttribtues.Count > 0) + { + whereClauses.Add("(" + string.Join(" OR ", programAttribtues.ToArray()) + ")"); + } + } + + if (query.SimilarTo != null) + { + whereClauses.Add("SimilarityScore > 0"); + } + + if (query.IsFolder.HasValue) + { + whereClauses.Add("IsFolder=@IsFolder"); + if (statement != null) + { + statement.TryBind("@IsFolder", query.IsFolder); + } + } + + var includeTypes = query.IncludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); + if (includeTypes.Length == 1) + { + whereClauses.Add("type=@type" + paramSuffix); + if (statement != null) + { + statement.TryBind("@type" + paramSuffix, includeTypes[0]); + } + } + else if (includeTypes.Length > 1) + { + var inClause = string.Join(",", includeTypes.Select(i => "'" + i + "'").ToArray()); + whereClauses.Add(string.Format("type in ({0})", inClause)); + } + + var excludeTypes = query.ExcludeItemTypes.SelectMany(MapIncludeItemTypes).ToArray(); + if (excludeTypes.Length == 1) + { + whereClauses.Add("type<>@type"); + if (statement != null) + { + statement.TryBind("@type", excludeTypes[0]); + } + } + else if (excludeTypes.Length > 1) + { + var inClause = string.Join(",", excludeTypes.Select(i => "'" + i + "'").ToArray()); + whereClauses.Add(string.Format("type not in ({0})", inClause)); + } + + if (query.ChannelIds.Length == 1) + { + whereClauses.Add("ChannelId=@ChannelId"); + if (statement != null) + { + statement.TryBind("@ChannelId", query.ChannelIds[0]); + } + } + if (query.ChannelIds.Length > 1) + { + var inClause = string.Join(",", query.ChannelIds.Select(i => "'" + i + "'").ToArray()); + whereClauses.Add(string.Format("ChannelId in ({0})", inClause)); + } + + if (query.ParentId.HasValue) + { + whereClauses.Add("ParentId=@ParentId"); + if (statement != null) + { + statement.TryBind("@ParentId", query.ParentId.Value); + } + } + + if (!string.IsNullOrWhiteSpace(query.Path)) + { + whereClauses.Add("Path=@Path"); + if (statement != null) + { + statement.TryBind("@Path", query.Path); + } + } + + if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) + { + whereClauses.Add("PresentationUniqueKey=@PresentationUniqueKey"); + if (statement != null) + { + statement.TryBind("@PresentationUniqueKey", query.PresentationUniqueKey); + } + } + + if (query.MinCommunityRating.HasValue) + { + whereClauses.Add("CommunityRating>=@MinCommunityRating"); + if (statement != null) + { + statement.TryBind("@MinCommunityRating", query.MinCommunityRating.Value); + } + } + + if (query.MinIndexNumber.HasValue) + { + whereClauses.Add("IndexNumber>=@MinIndexNumber"); + if (statement != null) + { + statement.TryBind("@MinIndexNumber", query.MinIndexNumber.Value); + } + } + + if (query.MinDateCreated.HasValue) + { + whereClauses.Add("DateCreated>=@MinDateCreated"); + if (statement != null) + { + statement.TryBind("@MinDateCreated", query.MinDateCreated.Value); + } + } + + if (query.MinDateLastSaved.HasValue) + { + whereClauses.Add("DateLastSaved>=@MinDateLastSaved"); + if (statement != null) + { + statement.TryBind("@MinDateLastSaved", query.MinDateLastSaved.Value); + } + } + + //if (query.MinPlayers.HasValue) + //{ + // whereClauses.Add("Players>=@MinPlayers"); + // cmd.Parameters.Add(cmd, "@MinPlayers", DbType.Int32).Value = query.MinPlayers.Value; + //} + + //if (query.MaxPlayers.HasValue) + //{ + // whereClauses.Add("Players<=@MaxPlayers"); + // cmd.Parameters.Add(cmd, "@MaxPlayers", DbType.Int32).Value = query.MaxPlayers.Value; + //} + + if (query.IndexNumber.HasValue) + { + whereClauses.Add("IndexNumber=@IndexNumber"); + if (statement != null) + { + statement.TryBind("@IndexNumber", query.IndexNumber.Value); + } + } + if (query.ParentIndexNumber.HasValue) + { + whereClauses.Add("ParentIndexNumber=@ParentIndexNumber"); + if (statement != null) + { + statement.TryBind("@ParentIndexNumber", query.ParentIndexNumber.Value); + } + } + if (query.ParentIndexNumberNotEquals.HasValue) + { + whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)"); + if (statement != null) + { + statement.TryBind("@ParentIndexNumberNotEquals", query.ParentIndexNumberNotEquals.Value); + } + } + if (query.MinEndDate.HasValue) + { + whereClauses.Add("EndDate>=@MinEndDate"); + if (statement != null) + { + statement.TryBind("@MinEndDate", query.MinEndDate.Value); + } + } + + if (query.MaxEndDate.HasValue) + { + whereClauses.Add("EndDate<=@MaxEndDate"); + if (statement != null) + { + statement.TryBind("@MaxEndDate", query.MaxEndDate.Value); + } + } + + if (query.MinStartDate.HasValue) + { + whereClauses.Add("StartDate>=@MinStartDate"); + if (statement != null) + { + statement.TryBind("@MinStartDate", query.MinStartDate.Value); + } + } + + if (query.MaxStartDate.HasValue) + { + whereClauses.Add("StartDate<=@MaxStartDate"); + if (statement != null) + { + statement.TryBind("@MaxStartDate", query.MaxStartDate.Value); + } + } + + if (query.MinPremiereDate.HasValue) + { + whereClauses.Add("PremiereDate>=@MinPremiereDate"); + if (statement != null) + { + statement.TryBind("@MinPremiereDate", query.MinPremiereDate.Value); + } + } + if (query.MaxPremiereDate.HasValue) + { + whereClauses.Add("PremiereDate<=@MaxPremiereDate"); + if (statement != null) + { + statement.TryBind("@MaxPremiereDate", query.MaxPremiereDate.Value); + } + } + + if (query.SourceTypes.Length == 1) + { + whereClauses.Add("SourceType=@SourceType"); + if (statement != null) + { + statement.TryBind("@SourceType", query.SourceTypes[0].ToString()); + } + } + else if (query.SourceTypes.Length > 1) + { + var inClause = string.Join(",", query.SourceTypes.Select(i => "'" + i + "'").ToArray()); + whereClauses.Add(string.Format("SourceType in ({0})", inClause)); + } + + if (query.ExcludeSourceTypes.Length == 1) + { + whereClauses.Add("SourceType<>@ExcludeSourceTypes"); + if (statement != null) + { + statement.TryBind("@ExcludeSourceTypes", query.ExcludeSourceTypes[0].ToString()); + } + } + else if (query.ExcludeSourceTypes.Length > 1) + { + var inClause = string.Join(",", query.ExcludeSourceTypes.Select(i => "'" + i + "'").ToArray()); + whereClauses.Add(string.Format("SourceType not in ({0})", inClause)); + } + + if (query.TrailerTypes.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var type in query.TrailerTypes) + { + clauses.Add("TrailerTypes like @TrailerTypes" + index); + if (statement != null) + { + statement.TryBind("@TrailerTypes" + index, "%" + type + "%"); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.IsAiring.HasValue) + { + if (query.IsAiring.Value) + { + whereClauses.Add("StartDate<=@MaxStartDate"); + if (statement != null) + { + statement.TryBind("@MaxStartDate", DateTime.UtcNow); + } + + whereClauses.Add("EndDate>=@MinEndDate"); + if (statement != null) + { + statement.TryBind("@MinEndDate", DateTime.UtcNow); + } + } + else + { + whereClauses.Add("(StartDate>@IsAiringDate OR EndDate < @IsAiringDate)"); + if (statement != null) + { + statement.TryBind("@IsAiringDate", DateTime.UtcNow); + } + } + } + + if (query.PersonIds.Length > 0) + { + // Todo: improve without having to do this + query.Person = query.PersonIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).FirstOrDefault(); + } + + if (!string.IsNullOrWhiteSpace(query.Person)) + { + whereClauses.Add("Guid in (select ItemId from People where Name=@PersonName)"); + if (statement != null) + { + statement.TryBind("@PersonName", query.Person); + } + } + + if (!string.IsNullOrWhiteSpace(query.SlugName)) + { + whereClauses.Add("SlugName=@SlugName"); + if (statement != null) + { + statement.TryBind("@SlugName", query.SlugName); + } + } + + if (!string.IsNullOrWhiteSpace(query.MinSortName)) + { + whereClauses.Add("SortName>=@MinSortName"); + if (statement != null) + { + statement.TryBind("@MinSortName", query.MinSortName); + } + } + + if (!string.IsNullOrWhiteSpace(query.ExternalSeriesId)) + { + whereClauses.Add("ExternalSeriesId=@ExternalSeriesId"); + if (statement != null) + { + statement.TryBind("@ExternalSeriesId", query.ExternalSeriesId); + } + } + + if (!string.IsNullOrWhiteSpace(query.Name)) + { + whereClauses.Add("CleanName=@Name"); + + if (statement != null) + { + statement.TryBind("@Name", GetCleanValue(query.Name)); + } + } + + if (!string.IsNullOrWhiteSpace(query.NameContains)) + { + whereClauses.Add("CleanName like @NameContains"); + if (statement != null) + { + statement.TryBind("@NameContains", "%" + GetCleanValue(query.NameContains) + "%"); + } + } + if (!string.IsNullOrWhiteSpace(query.NameStartsWith)) + { + whereClauses.Add("SortName like @NameStartsWith"); + if (statement != null) + { + statement.TryBind("@NameStartsWith", query.NameStartsWith + "%"); + } + } + if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater)) + { + whereClauses.Add("SortName >= @NameStartsWithOrGreater"); + // lowercase this because SortName is stored as lowercase + if (statement != null) + { + statement.TryBind("@NameStartsWithOrGreater", query.NameStartsWithOrGreater.ToLower()); + } + } + if (!string.IsNullOrWhiteSpace(query.NameLessThan)) + { + whereClauses.Add("SortName < @NameLessThan"); + // lowercase this because SortName is stored as lowercase + if (statement != null) + { + statement.TryBind("@NameLessThan", query.NameLessThan.ToLower()); + } + } + + if (query.ImageTypes.Length > 0) + { + foreach (var requiredImage in query.ImageTypes) + { + whereClauses.Add("Images like '%" + requiredImage + "%'"); + } + } + + if (query.IsLiked.HasValue) + { + if (query.IsLiked.Value) + { + whereClauses.Add("rating>=@UserRating"); + if (statement != null) + { + statement.TryBind("@UserRating", UserItemData.MinLikeValue); + } + } + else + { + whereClauses.Add("(rating is null or rating<@UserRating)"); + if (statement != null) + { + statement.TryBind("@UserRating", UserItemData.MinLikeValue); + } + } + } + + if (query.IsFavoriteOrLiked.HasValue) + { + if (query.IsFavoriteOrLiked.Value) + { + whereClauses.Add("IsFavorite=@IsFavoriteOrLiked"); + } + else + { + whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavoriteOrLiked)"); + } + if (statement != null) + { + statement.TryBind("@IsFavoriteOrLiked", query.IsFavoriteOrLiked.Value); + } + } + + if (query.IsFavorite.HasValue) + { + if (query.IsFavorite.Value) + { + whereClauses.Add("IsFavorite=@IsFavorite"); + } + else + { + whereClauses.Add("(IsFavorite is null or IsFavorite=@IsFavorite)"); + } + if (statement != null) + { + statement.TryBind("@IsFavorite", query.IsFavorite.Value); + } + } + + if (EnableJoinUserData(query)) + { + if (query.IsPlayed.HasValue) + { + if (query.IsPlayed.Value) + { + whereClauses.Add("(played=@IsPlayed)"); + } + else + { + whereClauses.Add("(played is null or played=@IsPlayed)"); + } + if (statement != null) + { + statement.TryBind("@IsPlayed", query.IsPlayed.Value); + } + } + } + + if (query.IsResumable.HasValue) + { + if (query.IsResumable.Value) + { + whereClauses.Add("playbackPositionTicks > 0"); + } + else + { + whereClauses.Add("(playbackPositionTicks is null or playbackPositionTicks = 0)"); + } + } + + if (query.ArtistNames.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var artist in query.ArtistNames) + { + clauses.Add("@ArtistName" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); + if (statement != null) + { + statement.TryBind("@ArtistName" + index, GetCleanValue(artist)); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.ExcludeArtistIds.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var artistId in query.ExcludeArtistIds) + { + var artistItem = RetrieveItem(new Guid(artistId)); + if (artistItem != null) + { + clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); + if (statement != null) + { + statement.TryBind("@ExcludeArtistName" + index, GetCleanValue(artistItem.Name)); + } + index++; + } + } + var clause = "(" + string.Join(" AND ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.GenreIds.Length > 0) + { + // Todo: improve without having to do this + query.Genres = query.GenreIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); + } + + if (query.Genres.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var item in query.Genres) + { + clauses.Add("@Genre" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=2)"); + if (statement != null) + { + statement.TryBind("@Genre" + index, GetCleanValue(item)); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.Tags.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var item in query.Tags) + { + clauses.Add("@Tag" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=4)"); + if (statement != null) + { + statement.TryBind("@Tag" + index, GetCleanValue(item)); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.StudioIds.Length > 0) + { + // Todo: improve without having to do this + query.Studios = query.StudioIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); + } + + if (query.Studios.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var item in query.Studios) + { + clauses.Add("@Studio" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=3)"); + if (statement != null) + { + statement.TryBind("@Studio" + index, GetCleanValue(item)); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.Keywords.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var item in query.Keywords) + { + clauses.Add("@Keyword" + index + " in (select CleanValue from itemvalues where ItemId=Guid and Type=5)"); + if (statement != null) + { + statement.TryBind("@Keyword" + index, GetCleanValue(item)); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.OfficialRatings.Length > 0) + { + var clauses = new List(); + var index = 0; + foreach (var item in query.OfficialRatings) + { + clauses.Add("OfficialRating=@OfficialRating" + index); + if (statement != null) + { + statement.TryBind("@OfficialRating" + index, item); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); + } + + if (query.MinParentalRating.HasValue) + { + whereClauses.Add("InheritedParentalRatingValue<=@MinParentalRating"); + if (statement != null) + { + statement.TryBind("@MinParentalRating", query.MinParentalRating.Value); + } + } + + if (query.MaxParentalRating.HasValue) + { + whereClauses.Add("InheritedParentalRatingValue<=@MaxParentalRating"); + if (statement != null) + { + statement.TryBind("@MaxParentalRating", query.MaxParentalRating.Value); + } + } + + if (query.HasParentalRating.HasValue) + { + if (query.HasParentalRating.Value) + { + whereClauses.Add("InheritedParentalRatingValue > 0"); + } + else + { + whereClauses.Add("InheritedParentalRatingValue = 0"); + } + } + + if (query.HasOverview.HasValue) + { + if (query.HasOverview.Value) + { + whereClauses.Add("(Overview not null AND Overview<>'')"); + } + else + { + whereClauses.Add("(Overview is null OR Overview='')"); + } + } + + if (query.HasDeadParentId.HasValue) + { + if (query.HasDeadParentId.Value) + { + whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)"); + } + } + + if (query.Years.Length == 1) + { + whereClauses.Add("ProductionYear=@Years"); + if (statement != null) + { + statement.TryBind("@Years", query.Years[0].ToString()); + } + } + else if (query.Years.Length > 1) + { + var val = string.Join(",", query.Years.ToArray()); + + whereClauses.Add("ProductionYear in (" + val + ")"); + } + + if (query.LocationTypes.Length == 1) + { + if (query.LocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) + { + query.IsVirtualItem = true; + } + else + { + whereClauses.Add("LocationType=@LocationType"); + if (statement != null) + { + statement.TryBind("LocationType", query.LocationTypes[0].ToString()); + } + } + } + else if (query.LocationTypes.Length > 1) + { + var val = string.Join(",", query.LocationTypes.Select(i => "'" + i + "'").ToArray()); + + whereClauses.Add("LocationType in (" + val + ")"); + } + if (query.ExcludeLocationTypes.Length == 1) + { + if (query.ExcludeLocationTypes[0] == LocationType.Virtual && _config.Configuration.SchemaVersion >= 90) + { + query.IsVirtualItem = false; + } + else + { + whereClauses.Add("LocationType<>@ExcludeLocationTypes"); + if (statement != null) + { + statement.TryBind("ExcludeLocationTypes", query.ExcludeLocationTypes[0].ToString()); + } + } + } + else if (query.ExcludeLocationTypes.Length > 1) + { + var val = string.Join(",", query.ExcludeLocationTypes.Select(i => "'" + i + "'").ToArray()); + + whereClauses.Add("LocationType not in (" + val + ")"); + } + if (query.IsVirtualItem.HasValue) + { + whereClauses.Add("IsVirtualItem=@IsVirtualItem"); + if (statement != null) + { + statement.TryBind("@IsVirtualItem", query.IsVirtualItem.Value); + } + } + if (query.IsSpecialSeason.HasValue) + { + if (query.IsSpecialSeason.Value) + { + whereClauses.Add("IndexNumber = 0"); + } + else + { + whereClauses.Add("IndexNumber <> 0"); + } + } + if (query.IsUnaired.HasValue) + { + if (query.IsUnaired.Value) + { + whereClauses.Add("PremiereDate >= DATETIME('now')"); + } + else + { + whereClauses.Add("PremiereDate < DATETIME('now')"); + } + } + if (query.IsMissing.HasValue) + { + if (query.IsMissing.Value) + { + whereClauses.Add("(IsVirtualItem=1 AND PremiereDate < DATETIME('now'))"); + } + else + { + whereClauses.Add("(IsVirtualItem=0 OR PremiereDate >= DATETIME('now'))"); + } + } + if (query.IsVirtualUnaired.HasValue) + { + if (query.IsVirtualUnaired.Value) + { + whereClauses.Add("(IsVirtualItem=1 AND PremiereDate >= DATETIME('now'))"); + } + else + { + whereClauses.Add("(IsVirtualItem=0 OR PremiereDate < DATETIME('now'))"); + } + } + if (query.MediaTypes.Length == 1) + { + whereClauses.Add("MediaType=@MediaTypes"); + if (statement != null) + { + statement.TryBind("@MediaTypes", query.MediaTypes[0]); + } + } + if (query.MediaTypes.Length > 1) + { + var val = string.Join(",", query.MediaTypes.Select(i => "'" + i + "'").ToArray()); + + whereClauses.Add("MediaType in (" + val + ")"); + } + if (query.ItemIds.Length > 0) + { + var includeIds = new List(); + + var index = 0; + foreach (var id in query.ItemIds) + { + includeIds.Add("Guid = @IncludeId" + index); + if (statement != null) + { + statement.TryBind("@IncludeId" + index, new Guid(id)); + } + index++; + } + + whereClauses.Add(string.Join(" OR ", includeIds.ToArray())); + } + if (query.ExcludeItemIds.Length > 0) + { + var excludeIds = new List(); + + var index = 0; + foreach (var id in query.ExcludeItemIds) + { + excludeIds.Add("Guid <> @ExcludeId" + index); + if (statement != null) + { + statement.TryBind("@ExcludeId" + index, new Guid(id)); + } + index++; + } + + whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); + } + + if (query.ExcludeProviderIds.Count > 0) + { + var excludeIds = new List(); + + var index = 0; + foreach (var pair in query.ExcludeProviderIds) + { + if (string.Equals(pair.Key, MetadataProviders.TmdbCollection.ToString(), StringComparison.OrdinalIgnoreCase)) + { + continue; + } + + var paramName = "@ExcludeProviderId" + index; + //excludeIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")"); + excludeIds.Add("ProviderIds not like " + paramName); + if (statement != null) + { + statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%"); + } + index++; + + break; + } + + whereClauses.Add(string.Join(" AND ", excludeIds.ToArray())); + } + + if (query.HasImdbId.HasValue) + { + whereClauses.Add("ProviderIds like '%imdb=%'"); + } + + if (query.HasTmdbId.HasValue) + { + whereClauses.Add("ProviderIds like '%tmdb=%'"); + } + + if (query.HasTvdbId.HasValue) + { + whereClauses.Add("ProviderIds like '%tvdb=%'"); + } + + if (query.AlbumNames.Length > 0) + { + var clause = "("; + + var index = 0; + foreach (var name in query.AlbumNames) + { + if (index > 0) + { + clause += " OR "; + } + clause += "Album=@AlbumName" + index; + + if (statement != null) + { + statement.TryBind("@AlbumName" + index, name); + } + index++; + } + + clause += ")"; + whereClauses.Add(clause); + } + if (query.HasThemeSong.HasValue) + { + if (query.HasThemeSong.Value) + { + whereClauses.Add("ThemeSongIds not null"); + } + else + { + whereClauses.Add("ThemeSongIds is null"); + } + } + if (query.HasThemeVideo.HasValue) + { + if (query.HasThemeVideo.Value) + { + whereClauses.Add("ThemeVideoIds not null"); + } + else + { + whereClauses.Add("ThemeVideoIds is null"); + } + } + + //var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0; + var enableItemsByName = query.IncludeItemsByName ?? false; + + if (query.TopParentIds.Length == 1) + { + if (enableItemsByName) + { + whereClauses.Add("(TopParentId=@TopParentId or IsItemByName=@IsItemByName)"); + if (statement != null) + { + statement.TryBind("@IsItemByName", true); + } + } + else + { + whereClauses.Add("(TopParentId=@TopParentId)"); + } + if (statement != null) + { + statement.TryBind("@TopParentId", query.TopParentIds[0]); + } + } + if (query.TopParentIds.Length > 1) + { + var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray()); + + if (enableItemsByName) + { + whereClauses.Add("(IsItemByName=@IsItemByName or TopParentId in (" + val + "))"); + if (statement != null) + { + statement.TryBind("@IsItemByName", true); + } + } + else + { + whereClauses.Add("(TopParentId in (" + val + "))"); + } + } + + if (query.AncestorIds.Length == 1) + { + whereClauses.Add("Guid in (select itemId from AncestorIds where AncestorId=@AncestorId)"); + + if (statement != null) + { + statement.TryBind("@AncestorId", new Guid(query.AncestorIds[0])); + } + } + if (query.AncestorIds.Length > 1) + { + var inClause = string.Join(",", query.AncestorIds.Select(i => "'" + new Guid(i).ToString("N") + "'").ToArray()); + whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause)); + } + if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)) + { + var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey"; + whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorId in ({0}))", inClause)); + if (statement != null) + { + statement.TryBind("@AncestorWithPresentationUniqueKey", query.AncestorWithPresentationUniqueKey); + } + } + + if (query.BlockUnratedItems.Length == 1) + { + whereClauses.Add("(InheritedParentalRatingValue > 0 or UnratedType <> @UnratedType)"); + if (statement != null) + { + statement.TryBind("@UnratedType", query.BlockUnratedItems[0].ToString()); + } + } + if (query.BlockUnratedItems.Length > 1) + { + var inClause = string.Join(",", query.BlockUnratedItems.Select(i => "'" + i.ToString() + "'").ToArray()); + whereClauses.Add(string.Format("(InheritedParentalRatingValue > 0 or UnratedType not in ({0}))", inClause)); + } + + var excludeTagIndex = 0; + foreach (var excludeTag in query.ExcludeTags) + { + whereClauses.Add("(Tags is null OR Tags not like @excludeTag" + excludeTagIndex + ")"); + if (statement != null) + { + statement.TryBind("@excludeTag" + excludeTagIndex, "%" + excludeTag + "%"); + } + excludeTagIndex++; + } + + excludeTagIndex = 0; + foreach (var excludeTag in query.ExcludeInheritedTags) + { + whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex + ")"); + if (statement != null) + { + statement.TryBind("@excludeInheritedTag" + excludeTagIndex, "%" + excludeTag + "%"); + } + excludeTagIndex++; + } + + return whereClauses; + } + + private string GetCleanValue(string value) + { + if (string.IsNullOrWhiteSpace(value)) + { + return value; + } + + return value.RemoveDiacritics().ToLower(); + } + + private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query) + { + if (!query.GroupByPresentationUniqueKey) + { + return false; + } + + if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey)) + { + return false; + } + + if (query.User == null) + { + return false; + } + + if (query.IncludeItemTypes.Length == 0) + { + return true; + } + + var types = new[] { + typeof(Episode).Name, + typeof(Video).Name , + typeof(Movie).Name , + typeof(MusicVideo).Name , + typeof(Series).Name , + typeof(Season).Name }; + + if (types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase))) + { + return true; + } + + return false; + } + + private static readonly Type[] KnownTypes = + { + typeof(LiveTvProgram), + typeof(LiveTvChannel), + typeof(LiveTvVideoRecording), + typeof(LiveTvAudioRecording), + typeof(Series), + typeof(Audio), + typeof(MusicAlbum), + typeof(MusicArtist), + typeof(MusicGenre), + typeof(MusicVideo), + typeof(Movie), + typeof(Playlist), + typeof(AudioPodcast), + typeof(Trailer), + typeof(BoxSet), + typeof(Episode), + typeof(Season), + typeof(Series), + typeof(Book), + typeof(CollectionFolder), + typeof(Folder), + typeof(Game), + typeof(GameGenre), + typeof(GameSystem), + typeof(Genre), + typeof(Person), + typeof(Photo), + typeof(PhotoAlbum), + typeof(Studio), + typeof(UserRootFolder), + typeof(UserView), + typeof(Video), + typeof(Year), + typeof(Channel), + typeof(AggregateFolder) + }; + + public async Task UpdateInheritedValues(CancellationToken cancellationToken) + { + await UpdateInheritedTags(cancellationToken).ConfigureAwait(false); + } + + private async Task UpdateInheritedTags(CancellationToken cancellationToken) + { + var newValues = new List>(); + + var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; + + using (WriteLock.Write()) + { + foreach (var row in _connection.Query(commandText)) + { + var id = row.GetGuid(0); + string value = row.IsDBNull(2) ? null : row.GetString(2); + + newValues.Add(new Tuple(id, value)); + } + + Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count); + if (newValues.Count == 0) + { + return; + } + + // write lock here + using (var statement = _connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid")) + { + foreach (var item in newValues) + { + var paramList = new List(); + + paramList.Add(item.Item1); + paramList.Add(item.Item2); + + statement.Execute(paramList.ToArray()); + } + } + } + } + + private static Dictionary GetTypeMapDictionary() + { + var dict = new Dictionary(StringComparer.OrdinalIgnoreCase); + + foreach (var t in KnownTypes) + { + dict[t.Name] = new[] { t.FullName }; + } + + dict["Recording"] = new[] { typeof(LiveTvAudioRecording).FullName, typeof(LiveTvVideoRecording).FullName }; + dict["Program"] = new[] { typeof(LiveTvProgram).FullName }; + dict["TvChannel"] = new[] { typeof(LiveTvChannel).FullName }; + + return dict; + } + + // Not crazy about having this all the way down here, but at least it's in one place + readonly Dictionary _types = GetTypeMapDictionary(); + + private IEnumerable MapIncludeItemTypes(string value) + { + string[] result; + if (_types.TryGetValue(value, out result)) + { + return result; + } + + return new[] { value }; + } + + public async Task DeleteItem(Guid id, CancellationToken cancellationToken) + { + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + // Delete people + ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue()); + + // Delete chapters + ExecuteWithSingleParam(db, "delete from " + ChaptersTableName + " where ItemId=@Id", id.ToGuidParamValue()); + + // Delete media streams + ExecuteWithSingleParam(db, "delete from mediastreams where ItemId=@Id", id.ToGuidParamValue()); + + // Delete ancestors + ExecuteWithSingleParam(db, "delete from AncestorIds where ItemId=@Id", id.ToGuidParamValue()); + + // Delete item values + ExecuteWithSingleParam(db, "delete from ItemValues where ItemId=@Id", id.ToGuidParamValue()); + + // Delete the item + ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue()); + }); + } + } + + private void ExecuteWithSingleParam(IDatabaseConnection db, string query, byte[] value) + { + using (var statement = db.PrepareStatement(query)) + { + statement.TryBind("@Id", value); + + statement.MoveNext(); + } + } + + public List GetPeopleNames(InternalPeopleQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + var commandText = "select Distinct Name from People"; + + var whereClauses = GetPeopleWhereClauses(query, null); + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + + commandText += " order by ListOrder"; + + var list = new List(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row.GetString(0)); + } + } + return list; + } + } + + public List GetPeople(InternalPeopleQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + var commandText = "select ItemId, Name, Role, PersonType, SortOrder from People"; + + var whereClauses = GetPeopleWhereClauses(query, null); + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + + commandText += " order by ListOrder"; + + var list = new List(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetPerson(row)); + } + } + } + + return list; + } + + private List GetPeopleWhereClauses(InternalPeopleQuery query, IStatement statement) + { + var whereClauses = new List(); + + if (query.ItemId != Guid.Empty) + { + whereClauses.Add("ItemId=@ItemId"); + if (statement != null) + { + statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); + } + } + if (query.AppearsInItemId != Guid.Empty) + { + whereClauses.Add("Name in (Select Name from People where ItemId=@AppearsInItemId)"); + if (statement != null) + { + statement.TryBind("@AppearsInItemId", query.AppearsInItemId.ToGuidParamValue()); + } + } + if (query.PersonTypes.Count == 1) + { + whereClauses.Add("PersonType=@PersonType"); + if (statement != null) + { + statement.TryBind("@PersonType", query.PersonTypes[0]); + } + } + if (query.PersonTypes.Count > 1) + { + var val = string.Join(",", query.PersonTypes.Select(i => "'" + i + "'").ToArray()); + + whereClauses.Add("PersonType in (" + val + ")"); + } + if (query.ExcludePersonTypes.Count == 1) + { + whereClauses.Add("PersonType<>@PersonType"); + if (statement != null) + { + statement.TryBind("@PersonType", query.ExcludePersonTypes[0]); + } + } + if (query.ExcludePersonTypes.Count > 1) + { + var val = string.Join(",", query.ExcludePersonTypes.Select(i => "'" + i + "'").ToArray()); + + whereClauses.Add("PersonType not in (" + val + ")"); + } + if (query.MaxListOrder.HasValue) + { + whereClauses.Add("ListOrder<=@MaxListOrder"); + if (statement != null) + { + statement.TryBind("@MaxListOrder", query.MaxListOrder.Value); + } + } + if (!string.IsNullOrWhiteSpace(query.NameContains)) + { + whereClauses.Add("Name like @NameContains"); + if (statement != null) + { + statement.TryBind("@NameContains", "%" + query.NameContains + "%"); + } + } + if (query.SourceTypes.Length == 1) + { + whereClauses.Add("(select sourcetype from typedbaseitems where guid=ItemId) = @SourceTypes"); + if (statement != null) + { + statement.TryBind("@SourceTypes", query.SourceTypes[0].ToString()); + } + } + + return whereClauses; + } + + private void UpdateAncestors(Guid itemId, List ancestorIds, IDatabaseConnection db, IStatement deleteAncestorsStatement, IStatement updateAncestorsStatement) + { + if (itemId == Guid.Empty) + { + throw new ArgumentNullException("itemId"); + } + + if (ancestorIds == null) + { + throw new ArgumentNullException("ancestorIds"); + } + + CheckDisposed(); + + // First delete + deleteAncestorsStatement.Reset(); + deleteAncestorsStatement.TryBind("@ItemId", itemId.ToGuidParamValue()); + deleteAncestorsStatement.MoveNext(); + + foreach (var ancestorId in ancestorIds) + { + updateAncestorsStatement.Reset(); + updateAncestorsStatement.TryBind("@ItemId", itemId.ToGuidParamValue()); + updateAncestorsStatement.TryBind("@AncestorId", ancestorId.ToGuidParamValue()); + updateAncestorsStatement.TryBind("@AncestorIdText", ancestorId.ToString("N")); + updateAncestorsStatement.MoveNext(); + } + } + + public QueryResult> GetAllArtists(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName); + } + + public QueryResult> GetArtists(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName); + } + + public QueryResult> GetAlbumArtists(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName); + } + + public QueryResult> GetStudios(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName); + } + + public QueryResult> GetGenres(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName); + } + + public QueryResult> GetGameGenres(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 2 }, typeof(GameGenre).FullName); + } + + public QueryResult> GetMusicGenres(InternalItemsQuery query) + { + return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName); + } + + public List GetStudioNames() + { + return GetItemValueNames(new[] { 3 }, new List(), new List()); + } + + public List GetAllArtistNames() + { + return GetItemValueNames(new[] { 0, 1 }, new List(), new List()); + } + + public List GetMusicGenreNames() + { + return GetItemValueNames(new[] { 2 }, new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" }, new List()); + } + + public List GetGameGenreNames() + { + return GetItemValueNames(new[] { 2 }, new List { "Game" }, new List()); + } + + public List GetGenreNames() + { + return GetItemValueNames(new[] { 2 }, new List(), new List { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist", "Game", "GameSystem" }); + } + + private List GetItemValueNames(int[] itemValueTypes, List withItemTypes, List excludeItemTypes) + { + CheckDisposed(); + + withItemTypes = withItemTypes.SelectMany(MapIncludeItemTypes).ToList(); + excludeItemTypes = excludeItemTypes.SelectMany(MapIncludeItemTypes).ToList(); + + var now = DateTime.UtcNow; + + var typeClause = itemValueTypes.Length == 1 ? + ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : + ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); + + var list = new List(); + + var commandText = "Select Value From ItemValues where " + typeClause; + + if (withItemTypes.Count > 0) + { + var typeString = string.Join(",", withItemTypes.Select(i => "'" + i + "'").ToArray()); + commandText += " AND ItemId In (select guid from typedbaseitems where type in (" + typeString + "))"; + } + if (excludeItemTypes.Count > 0) + { + var typeString = string.Join(",", excludeItemTypes.Select(i => "'" + i + "'").ToArray()); + commandText += " AND ItemId not In (select guid from typedbaseitems where type in (" + typeString + "))"; + } + + commandText += " Group By CleanValue"; + + using (WriteLock.Write()) + { + foreach (var row in _connection.Query(commandText)) + { + if (!row.IsDBNull(0)) + { + list.Add(row.GetString(0)); + } + } + } + LogQueryTime("GetItemValueNames", commandText, now); + + return list; + } + + private QueryResult> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + if (!query.Limit.HasValue) + { + query.EnableTotalRecordCount = false; + } + + CheckDisposed(); + + var now = DateTime.UtcNow; + + var typeClause = itemValueTypes.Length == 1 ? + ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : + ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); + + using (WriteLock.Write()) + { + // var itemCountColumns = new List>(); + + // var typesToCount = query.IncludeItemTypes.ToList(); + + // if (typesToCount.Count > 0) + // { + // var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B"); + + // var typeSubQuery = new InternalItemsQuery(query.User) + // { + // ExcludeItemTypes = query.ExcludeItemTypes, + // IncludeItemTypes = query.IncludeItemTypes, + // MediaTypes = query.MediaTypes, + // AncestorIds = query.AncestorIds, + // ExcludeItemIds = query.ExcludeItemIds, + // ItemIds = query.ItemIds, + // TopParentIds = query.TopParentIds, + // ParentId = query.ParentId, + // IsPlayed = query.IsPlayed + // }; + // var whereClauses = GetWhereClauses(typeSubQuery, cmd, "itemTypes"); + + // whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND " + typeClause + ")"); + + // var typeWhereText = whereClauses.Count == 0 ? + // string.Empty : + // " where " + string.Join(" AND ", whereClauses.ToArray()); + + // itemCountColumnQuery += typeWhereText; + + // //itemCountColumnQuery += ")"; + + // itemCountColumns.Add(new Tuple("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes")); + // } + + // var columns = _retriveItemColumns.ToList(); + // columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray()); + + // cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray(), cmd)) + GetFromText(); + // cmd.CommandText += GetJoinUserDataText(query); + + // var innerQuery = new InternalItemsQuery(query.User) + // { + // ExcludeItemTypes = query.ExcludeItemTypes, + // IncludeItemTypes = query.IncludeItemTypes, + // MediaTypes = query.MediaTypes, + // AncestorIds = query.AncestorIds, + // ExcludeItemIds = query.ExcludeItemIds, + // ItemIds = query.ItemIds, + // TopParentIds = query.TopParentIds, + // ParentId = query.ParentId, + // IsPlayed = query.IsPlayed + // }; + + // var innerWhereClauses = GetWhereClauses(innerQuery, cmd); + + // var innerWhereText = innerWhereClauses.Count == 0 ? + // string.Empty : + // " where " + string.Join(" AND ", innerWhereClauses.ToArray()); + + // var whereText = " where Type=@SelectType"; + + // if (typesToCount.Count == 0) + // { + // whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; + // } + // else + // { + // //whereText += " And itemTypes not null"; + // whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; + // } + + // var outerQuery = new InternalItemsQuery(query.User) + // { + // IsFavorite = query.IsFavorite, + // IsFavoriteOrLiked = query.IsFavoriteOrLiked, + // IsLiked = query.IsLiked, + // IsLocked = query.IsLocked, + // NameLessThan = query.NameLessThan, + // NameStartsWith = query.NameStartsWith, + // NameStartsWithOrGreater = query.NameStartsWithOrGreater, + // AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater, + // Tags = query.Tags, + // OfficialRatings = query.OfficialRatings, + // GenreIds = query.GenreIds, + // Genres = query.Genres, + // Years = query.Years + // }; + + // var outerWhereClauses = GetWhereClauses(outerQuery, cmd); + + // whereText += outerWhereClauses.Count == 0 ? + // string.Empty : + // " AND " + string.Join(" AND ", outerWhereClauses.ToArray()); + // //cmd.CommandText += GetGroupBy(query); + + // cmd.CommandText += whereText; + // cmd.CommandText += " group by PresentationUniqueKey"; + + // cmd.Parameters.Add(cmd, "@SelectType", DbType.String).Value = returnType; + + // if (EnableJoinUserData(query)) + // { + // cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; + // } + + // cmd.CommandText += " order by SortName"; + + // if (query.Limit.HasValue || query.StartIndex.HasValue) + // { + // var offset = query.StartIndex ?? 0; + + // if (query.Limit.HasValue || offset > 0) + // { + // cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + // } + + // if (offset > 0) + // { + // cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + // } + // } + + // cmd.CommandText += ";"; + + // var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; + + // if (isReturningZeroItems) + // { + // cmd.CommandText = ""; + // } + + // if (query.EnableTotalRecordCount) + // { + // cmd.CommandText += "select count (distinct PresentationUniqueKey)" + GetFromText(); + + // cmd.CommandText += GetJoinUserDataText(query); + // cmd.CommandText += whereText; + // } + // else + // { + // cmd.CommandText = cmd.CommandText.TrimEnd(';'); + // } + + // var list = new List>(); + // var count = 0; + + // var commandBehavior = isReturningZeroItems || !query.EnableTotalRecordCount + // ? (CommandBehavior.SequentialAccess | CommandBehavior.SingleResult) + // : CommandBehavior.SequentialAccess; + + // //Logger.Debug("GetItemValues: " + cmd.CommandText); + + // using (var reader = cmd.ExecuteReader(commandBehavior)) + // { + // LogQueryTime("GetItemValues", cmd, now); + + // if (isReturningZeroItems) + // { + // if (reader.Read()) + // { + // count = reader.GetInt32(0); + // } + // } + // else + // { + // while (reader.Read()) + // { + // var item = GetItem(reader); + // if (item != null) + // { + // var countStartColumn = columns.Count - 1; + + // list.Add(new Tuple(item, GetItemCounts(reader, countStartColumn, typesToCount))); + // } + // } + + // if (reader.NextResult() && reader.Read()) + // { + // count = reader.GetInt32(0); + // } + // } + // } + + // if (count == 0) + // { + // count = list.Count; + // } + + // return new QueryResult> + // { + // Items = list.ToArray(), + // TotalRecordCount = count + // }; + } + + return new QueryResult>(); + } + + private ItemCounts GetItemCounts(IReadOnlyList reader, int countStartColumn, List typesToCount) + { + var counts = new ItemCounts(); + + if (typesToCount.Count == 0) + { + return counts; + } + + var typeString = reader.IsDBNull(countStartColumn) ? null : reader.GetString(countStartColumn); + + if (string.IsNullOrWhiteSpace(typeString)) + { + return counts; + } + + var allTypes = typeString.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries) + .ToLookup(i => i).ToList(); + + foreach (var type in allTypes) + { + var value = type.ToList().Count; + var typeName = type.Key; + + if (string.Equals(typeName, typeof(Series).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.SeriesCount = value; + } + else if (string.Equals(typeName, typeof(Episode).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.EpisodeCount = value; + } + else if (string.Equals(typeName, typeof(Movie).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.MovieCount = value; + } + else if (string.Equals(typeName, typeof(MusicAlbum).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.AlbumCount = value; + } + else if (string.Equals(typeName, typeof(MusicArtist).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.ArtistCount = value; + } + else if (string.Equals(typeName, typeof(Audio).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.SongCount = value; + } + else if (string.Equals(typeName, typeof(Game).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.GameCount = value; + } + else if (string.Equals(typeName, typeof(Trailer).FullName, StringComparison.OrdinalIgnoreCase)) + { + counts.TrailerCount = value; + } + counts.ItemCount += value; + } + + return counts; + } + + private List> GetItemValuesToSave(BaseItem item) + { + var list = new List>(); + + var hasArtist = item as IHasArtist; + if (hasArtist != null) + { + list.AddRange(hasArtist.Artists.Select(i => new Tuple(0, i))); + } + + var hasAlbumArtist = item as IHasAlbumArtist; + if (hasAlbumArtist != null) + { + list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple(1, i))); + } + + list.AddRange(item.Genres.Select(i => new Tuple(2, i))); + list.AddRange(item.Studios.Select(i => new Tuple(3, i))); + list.AddRange(item.Tags.Select(i => new Tuple(4, i))); + list.AddRange(item.Keywords.Select(i => new Tuple(5, i))); + + return list; + } + + private void UpdateItemValues(Guid itemId, List> values, IDatabaseConnection db) + { + if (itemId == Guid.Empty) + { + throw new ArgumentNullException("itemId"); + } + + if (values == null) + { + throw new ArgumentNullException("keys"); + } + + CheckDisposed(); + + // First delete + db.Execute("delete from ItemValues where ItemId=@Id", itemId.ToGuidParamValue()); + + using (var statement = db.PrepareStatement("insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)")) + { + foreach (var pair in values) + { + statement.Reset(); + + statement.TryBind("@ItemId", itemId.ToGuidParamValue()); + statement.TryBind("@Type", pair.Item1); + statement.TryBind("@Value", pair.Item2); + + if (pair.Item2 == null) + { + statement.TryBindNull("@CleanValue"); + } + else + { + statement.TryBind("@CleanValue", GetCleanValue(pair.Item2)); + } + + statement.MoveNext(); + } + } + } + + public async Task UpdatePeople(Guid itemId, List people) + { + if (itemId == Guid.Empty) + { + throw new ArgumentNullException("itemId"); + } + + if (people == null) + { + throw new ArgumentNullException("people"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + // First delete + // "delete from People where ItemId=?" + _connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue()); + + var listIndex = 0; + + using (var statement = _connection.PrepareStatement( + "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)")) + { + foreach (var person in people) + { + if (listIndex > 0) + { + statement.Reset(); + } + + statement.TryBind("@ItemId", itemId.ToGuidParamValue()); + statement.TryBind("@Name", person.Name); + statement.TryBind("@Role", person.Role); + statement.TryBind("@PersonType", person.Type); + statement.TryBind("@SortOrder", person.SortOrder); + statement.TryBind("@ListOrder", listIndex); + + statement.MoveNext(); + listIndex++; + } + } + } + } + + private PersonInfo GetPerson(IReadOnlyList reader) + { + var item = new PersonInfo(); + + item.ItemId = reader.GetGuid(0); + item.Name = reader.GetString(1); + + if (!reader.IsDBNull(2)) + { + item.Role = reader.GetString(2); + } + + if (!reader.IsDBNull(3)) + { + item.Type = reader.GetString(3); + } + + if (!reader.IsDBNull(4)) + { + item.SortOrder = reader.GetInt32(4); + } + + return item; + } + + public IEnumerable GetMediaStreams(MediaStreamQuery query) + { + CheckDisposed(); + + if (query == null) + { + throw new ArgumentNullException("query"); + } + + var list = new List(); + + var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where"; + + cmdText += " ItemId=@ItemId"; + + if (query.Type.HasValue) + { + cmdText += " AND StreamType=@StreamType"; + } + + if (query.Index.HasValue) + { + cmdText += " AND StreamIndex=@StreamIndex"; + } + + cmdText += " order by StreamIndex ASC"; + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement(cmdText)) + { + statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); + + if (query.Type.HasValue) + { + statement.TryBind("@StreamType", query.Type.Value.ToString()); + } + + if (query.Index.HasValue) + { + statement.TryBind("@StreamIndex", query.Index.Value); + } + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetMediaStream(row)); + } + } + } + + return list; + } + + public async Task SaveMediaStreams(Guid id, List streams, CancellationToken cancellationToken) + { + CheckDisposed(); + + if (id == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + if (streams == null) + { + throw new ArgumentNullException("streams"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + // First delete chapters + _connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue()); + + using (var statement = _connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})", + string.Join(",", _mediaStreamSaveColumns), + string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())))) + { + foreach (var stream in streams) + { + var paramList = new List(); + + paramList.Add(id.ToGuidParamValue()); + paramList.Add(stream.Index); + paramList.Add(stream.Type.ToString()); + paramList.Add(stream.Codec); + paramList.Add(stream.Language); + paramList.Add(stream.ChannelLayout); + paramList.Add(stream.Profile); + paramList.Add(stream.AspectRatio); + paramList.Add(stream.Path); + + paramList.Add(stream.IsInterlaced); + paramList.Add(stream.BitRate); + paramList.Add(stream.Channels); + paramList.Add(stream.SampleRate); + + paramList.Add(stream.IsDefault); + paramList.Add(stream.IsForced); + paramList.Add(stream.IsExternal); + + paramList.Add(stream.Width); + paramList.Add(stream.Height); + paramList.Add(stream.AverageFrameRate); + paramList.Add(stream.RealFrameRate); + paramList.Add(stream.Level); + paramList.Add(stream.PixelFormat); + paramList.Add(stream.BitDepth); + paramList.Add(stream.IsExternal); + paramList.Add(stream.RefFrames); + + paramList.Add(stream.CodecTag); + paramList.Add(stream.Comment); + paramList.Add(stream.NalLengthSize); + paramList.Add(stream.IsAVC); + paramList.Add(stream.Title); + + paramList.Add(stream.TimeBase); + paramList.Add(stream.CodecTimeBase); + + statement.Execute(paramList.ToArray()); + } + } + } + } + + /// + /// Gets the chapter. + /// + /// The reader. + /// ChapterInfo. + private MediaStream GetMediaStream(IReadOnlyList reader) + { + var item = new MediaStream + { + Index = reader[1].ToInt() + }; + + item.Type = (MediaStreamType)Enum.Parse(typeof(MediaStreamType), reader[2].ToString(), true); + + if (reader[3].SQLiteType != SQLiteType.Null) + { + item.Codec = reader[3].ToString(); + } + + if (reader[4].SQLiteType != SQLiteType.Null) + { + item.Language = reader[4].ToString(); + } + + if (reader[5].SQLiteType != SQLiteType.Null) + { + item.ChannelLayout = reader[5].ToString(); + } + + if (reader[6].SQLiteType != SQLiteType.Null) + { + item.Profile = reader[6].ToString(); + } + + if (reader[7].SQLiteType != SQLiteType.Null) + { + item.AspectRatio = reader[7].ToString(); + } + + if (reader[8].SQLiteType != SQLiteType.Null) + { + item.Path = reader[8].ToString(); + } + + item.IsInterlaced = reader.GetBoolean(9); + + if (reader[10].SQLiteType != SQLiteType.Null) + { + item.BitRate = reader.GetInt32(10); + } + + if (reader[11].SQLiteType != SQLiteType.Null) + { + item.Channels = reader.GetInt32(11); + } + + if (reader[12].SQLiteType != SQLiteType.Null) + { + item.SampleRate = reader.GetInt32(12); + } + + item.IsDefault = reader.GetBoolean(13); + item.IsForced = reader.GetBoolean(14); + item.IsExternal = reader.GetBoolean(15); + + if (reader[16].SQLiteType != SQLiteType.Null) + { + item.Width = reader.GetInt32(16); + } + + if (reader[17].SQLiteType != SQLiteType.Null) + { + item.Height = reader.GetInt32(17); + } + + if (reader[18].SQLiteType != SQLiteType.Null) + { + item.AverageFrameRate = reader.GetFloat(18); + } + + if (reader[19].SQLiteType != SQLiteType.Null) + { + item.RealFrameRate = reader.GetFloat(19); + } + + if (reader[20].SQLiteType != SQLiteType.Null) + { + item.Level = reader.GetFloat(20); + } + + if (reader[21].SQLiteType != SQLiteType.Null) + { + item.PixelFormat = reader[21].ToString(); + } + + if (reader[22].SQLiteType != SQLiteType.Null) + { + item.BitDepth = reader.GetInt32(22); + } + + if (reader[23].SQLiteType != SQLiteType.Null) + { + item.IsAnamorphic = reader.GetBoolean(23); + } + + if (reader[24].SQLiteType != SQLiteType.Null) + { + item.RefFrames = reader.GetInt32(24); + } + + if (reader[25].SQLiteType != SQLiteType.Null) + { + item.CodecTag = reader.GetString(25); + } + + if (reader[26].SQLiteType != SQLiteType.Null) + { + item.Comment = reader.GetString(26); + } + + if (reader[27].SQLiteType != SQLiteType.Null) + { + item.NalLengthSize = reader.GetString(27); + } + + if (reader[28].SQLiteType != SQLiteType.Null) + { + item.IsAVC = reader[28].ToBool(); + } + + if (reader[29].SQLiteType != SQLiteType.Null) + { + item.Title = reader[29].ToString(); + } + + if (reader[30].SQLiteType != SQLiteType.Null) + { + item.TimeBase = reader[30].ToString(); + } + + if (reader[31].SQLiteType != SQLiteType.Null) + { + item.CodecTimeBase = reader[31].ToString(); + } + + return item; + } + + } +} \ No newline at end of file diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index c6b08c4b3..a66536179 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -1,356 +1,359 @@ -//using System; -//using System.Collections.Generic; -//using System.IO; -//using System.Linq; -//using System.Threading; -//using System.Threading.Tasks; -//using MediaBrowser.Common.Configuration; -//using MediaBrowser.Controller.Entities; -//using MediaBrowser.Controller.Persistence; -//using MediaBrowser.Model.Logging; -//using SQLitePCL.pretty; - -//namespace Emby.Server.Implementations.Data -//{ -// public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository -// { -// private SQLiteDatabaseConnection _connection; - -// public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) -// : base(logger) -// { -// DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); -// } - -// protected override bool EnableConnectionPooling -// { -// get { return false; } -// } - -// /// -// /// Gets the name of the repository -// /// -// /// The name. -// public string Name -// { -// get -// { -// return "SQLite"; -// } -// } - -// /// -// /// Opens the connection to the database -// /// -// /// Task. -// public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) -// { -// WriteLock.Dispose(); -// WriteLock = writeLock; -// _connection = connection; - -// string[] queries = { - -// "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", - -// "drop index if exists UserDataDb.idx_userdata", -// "drop index if exists UserDataDb.idx_userdata1", -// "drop index if exists UserDataDb.idx_userdata2", -// "drop index if exists UserDataDb.userdataindex1", - -// "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", -// "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", -// "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", -// "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", - -// //pragmas -// "pragma temp_store = memory", - -// "pragma shrink_memory" -// }; - -// _connection.RunQueries(queries); - -// connection.RunInTransaction(db => -// { -// var existingColumnNames = GetColumnNames(db, "userdata"); - -// AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); -// AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); -// }); -// } - -// /// -// /// Saves the user data. -// /// -// /// The user id. -// /// The key. -// /// The user data. -// /// The cancellation token. -// /// Task. -// /// userData -// /// or -// /// cancellationToken -// /// or -// /// userId -// /// or -// /// userDataId -// public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) -// { -// if (userData == null) -// { -// throw new ArgumentNullException("userData"); -// } -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (string.IsNullOrEmpty(key)) -// { -// throw new ArgumentNullException("key"); -// } - -// return PersistUserData(userId, key, userData, cancellationToken); -// } - -// public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) -// { -// if (userData == null) -// { -// throw new ArgumentNullException("userData"); -// } -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } - -// return PersistAllUserData(userId, userData.ToList(), cancellationToken); -// } - -// /// -// /// Persists the user data. -// /// -// /// The user id. -// /// The key. -// /// The user data. -// /// The cancellation token. -// /// Task. -// public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// using (WriteLock.Write()) -// { -// _connection.RunInTransaction(db => -// { -// SaveUserData(db, userId, key, userData); -// }); -// } -// } - -// private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) -// { -// using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) -// { -// statement.TryBind("@UserId", userId.ToGuidParamValue()); -// statement.TryBind("@Key", key); - -// if (userData.Rating.HasValue) -// { -// statement.TryBind("@rating", userData.Rating.Value); -// } -// else -// { -// statement.TryBindNull("@rating"); -// } - -// statement.TryBind("@played", userData.Played); -// statement.TryBind("@playCount", userData.PlayCount); -// statement.TryBind("@isFavorite", userData.IsFavorite); -// statement.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks); - -// if (userData.LastPlayedDate.HasValue) -// { -// statement.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue()); -// } -// else -// { -// statement.TryBindNull("@lastPlayedDate"); -// } - -// if (userData.AudioStreamIndex.HasValue) -// { -// statement.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value); -// } -// else -// { -// statement.TryBindNull("@AudioStreamIndex"); -// } - -// if (userData.SubtitleStreamIndex.HasValue) -// { -// statement.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value); -// } -// else -// { -// statement.TryBindNull("@SubtitleStreamIndex"); -// } - -// statement.MoveNext(); -// } -// } - -// /// -// /// Persist all user data for the specified user -// /// -// private async Task PersistAllUserData(Guid userId, List userDataList, CancellationToken cancellationToken) -// { -// cancellationToken.ThrowIfCancellationRequested(); - -// using (WriteLock.Write()) -// { -// _connection.RunInTransaction(db => -// { -// foreach (var userItemData in userDataList) -// { -// SaveUserData(db, userId, userItemData.Key, userItemData); -// } -// }); -// } -// } - -// /// -// /// Gets the user data. -// /// -// /// The user id. -// /// The key. -// /// Task{UserItemData}. -// /// -// /// userId -// /// or -// /// key -// /// -// public UserItemData GetUserData(Guid userId, string key) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (string.IsNullOrEmpty(key)) -// { -// throw new ArgumentNullException("key"); -// } - -// using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) -// { -// statement.TryBind("@UserId", userId.ToGuidParamValue()); -// statement.TryBind("@Key", key); - -// foreach (var row in statement.ExecuteQuery()) -// { -// return ReadRow(row); -// } -// } - -// return null; -// } - -// public UserItemData GetUserData(Guid userId, List keys) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } -// if (keys == null) -// { -// throw new ArgumentNullException("keys"); -// } - -// if (keys.Count == 0) -// { -// return null; -// } - -// return GetUserData(userId, keys[0]); -// } - -// /// -// /// Return all user-data associated with the given user -// /// -// /// -// /// -// public IEnumerable GetAllUserData(Guid userId) -// { -// if (userId == Guid.Empty) -// { -// throw new ArgumentNullException("userId"); -// } - -// var list = new List(); - -// using (WriteLock.Read()) -// { -// using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) -// { -// statement.TryBind("@UserId", userId.ToGuidParamValue()); - -// foreach (var row in statement.ExecuteQuery()) -// { -// list.Add(ReadRow(row)); -// } -// } -// } - -// return list; -// } - -// /// -// /// Read a row from the specified reader into the provided userData object -// /// -// /// -// private UserItemData ReadRow(IReadOnlyList reader) -// { -// var userData = new UserItemData(); - -// userData.Key = reader[0].ToString(); -// userData.UserId = reader[1].ReadGuid(); - -// if (reader[2].SQLiteType != SQLiteType.Null) -// { -// userData.Rating = reader[2].ToDouble(); -// } - -// userData.Played = reader[3].ToBool(); -// userData.PlayCount = reader[4].ToInt(); -// userData.IsFavorite = reader[5].ToBool(); -// userData.PlaybackPositionTicks = reader[6].ToInt64(); - -// if (reader[7].SQLiteType != SQLiteType.Null) -// { -// userData.LastPlayedDate = reader[7].ReadDateTime(); -// } - -// if (reader[8].SQLiteType != SQLiteType.Null) -// { -// userData.AudioStreamIndex = reader[8].ToInt(); -// } - -// if (reader[9].SQLiteType != SQLiteType.Null) -// { -// userData.SubtitleStreamIndex = reader[9].ToInt(); -// } - -// return userData; -// } - -// protected override void Dispose(bool dispose) -// { -// // handled by library database -// } - -// protected override void CloseConnection() -// { -// // handled by library database -// } -// } -//} \ No newline at end of file +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Common.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Logging; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Data +{ + public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository + { + private SQLiteDatabaseConnection _connection; + + public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) + : base(logger) + { + DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); + } + + protected override bool EnableConnectionPooling + { + get { return false; } + } + + /// + /// Gets the name of the repository + /// + /// The name. + public string Name + { + get + { + return "SQLite"; + } + } + + /// + /// Opens the connection to the database + /// + /// Task. + public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) + { + WriteLock.Dispose(); + WriteLock = writeLock; + _connection = connection; + + string[] queries = { + + "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", + + "drop index if exists UserDataDb.idx_userdata", + "drop index if exists UserDataDb.idx_userdata1", + "drop index if exists UserDataDb.idx_userdata2", + "drop index if exists UserDataDb.userdataindex1", + + "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", + "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", + "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", + "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", + + //pragmas + "pragma temp_store = memory", + + "pragma shrink_memory" + }; + + _connection.RunQueries(queries); + + connection.RunInTransaction(db => + { + var existingColumnNames = GetColumnNames(db, "userdata"); + + AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); + AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); + }); + } + + /// + /// Saves the user data. + /// + /// The user id. + /// The key. + /// The user data. + /// The cancellation token. + /// Task. + /// userData + /// or + /// cancellationToken + /// or + /// userId + /// or + /// userDataId + public Task SaveUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) + { + if (userData == null) + { + throw new ArgumentNullException("userData"); + } + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException("key"); + } + + return PersistUserData(userId, key, userData, cancellationToken); + } + + public Task SaveAllUserData(Guid userId, IEnumerable userData, CancellationToken cancellationToken) + { + if (userData == null) + { + throw new ArgumentNullException("userData"); + } + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + + return PersistAllUserData(userId, userData.ToList(), cancellationToken); + } + + /// + /// Persists the user data. + /// + /// The user id. + /// The key. + /// The user data. + /// The cancellation token. + /// Task. + public async Task PersistUserData(Guid userId, string key, UserItemData userData, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + SaveUserData(db, userId, key, userData); + }); + } + } + + private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) + { + using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) + { + statement.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@Key", key); + + if (userData.Rating.HasValue) + { + statement.TryBind("@rating", userData.Rating.Value); + } + else + { + statement.TryBindNull("@rating"); + } + + statement.TryBind("@played", userData.Played); + statement.TryBind("@playCount", userData.PlayCount); + statement.TryBind("@isFavorite", userData.IsFavorite); + statement.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks); + + if (userData.LastPlayedDate.HasValue) + { + statement.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue()); + } + else + { + statement.TryBindNull("@lastPlayedDate"); + } + + if (userData.AudioStreamIndex.HasValue) + { + statement.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value); + } + else + { + statement.TryBindNull("@AudioStreamIndex"); + } + + if (userData.SubtitleStreamIndex.HasValue) + { + statement.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value); + } + else + { + statement.TryBindNull("@SubtitleStreamIndex"); + } + + statement.MoveNext(); + } + } + + /// + /// Persist all user data for the specified user + /// + private async Task PersistAllUserData(Guid userId, List userDataList, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + _connection.RunInTransaction(db => + { + foreach (var userItemData in userDataList) + { + SaveUserData(db, userId, userItemData.Key, userItemData); + } + }); + } + } + + /// + /// Gets the user data. + /// + /// The user id. + /// The key. + /// Task{UserItemData}. + /// + /// userId + /// or + /// key + /// + public UserItemData GetUserData(Guid userId, string key) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (string.IsNullOrEmpty(key)) + { + throw new ArgumentNullException("key"); + } + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) + { + statement.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@Key", key); + + foreach (var row in statement.ExecuteQuery()) + { + return ReadRow(row); + } + } + } + + return null; + } + + public UserItemData GetUserData(Guid userId, List keys) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + if (keys == null) + { + throw new ArgumentNullException("keys"); + } + + if (keys.Count == 0) + { + return null; + } + + return GetUserData(userId, keys[0]); + } + + /// + /// Return all user-data associated with the given user + /// + /// + /// + public IEnumerable GetAllUserData(Guid userId) + { + if (userId == Guid.Empty) + { + throw new ArgumentNullException("userId"); + } + + var list = new List(); + + using (WriteLock.Write()) + { + using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) + { + statement.TryBind("@UserId", userId.ToGuidParamValue()); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(ReadRow(row)); + } + } + } + + return list; + } + + /// + /// Read a row from the specified reader into the provided userData object + /// + /// + private UserItemData ReadRow(IReadOnlyList reader) + { + var userData = new UserItemData(); + + userData.Key = reader[0].ToString(); + userData.UserId = reader[1].ReadGuid(); + + if (reader[2].SQLiteType != SQLiteType.Null) + { + userData.Rating = reader[2].ToDouble(); + } + + userData.Played = reader[3].ToBool(); + userData.PlayCount = reader[4].ToInt(); + userData.IsFavorite = reader[5].ToBool(); + userData.PlaybackPositionTicks = reader[6].ToInt64(); + + if (reader[7].SQLiteType != SQLiteType.Null) + { + userData.LastPlayedDate = reader[7].ReadDateTime(); + } + + if (reader[8].SQLiteType != SQLiteType.Null) + { + userData.AudioStreamIndex = reader[8].ToInt(); + } + + if (reader[9].SQLiteType != SQLiteType.Null) + { + userData.SubtitleStreamIndex = reader[9].ToInt(); + } + + return userData; + } + + protected override void Dispose(bool dispose) + { + // handled by library database + } + + protected override void CloseConnection() + { + // handled by library database + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs index 0de048865..7a822e7b4 100644 --- a/MediaBrowser.Controller/Persistence/IItemRepository.cs +++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs @@ -147,7 +147,7 @@ namespace MediaBrowser.Controller.Persistence /// /// The query. /// QueryResult<Tuple<Guid, System.String>>. - QueryResult> GetItemIdsWithPath(InternalItemsQuery query); + List> GetItemIdsWithPath(InternalItemsQuery query); /// /// Gets the item list. diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index a0dc59cef..13d67ace5 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -98,9 +98,6 @@ - - ..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll - @@ -108,14 +105,10 @@ - - Native\SqliteExtensions.cs - Properties\SharedVersion.cs - diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs index d864c47d6..f317997f8 100644 --- a/MediaBrowser.Server.Mono/MonoAppHost.cs +++ b/MediaBrowser.Server.Mono/MonoAppHost.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Reflection; using Emby.Server.Core; -using Emby.Server.Core.Data; using Emby.Server.Implementations; using Emby.Server.Implementations.FFMpeg; using MediaBrowser.IsoMounter; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; -using MediaBrowser.Server.Mono.Native; namespace MediaBrowser.Server.Mono { @@ -123,11 +121,6 @@ namespace MediaBrowser.Server.Mono throw new NotImplementedException(); } - protected override IDbConnector GetDbConnector() - { - return new DbConnector(Logger); - } - protected override void ConfigureAutoRunInternal(bool autorun) { throw new NotImplementedException(); diff --git a/MediaBrowser.Server.Mono/Native/DbConnector.cs b/MediaBrowser.Server.Mono/Native/DbConnector.cs deleted file mode 100644 index f25955c91..000000000 --- a/MediaBrowser.Server.Mono/Native/DbConnector.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Emby.Server.Core.Data; -using MediaBrowser.Model.Logging; - -namespace MediaBrowser.Server.Mono.Native -{ - public class DbConnector : IDbConnector - { - private readonly ILogger _logger; - - public DbConnector(ILogger logger) - { - _logger = logger; - } - - public Task Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null) - { - return SqliteExtensions.ConnectToDb(dbPath, isReadOnly, enablePooling, cacheSize, _logger); - } - } -} \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 0826dc225..9e5de25e4 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -102,10 +102,6 @@ - - False - ..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll - @@ -121,9 +117,6 @@ - - Native\SqliteExtensions.cs - Properties\SharedVersion.cs @@ -141,7 +134,6 @@ - diff --git a/MediaBrowser.ServerApplication/Native/DbConnector.cs b/MediaBrowser.ServerApplication/Native/DbConnector.cs deleted file mode 100644 index 986bc1850..000000000 --- a/MediaBrowser.ServerApplication/Native/DbConnector.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Emby.Server.Core.Data; -using MediaBrowser.Model.Logging; - -namespace MediaBrowser.ServerApplication.Native -{ - public class DbConnector : IDbConnector - { - private readonly ILogger _logger; - - public DbConnector(ILogger logger) - { - _logger = logger; - } - - public Task Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null) - { - return SqliteExtensions.ConnectToDb(dbPath, isReadOnly, enablePooling, cacheSize, _logger); - } - } -} \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs index 937762ed0..e36287584 100644 --- a/MediaBrowser.ServerApplication/WindowsAppHost.cs +++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.IO; using System.Reflection; using Emby.Server.Core; -using Emby.Server.Core.Data; using Emby.Server.Implementations; using Emby.Server.Implementations.EntryPoints; using Emby.Server.Implementations.FFMpeg; @@ -92,11 +91,6 @@ namespace MediaBrowser.ServerApplication ConfigurationManager.CommonApplicationPaths.TempDirectory); } - protected override IDbConnector GetDbConnector() - { - return new DbConnector(Logger); - } - protected override void ConfigureAutoRunInternal(bool autorun) { var shortcutPath = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk"); -- cgit v1.2.3 From 1dc080df8ba5b9af9245788634d56cb155afd2ba Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Nov 2016 22:52:58 -0500 Subject: update connections --- .../Activity/ActivityRepository.cs | 16 +- .../Data/BaseSqliteRepository.cs | 58 +- .../Data/SqliteDisplayPreferencesRepository.cs | 26 +- .../Data/SqliteExtensions.cs | 10 +- .../Data/SqliteFileOrganizationRepository.cs | 8 + .../Data/SqliteItemRepository.cs | 799 +++++++++++---------- .../Data/SqliteUserDataRepository.cs | 99 +-- .../Data/SqliteUserRepository.cs | 20 +- .../Notifications/SqliteNotificationsRepository.cs | 25 +- .../Security/AuthenticationRepository.cs | 55 +- .../Social/SharingRepository.cs | 16 +- Emby.Server.Implementations/Sync/SyncRepository.cs | 76 +- 12 files changed, 672 insertions(+), 536 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index d730e420a..8a7573d66 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -27,6 +27,14 @@ namespace Emby.Server.Implementations.Activity { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)", @@ -51,9 +59,9 @@ namespace Emby.Server.Implementations.Activity throw new ArgumentNullException("entry"); } - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -79,9 +87,9 @@ namespace Emby.Server.Implementations.Activity public QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseActivitySelectText; var whereClauses = new List(); diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index c506411d4..382c7f245 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -30,11 +30,6 @@ namespace Emby.Server.Implementations.Data get { return false; } } - protected virtual bool EnableConnectionPooling - { - get { return true; } - } - static BaseSqliteRepository() { SQLite3.EnableSharedCache = false; @@ -45,7 +40,7 @@ namespace Emby.Server.Implementations.Data private static bool _versionLogged; - protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false) + protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action onConnect = null) { if (!_versionLogged) { @@ -56,7 +51,7 @@ namespace Emby.Server.Implementations.Data ConnectionFlags connectionFlags; - //isReadOnly = false; + isReadOnly = false; if (isReadOnly) { @@ -70,46 +65,40 @@ namespace Emby.Server.Implementations.Data connectionFlags |= ConnectionFlags.ReadWrite; } - if (EnableConnectionPooling) - { - connectionFlags |= ConnectionFlags.SharedCached; - } - else - { - connectionFlags |= ConnectionFlags.PrivateCache; - } - + connectionFlags |= ConnectionFlags.SharedCached; connectionFlags |= ConnectionFlags.NoMutex; var db = SQLite3.Open(DbFilePath, connectionFlags, null); var queries = new List { - "pragma default_temp_store = memory", + "pragma temp_store = memory", "PRAGMA page_size=4096", "PRAGMA journal_mode=WAL", - "PRAGMA temp_store=memory", - "PRAGMA synchronous=Normal", + "pragma synchronous=Normal", //"PRAGMA cache size=-10000" }; - var cacheSize = CacheSize; - if (cacheSize.HasValue) - { + //var cacheSize = CacheSize; + //if (cacheSize.HasValue) + //{ - } + //} - if (EnableExclusiveMode) - { - queries.Add("PRAGMA locking_mode=EXCLUSIVE"); - } + ////foreach (var query in queries) + ////{ + //// db.Execute(query); + ////} - //foreach (var query in queries) - //{ - // db.Execute(query); - //} + using (WriteLock.Write()) + { + db.ExecuteAll(string.Join(";", queries.ToArray())); - db.ExecuteAll(string.Join(";", queries.ToArray())); + if (onConnect != null) + { + onConnect(db); + } + } return db; } @@ -122,11 +111,6 @@ namespace Emby.Server.Implementations.Data } } - protected virtual bool EnableExclusiveMode - { - get { return false; } - } - internal static void CheckOk(int rc) { string msg = ""; diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 184caa4d4..ab927ce86 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -54,9 +54,17 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { - "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)", + "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)", "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)" }; @@ -86,9 +94,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -130,9 +138,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -162,9 +170,9 @@ namespace Emby.Server.Implementations.Data var guidId = displayPreferencesId.GetMD5(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client")) { @@ -196,9 +204,9 @@ namespace Emby.Server.Implementations.Data { var list = new List(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId")) { diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index e4e91626d..5b2549087 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -131,11 +131,13 @@ namespace Emby.Server.Implementations.Data public static void Attach(IDatabaseConnection db, string path, string alias) { - var commandText = string.Format("attach ? as {0};", alias); - var paramList = new List(); - paramList.Add(path); + var commandText = string.Format("attach @path as {0};", alias); - db.Execute(commandText, paramList.ToArray()); + using (var statement = db.PrepareStatement(commandText)) + { + statement.TryBind("@path", path); + statement.MoveNext(); + } } public static bool IsDBNull(this IReadOnlyList result, int index) diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index 96edc5d0d..a71682329 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -31,6 +31,14 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + 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)", diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index c720a8d89..754af9640 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -127,10 +127,19 @@ namespace Emby.Server.Implementations.Data { _connection = CreateConnection(false); + _connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + var createMediaStreamsTableCommand = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; string[] queries = { + "PRAGMA locking_mode=NORMAL", "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)", @@ -344,25 +353,26 @@ namespace Emby.Server.Implementations.Data _connection.RunQueries(postQueries); - SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); - userDataRepo.Initialize(_connection, WriteLock); + //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); + userDataRepo.Initialize(WriteLock); //await Vacuum(_connection).ConfigureAwait(false); } - protected override bool EnableConnectionPooling - { - get - { - return false; - } - } - protected override bool EnableExclusiveMode + private SQLiteDatabaseConnection CreateConnection(bool readOnly, bool attachUserdata) { - get + Action onConnect = null; + + if (attachUserdata) { - return true; + onConnect = + c => SqliteExtensions.Attach(c, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), + "UserDataDb"); } + + var conn = CreateConnection(readOnly, onConnect); + + return conn; } private readonly string[] _retriveItemColumns = @@ -635,12 +645,15 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - _connection.RunInTransaction(db => + using (WriteLock.Write()) { - SaveItemsInTranscation(db, items); - }); + connection.RunInTransaction(db => + { + SaveItemsInTranscation(db, items); + }); + } } } @@ -1170,15 +1183,18 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) + using (WriteLock.Read()) { - statement.TryBind("@guid", id); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) { - return GetItem(row); + statement.TryBind("@guid", id); + + foreach (var row in statement.ExecuteQuery()) + { + return GetItem(row); + } } } } @@ -1976,15 +1992,18 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) + using (WriteLock.Read()) { - statement.TryBind("@ItemId", id); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) { - list.Add(GetChapter(row)); + statement.TryBind("@ItemId", id); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetChapter(row)); + } } } } @@ -2007,16 +2026,19 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex")) + using (WriteLock.Read()) { - statement.TryBind("@ItemId", id); - statement.TryBind("@ChapterIndex", index); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex")) { - return GetChapter(row); + statement.TryBind("@ItemId", id); + statement.TryBind("@ChapterIndex", index); + + foreach (var row in statement.ExecuteQuery()) + { + return GetChapter(row); + } } } } @@ -2085,35 +2107,38 @@ namespace Emby.Server.Implementations.Data var index = 0; - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - _connection.RunInTransaction(db => + using (WriteLock.Write()) { - // First delete chapters - _connection.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue()); - - using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)")) + connection.RunInTransaction(db => { - foreach (var chapter in chapters) + // First delete chapters + db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue()); + + using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)")) { - if (index > 0) + foreach (var chapter in chapters) { - saveChapterStatement.Reset(); - } + if (index > 0) + { + saveChapterStatement.Reset(); + } - saveChapterStatement.TryBind("@ItemId", id.ToGuidParamValue()); - saveChapterStatement.TryBind("@ChapterIndex", index); - saveChapterStatement.TryBind("@StartPositionTicks", chapter.StartPositionTicks); - saveChapterStatement.TryBind("@Name", chapter.Name); - saveChapterStatement.TryBind("@ImagePath", chapter.ImagePath); - saveChapterStatement.TryBind("@ImageDateModified", chapter.ImageDateModified); + saveChapterStatement.TryBind("@ItemId", id.ToGuidParamValue()); + saveChapterStatement.TryBind("@ChapterIndex", index); + saveChapterStatement.TryBind("@StartPositionTicks", chapter.StartPositionTicks); + saveChapterStatement.TryBind("@Name", chapter.Name); + saveChapterStatement.TryBind("@ImagePath", chapter.ImagePath); + saveChapterStatement.TryBind("@ImageDateModified", chapter.ImageDateModified); - saveChapterStatement.MoveNext(); + saveChapterStatement.MoveNext(); - index++; + index++; + } } - } - }); + }); + } } } @@ -2383,31 +2408,34 @@ namespace Emby.Server.Implementations.Data } } - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row, query); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - list.Add(item); + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } } } - } - LogQueryTime("GetItemList", commandText, now); + LogQueryTime("GetItemList", commandText, now); + } } // Hack for right now since we currently don't support filtering out these duplicates within a query @@ -2548,72 +2576,75 @@ namespace Emby.Server.Implementations.Data } } - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - var totalRecordCount = 0; - var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - - if (!isReturningZeroItems) + using (WriteLock.Read()) { - using (var statement = _connection.PrepareStatement(commandText)) + var totalRecordCount = 0; + var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; + + if (!isReturningZeroItems) { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row, query); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - list.Add(item); + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } } } } - } - commandText = string.Empty; + commandText = string.Empty; - if (EnableGroupByPresentationUniqueKey(query)) - { - commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); - } - else - { - commandText += " select count (guid)" + GetFromText(); - } + if (EnableGroupByPresentationUniqueKey(query)) + { + commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); + } + else + { + commandText += " select count (guid)" + GetFromText(); + } - commandText += GetJoinUserDataText(query); - commandText += whereTextWithoutPaging; + commandText += GetJoinUserDataText(query); + commandText += whereTextWithoutPaging; - using (var statement = _connection.PrepareStatement(commandText)) - { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); - } + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } - LogQueryTime("GetItems", commandText, now); + LogQueryTime("GetItems", commandText, now); - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = totalRecordCount - }; + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = totalRecordCount + }; + } } } @@ -2774,29 +2805,32 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row[0].ReadGuid()); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } } - } - LogQueryTime("GetItemList", commandText, now); + LogQueryTime("GetItemList", commandText, now); - return list; + return list; + } } } @@ -2842,34 +2876,37 @@ namespace Emby.Server.Implementations.Data var list = new List>(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } - - // Running this again will bind the params - GetWhereClauses(query, statement); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - foreach (var row in statement.ExecuteQuery()) - { - var id = row.GetGuid(0); - string path = null; + // Running this again will bind the params + GetWhereClauses(query, statement); - if (!row.IsDBNull(1)) + foreach (var row in statement.ExecuteQuery()) { - path = row.GetString(1); + var id = row.GetGuid(0); + string path = null; + + if (!row.IsDBNull(1)) + { + path = row.GetString(1); + } + list.Add(new Tuple(id, path)); } - list.Add(new Tuple(id, path)); } - } - LogQueryTime("GetItemIdsWithPath", commandText, now); + LogQueryTime("GetItemIdsWithPath", commandText, now); - return list; + return list; + } } } @@ -2928,64 +2965,67 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - var totalRecordCount = 0; - - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - if (EnableJoinUserData(query)) + var totalRecordCount = 0; + + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row[0].ReadGuid()); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } } - } - commandText = string.Empty; + commandText = string.Empty; - if (EnableGroupByPresentationUniqueKey(query)) - { - commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); - } - else - { - commandText += " select count (guid)" + GetFromText(); - } + if (EnableGroupByPresentationUniqueKey(query)) + { + commandText += " select count (distinct PresentationUniqueKey)" + GetFromText(); + } + else + { + commandText += " select count (guid)" + GetFromText(); + } - commandText += GetJoinUserDataText(query); - commandText += whereTextWithoutPaging; + commandText += GetJoinUserDataText(query); + commandText += whereTextWithoutPaging; - using (var statement = _connection.PrepareStatement(commandText)) - { - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); - } + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } - LogQueryTime("GetItemIds", commandText, now); + LogQueryTime("GetItemIds", commandText, now); - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = totalRecordCount - }; + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = totalRecordCount + }; + } } } @@ -4289,33 +4329,36 @@ namespace Emby.Server.Implementations.Data var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - foreach (var row in _connection.Query(commandText)) + using (WriteLock.Write()) { - var id = row.GetGuid(0); - string value = row.IsDBNull(2) ? null : row.GetString(2); + foreach (var row in connection.Query(commandText)) + { + var id = row.GetGuid(0); + string value = row.IsDBNull(2) ? null : row.GetString(2); - newValues.Add(new Tuple(id, value)); - } + newValues.Add(new Tuple(id, value)); + } - Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count); - if (newValues.Count == 0) - { - return; - } + Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count); + if (newValues.Count == 0) + { + return; + } - // write lock here - using (var statement = _connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid")) - { - foreach (var item in newValues) + // write lock here + using (var statement = connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid")) { - var paramList = new List(); + foreach (var item in newValues) + { + var paramList = new List(); - paramList.Add(item.Item1); - paramList.Add(item.Item2); + paramList.Add(item.Item1); + paramList.Add(item.Item2); - statement.Execute(paramList.ToArray()); + statement.Execute(paramList.ToArray()); + } } } } @@ -4360,28 +4403,31 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - _connection.RunInTransaction(db => + using (WriteLock.Write()) { - // Delete people - ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue()); + connection.RunInTransaction(db => + { + // Delete people + ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue()); - // Delete chapters - ExecuteWithSingleParam(db, "delete from " + ChaptersTableName + " where ItemId=@Id", id.ToGuidParamValue()); + // Delete chapters + ExecuteWithSingleParam(db, "delete from " + ChaptersTableName + " where ItemId=@Id", id.ToGuidParamValue()); - // Delete media streams - ExecuteWithSingleParam(db, "delete from mediastreams where ItemId=@Id", id.ToGuidParamValue()); + // Delete media streams + ExecuteWithSingleParam(db, "delete from mediastreams where ItemId=@Id", id.ToGuidParamValue()); - // Delete ancestors - ExecuteWithSingleParam(db, "delete from AncestorIds where ItemId=@Id", id.ToGuidParamValue()); + // Delete ancestors + ExecuteWithSingleParam(db, "delete from AncestorIds where ItemId=@Id", id.ToGuidParamValue()); - // Delete item values - ExecuteWithSingleParam(db, "delete from ItemValues where ItemId=@Id", id.ToGuidParamValue()); + // Delete item values + ExecuteWithSingleParam(db, "delete from ItemValues where ItemId=@Id", id.ToGuidParamValue()); - // Delete the item - ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue()); - }); + // Delete the item + ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue()); + }); + } } } @@ -4417,19 +4463,22 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement(commandText)) { - list.Add(row.GetString(0)); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row.GetString(0)); + } } + return list; } - return list; } } @@ -4455,16 +4504,19 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement(commandText)) { - list.Add(GetPerson(row)); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetPerson(row)); + } } } } @@ -4667,13 +4719,16 @@ namespace Emby.Server.Implementations.Data commandText += " Group By CleanValue"; - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - foreach (var row in _connection.Query(commandText)) + using (WriteLock.Write()) { - if (!row.IsDBNull(0)) + foreach (var row in connection.Query(commandText)) { - list.Add(row.GetString(0)); + if (!row.IsDBNull(0)) + { + list.Add(row.GetString(0)); + } } } } @@ -4825,67 +4880,70 @@ namespace Emby.Server.Implementations.Data var list = new List>(); var count = 0; - using (WriteLock.Write()) + using (var connection = CreateConnection(true, EnableJoinUserData(query))) { - if (!isReturningZeroItems) + using (WriteLock.Read()) { - using (var statement = _connection.PrepareStatement(commandText)) + if (!isReturningZeroItems) { - statement.TryBind("@SelectType", returnType); - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - if (typeSubQuery != null) - { - GetWhereClauses(typeSubQuery, null, "itemTypes"); - } - BindSimilarParams(query, statement); - GetWhereClauses(innerQuery, statement); - GetWhereClauses(outerQuery, statement); + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - var countStartColumn = columns.Count - 1; + var item = GetItem(row); + if (item != null) + { + var countStartColumn = columns.Count - 1; - list.Add(new Tuple(item, GetItemCounts(row, countStartColumn, typesToCount))); + list.Add(new Tuple(item, GetItemCounts(row, countStartColumn, typesToCount))); + } } - } - LogQueryTime("GetItemValues", commandText, now); + LogQueryTime("GetItemValues", commandText, now); + } } - } - if (query.EnableTotalRecordCount) - { - commandText = "select count (distinct PresentationUniqueKey)" + GetFromText(); + if (query.EnableTotalRecordCount) + { + commandText = "select count (distinct PresentationUniqueKey)" + GetFromText(); - commandText += GetJoinUserDataText(query); - commandText += whereText; + commandText += GetJoinUserDataText(query); + commandText += whereText; - using (var statement = _connection.PrepareStatement(commandText)) - { - statement.TryBind("@SelectType", returnType); - if (EnableJoinUserData(query)) + using (var statement = connection.PrepareStatement(commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - if (typeSubQuery != null) - { - GetWhereClauses(typeSubQuery, null, "itemTypes"); - } - BindSimilarParams(query, statement); - GetWhereClauses(innerQuery, statement); - GetWhereClauses(outerQuery, statement); + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); - count = statement.ExecuteQuery().SelectScalarInt().First(); + count = statement.ExecuteQuery().SelectScalarInt().First(); - LogQueryTime("GetItemValues", commandText, now); + LogQueryTime("GetItemValues", commandText, now); + } } } } @@ -5043,33 +5101,35 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - // First delete - // "delete from People where ItemId=?" - _connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue()); + using (WriteLock.Write()) + { // First delete + // "delete from People where ItemId=?" + connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue()); - var listIndex = 0; + var listIndex = 0; - using (var statement = _connection.PrepareStatement( - "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)")) - { - foreach (var person in people) + using (var statement = connection.PrepareStatement( + "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)")) { - if (listIndex > 0) + foreach (var person in people) { - statement.Reset(); - } + if (listIndex > 0) + { + statement.Reset(); + } - statement.TryBind("@ItemId", itemId.ToGuidParamValue()); - statement.TryBind("@Name", person.Name); - statement.TryBind("@Role", person.Role); - statement.TryBind("@PersonType", person.Type); - statement.TryBind("@SortOrder", person.SortOrder); - statement.TryBind("@ListOrder", listIndex); + statement.TryBind("@ItemId", itemId.ToGuidParamValue()); + statement.TryBind("@Name", person.Name); + statement.TryBind("@Role", person.Role); + statement.TryBind("@PersonType", person.Type); + statement.TryBind("@SortOrder", person.SortOrder); + statement.TryBind("@ListOrder", listIndex); - statement.MoveNext(); - listIndex++; + statement.MoveNext(); + listIndex++; + } } } } @@ -5127,25 +5187,28 @@ namespace Emby.Server.Implementations.Data cmdText += " order by StreamIndex ASC"; - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement(cmdText)) + using (WriteLock.Read()) { - statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - - if (query.Type.HasValue) + using (var statement = connection.PrepareStatement(cmdText)) { - statement.TryBind("@StreamType", query.Type.Value.ToString()); - } + statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - if (query.Index.HasValue) - { - statement.TryBind("@StreamIndex", query.Index.Value); - } + if (query.Type.HasValue) + { + statement.TryBind("@StreamType", query.Type.Value.ToString()); + } - foreach (var row in statement.ExecuteQuery()) - { - list.Add(GetMediaStream(row)); + if (query.Index.HasValue) + { + statement.TryBind("@StreamIndex", query.Index.Value); + } + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetMediaStream(row)); + } } } } @@ -5169,58 +5232,60 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - // First delete chapters - _connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue()); + using (WriteLock.Write()) + { // First delete chapters + connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue()); - using (var statement = _connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})", - string.Join(",", _mediaStreamSaveColumns), - string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())))) - { - foreach (var stream in streams) + using (var statement = connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})", + string.Join(",", _mediaStreamSaveColumns), + string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())))) { - var paramList = new List(); - - paramList.Add(id.ToGuidParamValue()); - paramList.Add(stream.Index); - paramList.Add(stream.Type.ToString()); - paramList.Add(stream.Codec); - paramList.Add(stream.Language); - paramList.Add(stream.ChannelLayout); - paramList.Add(stream.Profile); - paramList.Add(stream.AspectRatio); - paramList.Add(stream.Path); - - paramList.Add(stream.IsInterlaced); - paramList.Add(stream.BitRate); - paramList.Add(stream.Channels); - paramList.Add(stream.SampleRate); - - paramList.Add(stream.IsDefault); - paramList.Add(stream.IsForced); - paramList.Add(stream.IsExternal); - - paramList.Add(stream.Width); - paramList.Add(stream.Height); - paramList.Add(stream.AverageFrameRate); - paramList.Add(stream.RealFrameRate); - paramList.Add(stream.Level); - paramList.Add(stream.PixelFormat); - paramList.Add(stream.BitDepth); - paramList.Add(stream.IsExternal); - paramList.Add(stream.RefFrames); - - paramList.Add(stream.CodecTag); - paramList.Add(stream.Comment); - paramList.Add(stream.NalLengthSize); - paramList.Add(stream.IsAVC); - paramList.Add(stream.Title); - - paramList.Add(stream.TimeBase); - paramList.Add(stream.CodecTimeBase); - - statement.Execute(paramList.ToArray()); + foreach (var stream in streams) + { + var paramList = new List(); + + paramList.Add(id.ToGuidParamValue()); + paramList.Add(stream.Index); + paramList.Add(stream.Type.ToString()); + paramList.Add(stream.Codec); + paramList.Add(stream.Language); + paramList.Add(stream.ChannelLayout); + paramList.Add(stream.Profile); + paramList.Add(stream.AspectRatio); + paramList.Add(stream.Path); + + paramList.Add(stream.IsInterlaced); + paramList.Add(stream.BitRate); + paramList.Add(stream.Channels); + paramList.Add(stream.SampleRate); + + paramList.Add(stream.IsDefault); + paramList.Add(stream.IsForced); + paramList.Add(stream.IsExternal); + + paramList.Add(stream.Width); + paramList.Add(stream.Height); + paramList.Add(stream.AverageFrameRate); + paramList.Add(stream.RealFrameRate); + paramList.Add(stream.Level); + paramList.Add(stream.PixelFormat); + paramList.Add(stream.BitDepth); + paramList.Add(stream.IsExternal); + paramList.Add(stream.RefFrames); + + paramList.Add(stream.CodecTag); + paramList.Add(stream.Comment); + paramList.Add(stream.NalLengthSize); + paramList.Add(stream.IsAVC); + paramList.Add(stream.Title); + + paramList.Add(stream.TimeBase); + paramList.Add(stream.CodecTimeBase); + + statement.Execute(paramList.ToArray()); + } } } } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index a66536179..0b4768c14 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -14,19 +14,12 @@ namespace Emby.Server.Implementations.Data { public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository { - private SQLiteDatabaseConnection _connection; - public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) : base(logger) { DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); } - protected override bool EnableConnectionPooling - { - get { return false; } - } - /// /// Gets the name of the repository /// @@ -43,13 +36,24 @@ namespace Emby.Server.Implementations.Data /// Opens the connection to the database /// /// Task. - public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock) + public void Initialize(ReaderWriterLockSlim writeLock) { WriteLock.Dispose(); WriteLock = writeLock; - _connection = connection; - string[] queries = { + using (var connection = CreateConnection()) + { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + + string[] queries = { + + "PRAGMA locking_mode=NORMAL", "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", @@ -69,15 +73,16 @@ namespace Emby.Server.Implementations.Data "pragma shrink_memory" }; - _connection.RunQueries(queries); + connection.RunQueries(queries); - connection.RunInTransaction(db => - { - var existingColumnNames = GetColumnNames(db, "userdata"); + connection.RunInTransaction(db => + { + var existingColumnNames = GetColumnNames(db, "userdata"); - AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); - AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); - }); + AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); + AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); + }); + } } /// @@ -139,18 +144,21 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - _connection.RunInTransaction(db => + using (WriteLock.Write()) { - SaveUserData(db, userId, key, userData); - }); + connection.RunInTransaction(db => + { + SaveUserData(db, userId, key, userData); + }); + } } } private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData) { - using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) + using (var statement = db.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) { statement.TryBind("@UserId", userId.ToGuidParamValue()); statement.TryBind("@Key", key); @@ -207,15 +215,18 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - _connection.RunInTransaction(db => + using (WriteLock.Write()) { - foreach (var userItemData in userDataList) + connection.RunInTransaction(db => { - SaveUserData(db, userId, userItemData.Key, userItemData); - } - }); + foreach (var userItemData in userDataList) + { + SaveUserData(db, userId, userItemData.Key, userItemData); + } + }); + } } } @@ -241,16 +252,19 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("key"); } - using (WriteLock.Write()) + using (var connection = CreateConnection(true)) { - using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) + using (WriteLock.Read()) { - statement.TryBind("@UserId", userId.ToGuidParamValue()); - statement.TryBind("@Key", key); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) { - return ReadRow(row); + statement.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@Key", key); + + foreach (var row in statement.ExecuteQuery()) + { + return ReadRow(row); + } } } } @@ -291,15 +305,18 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) + using (WriteLock.Read()) { - statement.TryBind("@UserId", userId.ToGuidParamValue()); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) { - list.Add(ReadRow(row)); + statement.TryBind("@UserId", userId.ToGuidParamValue()); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(ReadRow(row)); + } } } } diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index 5e148d95a..0a2f9e7cd 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -50,6 +50,14 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { "create table if not exists users (guid GUID primary key, data BLOB)", @@ -83,9 +91,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -108,9 +116,9 @@ namespace Emby.Server.Implementations.Data { var list = new List(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { foreach (var row in connection.Query("select guid,data from users")) { @@ -146,9 +154,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 5a3b64dbb..5fc691527 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -29,7 +29,16 @@ namespace Emby.Server.Implementations.Notifications { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { + "create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT NULL, Url TEXT NULL, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT NULL, PRIMARY KEY (Id, UserId))", "create index if not exists idx_Notifications1 on Notifications(Id)", "create index if not exists idx_Notifications2 on Notifications(UserId)" @@ -103,9 +112,9 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationsSummary(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { @@ -220,9 +229,9 @@ namespace Emby.Server.Implementations.Notifications cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(conn => { @@ -283,9 +292,9 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(conn => { @@ -305,9 +314,9 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(conn => { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index a9141f153..0a598e9a7 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -30,9 +30,17 @@ namespace Emby.Server.Implementations.Security { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { - "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)", + "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)", "create index if not exists idx_AccessTokens on AccessTokens(Id)" }; @@ -63,9 +71,9 @@ namespace Emby.Server.Implementations.Security cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -200,28 +208,31 @@ namespace Emby.Server.Implementations.Security var list = new List(); - using (var statement = connection.PrepareStatement(commandText)) + using (WriteLock.Read()) { - BindAuthenticationQueryParams(query, statement); - - foreach (var row in statement.ExecuteQuery()) - { - list.Add(Get(row)); - } - - using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging)) + using (var statement = connection.PrepareStatement(commandText)) { - BindAuthenticationQueryParams(query, totalCountStatement); + BindAuthenticationQueryParams(query, statement); - var count = totalCountStatement.ExecuteQuery() - .SelectScalarInt() - .First(); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(Get(row)); + } - return new QueryResult() + using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging)) { - Items = list.ToArray(), - TotalRecordCount = count - }; + BindAuthenticationQueryParams(query, totalCountStatement); + + var count = totalCountStatement.ExecuteQuery() + .SelectScalarInt() + .First(); + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = count + }; + } } } } @@ -234,9 +245,9 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("id"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseSelectText + " where Id=@Id"; diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index 9065ee108..e0ee62780 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -27,6 +27,14 @@ namespace Emby.Server.Implementations.Social { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { "create table if not exists Shares (Id GUID, ItemId TEXT, UserId TEXT, ExpirationDate DateTime, PRIMARY KEY (Id))", @@ -50,9 +58,9 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("info.Id"); } - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -75,9 +83,9 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("id"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = ?"; diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index 6fb918f15..36558142b 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -43,6 +43,14 @@ namespace Emby.Server.Implementations.Sync { using (var connection = CreateConnection()) { + connection.ExecuteAll(string.Join(";", new[] + { + "pragma default_temp_store = memory", + "pragma default_synchronous=Normal", + "pragma temp_store = memory", + "pragma synchronous=Normal", + })); + string[] queries = { "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)", @@ -95,9 +103,9 @@ namespace Emby.Server.Implementations.Sync throw new ArgumentNullException("id"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseJobSelectText + " where Id=?"; var paramList = new List(); @@ -206,9 +214,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { string commandText; var paramList = new List(); @@ -259,9 +267,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(conn => { @@ -281,9 +289,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseJobSelectText; var paramList = new List(); @@ -379,11 +387,11 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (WriteLock.Read()) - { - var guid = new Guid(id); + var guid = new Guid(id); - using (var connection = CreateConnection(true)) + using (var connection = CreateConnection(true)) + { + using (WriteLock.Read()) { var commandText = BaseJobItemSelectText + " where Id=?"; var paramList = new List(); @@ -407,9 +415,9 @@ namespace Emby.Server.Implementations.Sync throw new ArgumentNullException("query"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = baseSelectText; var paramList = new List(); @@ -487,30 +495,30 @@ namespace Emby.Server.Implementations.Sync var now = DateTime.UtcNow; - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) - { - var commandText = "select ItemId,Status,Progress from SyncJobItems"; - var whereClauses = new List(); + var commandText = "select ItemId,Status,Progress from SyncJobItems"; + var whereClauses = new List(); - if (!string.IsNullOrWhiteSpace(query.TargetId)) - { - whereClauses.Add("TargetId=@TargetId"); - } + if (!string.IsNullOrWhiteSpace(query.TargetId)) + { + whereClauses.Add("TargetId=@TargetId"); + } - if (query.Statuses.Length > 0) - { - var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); + if (query.Statuses.Length > 0) + { + var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); - whereClauses.Add(string.Format("Status in ({0})", statuses)); - } + whereClauses.Add(string.Format("Status in ({0})", statuses)); + } - if (whereClauses.Count > 0) - { - commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + using (WriteLock.Read()) + { using (var statement = connection.PrepareStatement(commandText)) { if (!string.IsNullOrWhiteSpace(query.TargetId)) @@ -664,9 +672,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { string commandText; -- cgit v1.2.3 From f275d7f3d2f40f5e4cbe2f97df6dbd9be8ec37fe Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 21 Nov 2016 03:54:53 -0500 Subject: reduce library queries --- .../EnvironmentInfo/EnvironmentInfo.cs | 5 ++ Emby.Server.Core/ApplicationHost.cs | 2 +- .../Activity/ActivityRepository.cs | 5 +- .../Data/BaseSqliteRepository.cs | 37 +++++++-- .../Data/SqliteDisplayPreferencesRepository.cs | 5 +- .../Data/SqliteFileOrganizationRepository.cs | 5 +- .../Data/SqliteItemRepository.cs | 96 +++++++++++----------- .../Data/SqliteUserDataRepository.cs | 5 +- .../Data/SqliteUserRepository.cs | 5 +- Emby.Server.Implementations/Dto/DtoService.cs | 16 +++- .../Library/LibraryManager.cs | 31 +++---- .../Library/UserViewManager.cs | 30 ++++--- .../LiveTv/LiveTvManager.cs | 2 +- .../Notifications/SqliteNotificationsRepository.cs | 11 ++- .../Security/AuthenticationRepository.cs | 5 +- .../Social/SharingRepository.cs | 5 +- Emby.Server.Implementations/Sync/SyncRepository.cs | 5 +- Emby.Server.Implementations/TV/TVSeriesManager.cs | 4 +- MediaBrowser.Api/Library/LibraryService.cs | 2 +- MediaBrowser.Api/Movies/MoviesService.cs | 17 +--- MediaBrowser.Controller/Entities/Audio/Audio.cs | 6 ++ MediaBrowser.Controller/Entities/BaseItem.cs | 22 ++++- MediaBrowser.Controller/Entities/Folder.cs | 39 +++++---- .../Entities/InternalItemsQuery.cs | 1 - MediaBrowser.Controller/Entities/TV/Episode.cs | 6 ++ MediaBrowser.Controller/Entities/TV/Season.cs | 6 ++ MediaBrowser.Controller/Entities/TV/Series.cs | 1 - .../Entities/UserViewBuilder.cs | 10 +-- MediaBrowser.Controller/Library/ILibraryManager.cs | 5 +- MediaBrowser.Controller/TV/ITVSeriesManager.cs | 2 +- MediaBrowser.Model/System/IEnvironmentInfo.cs | 1 + MediaBrowser.Providers/Manager/MetadataService.cs | 14 ++-- 32 files changed, 230 insertions(+), 176 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index c040e3931..ebd596dc4 100644 --- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs +++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs @@ -105,5 +105,10 @@ namespace Emby.Common.Implementations.EnvironmentInfo { return null; } + + public string StackTrace + { + get { return Environment.StackTrace; } + } } } diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 55a851033..d48138080 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -551,7 +551,7 @@ namespace Emby.Server.Core DisplayPreferencesRepository = displayPreferencesRepo; RegisterSingleInstance(DisplayPreferencesRepository); - var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager); + var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo); ItemRepository = itemRepo; RegisterSingleInstance(ItemRepository); diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index 8a7573d66..eef9792de 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -29,10 +29,9 @@ namespace Emby.Server.Implementations.Activity { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 382c7f245..d4226ec25 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -40,6 +40,8 @@ namespace Emby.Server.Implementations.Data private static bool _versionLogged; + private string _defaultWal; + protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action onConnect = null) { if (!_versionLogged) @@ -51,6 +53,15 @@ namespace Emby.Server.Implementations.Data ConnectionFlags connectionFlags; + if (isReadOnly) + { + //Logger.Info("Opening read connection"); + } + else + { + //Logger.Info("Opening write connection"); + } + isReadOnly = false; if (isReadOnly) @@ -70,12 +81,16 @@ namespace Emby.Server.Implementations.Data var db = SQLite3.Open(DbFilePath, connectionFlags, null); + if (string.IsNullOrWhiteSpace(_defaultWal)) + { + _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First(); + } + var queries = new List { + "PRAGMA default_temp_store=memory", "pragma temp_store = memory", - "PRAGMA page_size=4096", - "PRAGMA journal_mode=WAL", - "pragma synchronous=Normal", + "PRAGMA journal_mode=WAL" //"PRAGMA cache size=-10000" }; @@ -90,13 +105,19 @@ namespace Emby.Server.Implementations.Data //// db.Execute(query); ////} - using (WriteLock.Write()) - { - db.ExecuteAll(string.Join(";", queries.ToArray())); + //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First()); + //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First()); - if (onConnect != null) + //if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase) || onConnect != null) + { + using (WriteLock.Write()) { - onConnect(db); + db.ExecuteAll(string.Join(";", queries.ToArray())); + + if (onConnect != null) + { + onConnect(db); + } } } diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index ab927ce86..17afbcfa9 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -56,10 +56,9 @@ namespace Emby.Server.Implementations.Data { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index a71682329..efc0ee2ed 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -33,10 +33,9 @@ namespace Emby.Server.Implementations.Data { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 754af9640..bc1eca06a 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -29,6 +29,7 @@ using MediaBrowser.Server.Implementations.Devices; using MediaBrowser.Server.Implementations.Playlists; using MediaBrowser.Model.Reflection; using SQLitePCL.pretty; +using MediaBrowser.Model.System; namespace Emby.Server.Implementations.Data { @@ -66,14 +67,14 @@ namespace Emby.Server.Implementations.Data private readonly string _criticReviewsPath; - public const int LatestSchemaVersion = 109; private readonly IMemoryStreamFactory _memoryStreamProvider; private readonly IFileSystem _fileSystem; + private readonly IEnvironmentInfo _environmentInfo; /// /// Initializes a new instance of the class. /// - public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem) + public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo) : base(logger) { if (config == null) @@ -89,6 +90,7 @@ namespace Emby.Server.Implementations.Data _jsonSerializer = jsonSerializer; _memoryStreamProvider = memoryStreamProvider; _fileSystem = fileSystem; + _environmentInfo = environmentInfo; _typeMapper = new TypeMapper(assemblyInfo); _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews"); @@ -129,10 +131,9 @@ namespace Emby.Server.Implementations.Data _connection.ExecuteAll(string.Join(";", new[] { - "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "PRAGMA page_size=4096", + "PRAGMA default_temp_store=memory", + "PRAGMA temp_store=memory" })); var createMediaStreamsTableCommand @@ -193,7 +194,6 @@ namespace Emby.Server.Implementations.Data AddColumn(db, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames); AddColumn(db, "TypedBaseItems", "ParentId", "GUID", existingColumnNames); AddColumn(db, "TypedBaseItems", "Genres", "Text", existingColumnNames); - AddColumn(db, "TypedBaseItems", "SchemaVersion", "INT", existingColumnNames); AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames); AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames); @@ -205,7 +205,6 @@ namespace Emby.Server.Implementations.Data AddColumn(db, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames); AddColumn(db, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames); - AddColumn(db, "TypedBaseItems", "IsOffline", "BIT", existingColumnNames); AddColumn(db, "TypedBaseItems", "LocationType", "Text", existingColumnNames); AddColumn(db, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames); @@ -381,7 +380,6 @@ namespace Emby.Server.Implementations.Data "data", "StartDate", "EndDate", - "IsOffline", "ChannelId", "IsMovie", "IsSports", @@ -529,7 +527,6 @@ namespace Emby.Server.Implementations.Data "ParentId", "Genres", "InheritedParentalRatingValue", - "SchemaVersion", "SortName", "RunTimeTicks", "OfficialRatingDescription", @@ -539,7 +536,6 @@ namespace Emby.Server.Implementations.Data "DateCreated", "DateModified", "ForcedSortName", - "IsOffline", "LocationType", "PreferredMetadataLanguage", "PreferredMetadataCountryCode", @@ -790,7 +786,6 @@ namespace Emby.Server.Implementations.Data } saveItemStatement.TryBind("@InheritedParentalRatingValue", item.GetInheritedParentalRatingValue() ?? 0); - saveItemStatement.TryBind("@SchemaVersion", LatestSchemaVersion); saveItemStatement.TryBind("@SortName", item.SortName); saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks); @@ -803,7 +798,6 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBind("@DateModified", item.DateModified); saveItemStatement.TryBind("@ForcedSortName", item.ForcedSortName); - saveItemStatement.TryBind("@IsOffline", item.IsOffline); saveItemStatement.TryBind("@LocationType", item.LocationType.ToString()); saveItemStatement.TryBind("@PreferredMetadataLanguage", item.PreferredMetadataLanguage); @@ -1182,7 +1176,7 @@ namespace Emby.Server.Implementations.Data } CheckDisposed(); - + //Logger.Info("Retrieving item {0}", id.ToString("N")); using (var connection = CreateConnection(true)) { using (WriteLock.Read()) @@ -1369,64 +1363,72 @@ namespace Emby.Server.Implementations.Data if (!reader.IsDBNull(4)) { - item.IsOffline = reader.GetBoolean(4); + item.ChannelId = reader.GetString(4); } - if (!reader.IsDBNull(5)) - { - item.ChannelId = reader.GetString(5); - } + var index = 5; var hasProgramAttributes = item as IHasProgramAttributes; if (hasProgramAttributes != null) { - if (!reader.IsDBNull(6)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsMovie = reader.GetBoolean(6); + hasProgramAttributes.IsMovie = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(7)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsSports = reader.GetBoolean(7); + hasProgramAttributes.IsSports = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(8)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsKids = reader.GetBoolean(8); + hasProgramAttributes.IsKids = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(9)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsSeries = reader.GetBoolean(9); + hasProgramAttributes.IsSeries = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(10)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsLive = reader.GetBoolean(10); + hasProgramAttributes.IsLive = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(11)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsNews = reader.GetBoolean(11); + hasProgramAttributes.IsNews = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(12)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsPremiere = reader.GetBoolean(12); + hasProgramAttributes.IsPremiere = reader.GetBoolean(index); } + index++; - if (!reader.IsDBNull(13)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.EpisodeTitle = reader.GetString(13); + hasProgramAttributes.EpisodeTitle = reader.GetString(index); } + index++; - if (!reader.IsDBNull(14)) + if (!reader.IsDBNull(index)) { - hasProgramAttributes.IsRepeat = reader.GetBoolean(14); + hasProgramAttributes.IsRepeat = reader.GetBoolean(index); } + index++; + } + else + { + index += 9; } - - var index = 15; if (!reader.IsDBNull(index)) { @@ -2368,6 +2370,8 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); + //Logger.Info("GetItemList: " + _environmentInfo.StackTrace); + var now = DateTime.UtcNow; var list = new List(); @@ -2533,6 +2537,7 @@ namespace Emby.Server.Implementations.Data TotalRecordCount = returnList.Count }; } + //Logger.Info("GetItems: " + _environmentInfo.StackTrace); var now = DateTime.UtcNow; @@ -2770,6 +2775,7 @@ namespace Emby.Server.Implementations.Data } CheckDisposed(); + //Logger.Info("GetItemIdsList: " + _environmentInfo.StackTrace); var now = DateTime.UtcNow; @@ -2928,6 +2934,7 @@ namespace Emby.Server.Implementations.Data TotalRecordCount = returnList.Count }; } + //Logger.Info("GetItemIds: " + _environmentInfo.StackTrace); var now = DateTime.UtcNow; @@ -3053,14 +3060,6 @@ namespace Emby.Server.Implementations.Data statement.TryBind("@IsLocked", query.IsLocked); } } - if (query.IsOffline.HasValue) - { - whereClauses.Add("IsOffline=@IsOffline"); - if (statement != null) - { - statement.TryBind("@IsOffline", query.IsOffline); - } - } var exclusiveProgramAttribtues = !(query.IsMovie ?? true) || !(query.IsSports ?? true) || @@ -4721,7 +4720,7 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection(true)) { - using (WriteLock.Write()) + using (WriteLock.Read()) { foreach (var row in connection.Query(commandText)) { @@ -4750,6 +4749,7 @@ namespace Emby.Server.Implementations.Data } CheckDisposed(); + //Logger.Info("GetItemValues: " + _environmentInfo.StackTrace); var now = DateTime.UtcNow; diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 0b4768c14..9f7cce13b 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -45,10 +45,9 @@ namespace Emby.Server.Implementations.Data { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index 0a2f9e7cd..f902d981f 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -52,10 +52,9 @@ namespace Emby.Server.Implementations.Data { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 85549439b..438fc55d7 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -482,7 +482,7 @@ namespace Emby.Server.Implementations.Dto { if (dtoOptions.EnableUserData) { - dto.UserData = _userDataRepository.GetUserDataDto(item, user).Result; + dto.UserData = await _userDataRepository.GetUserDataDto(item, user).ConfigureAwait(false); } } @@ -1450,11 +1450,19 @@ namespace Emby.Server.Implementations.Dto private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner) { + if (!item.SupportsInheritedParentImages) + { + return; + } + var logoLimit = options.GetImageLimit(ImageType.Logo); var artLimit = options.GetImageLimit(ImageType.Art); var thumbLimit = options.GetImageLimit(ImageType.Thumb); var backdropLimit = options.GetImageLimit(ImageType.Backdrop); + // For now. Emby apps are not using this + artLimit = 0; + if (logoLimit == 0 && artLimit == 0 && thumbLimit == 0 && backdropLimit == 0) { return; @@ -1515,6 +1523,12 @@ namespace Emby.Server.Implementations.Dto } isFirst = false; + + if (!parent.SupportsInheritedParentImages) + { + break; + } + parent = parent.GetParent(); } } diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 13c6485e5..283d193dd 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -339,11 +339,6 @@ namespace Emby.Server.Implementations.Library { throw new ArgumentNullException("item"); } - RegisterItem(item.Id, item); - } - - private void RegisterItem(Guid id, BaseItem item) - { if (item is IItemByName) { if (!(item is MusicArtist)) @@ -354,13 +349,13 @@ namespace Emby.Server.Implementations.Library if (item.IsFolder) { - if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder)) - { - if (item.SourceType != SourceType.Library) - { - return; - } - } + //if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder)) + //{ + // if (item.SourceType != SourceType.Library) + // { + // return; + // } + //} } else { @@ -370,7 +365,7 @@ namespace Emby.Server.Implementations.Library } } - LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; }); + LibraryItemsCache.AddOrUpdate(item.Id, item, delegate { return item; }); } public async Task DeleteItem(BaseItem item, DeleteOptions options) @@ -822,7 +817,7 @@ namespace Emby.Server.Implementations.Library return _userRootFolder; } - + public BaseItem FindByPath(string path, bool? isFolder) { // If this returns multiple items it could be tricky figuring out which one is correct. @@ -836,7 +831,7 @@ namespace Emby.Server.Implementations.Library SortOrder = SortOrder.Descending, Limit = 1 }; - + return GetItemList(query) .FirstOrDefault(); } @@ -1273,10 +1268,8 @@ namespace Emby.Server.Implementations.Library return ItemRepository.GetItemList(query); } - public IEnumerable GetItemList(InternalItemsQuery query, IEnumerable parentIds) + public IEnumerable GetItemList(InternalItemsQuery query, List parents) { - var parents = parentIds.Select(i => GetItemById(new Guid(i))).Where(i => i != null).ToList(); - SetTopParentIdsOrAncestors(query, parents); if (query.AncestorIds.Length == 0 && query.TopParentIds.Length == 0) @@ -1536,7 +1529,7 @@ namespace Emby.Server.Implementations.Library } // Handle grouping - if (user != null && !string.IsNullOrWhiteSpace(view.ViewType) && UserView.IsEligibleForGrouping(view.ViewType)) + if (user != null && !string.IsNullOrWhiteSpace(view.ViewType) && UserView.IsEligibleForGrouping(view.ViewType) && user.Configuration.GroupedFolders.Length > 0) { return user.RootFolder .GetChildren(user, true) diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs index b93f565a3..f7cc8bb73 100644 --- a/Emby.Server.Implementations/Library/UserViewManager.cs +++ b/Emby.Server.Implementations/Library/UserViewManager.cs @@ -245,20 +245,26 @@ namespace Emby.Server.Implementations.Library var includeItemTypes = request.IncludeItemTypes; var limit = request.Limit ?? 10; - var parentIds = string.IsNullOrEmpty(parentId) - ? new string[] { } - : new[] { parentId }; + var parents = new List(); - if (parentIds.Length == 0) + if (!string.IsNullOrWhiteSpace(parentId)) { - parentIds = user.RootFolder.GetChildren(user, true) - .OfType() - .Select(i => i.Id.ToString("N")) - .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i)) - .ToArray(); + var parent = _libraryManager.GetItemById(parentId) as Folder; + if (parent != null) + { + parents.Add(parent); + } + } + + if (parents.Count == 0) + { + parents = user.RootFolder.GetChildren(user, true) + .Where(i => i is Folder) + .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N"))) + .ToList(); } - if (parentIds.Length == 0) + if (parents.Count == 0) { return new List(); } @@ -283,10 +289,10 @@ namespace Emby.Server.Implementations.Library ExcludeItemTypes = excludeItemTypes, ExcludeLocationTypes = new[] { LocationType.Virtual }, Limit = limit * 5, - SourceTypes = parentIds.Length == 0 ? new[] { SourceType.Library } : new SourceType[] { }, + SourceTypes = parents.Count == 0 ? new[] { SourceType.Library } : new SourceType[] { }, IsPlayed = request.IsPlayed - }, parentIds); + }, parents); } } } diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 3a6f23fe9..faf9687f4 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -491,7 +491,7 @@ namespace Emby.Server.Implementations.LiveTv var id = _tvDtoService.GetInternalChannelId(serviceName, channelInfo.Id); - var item = _itemRepo.RetrieveItem(id) as LiveTvChannel; + var item = _libraryManager.GetItemById(id) as LiveTvChannel; if (item == null) { diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 5fc691527..66ef5d5d1 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -31,10 +31,9 @@ namespace Emby.Server.Implementations.Notifications { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { @@ -57,9 +56,9 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationResult(); - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + //using (WriteLock.Read()) { var clauses = new List(); var paramList = new List(); @@ -114,7 +113,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection(true)) { - using (WriteLock.Read()) + //using (WriteLock.Read()) { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index 0a598e9a7..dad05718c 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -32,10 +32,9 @@ namespace Emby.Server.Implementations.Security { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index e0ee62780..6dab54bc6 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -29,10 +29,9 @@ namespace Emby.Server.Implementations.Social { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index 36558142b..308c3bd00 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -45,10 +45,9 @@ namespace Emby.Server.Implementations.Sync { connection.ExecuteAll(string.Join(";", new[] { + "PRAGMA page_size=4096", "pragma default_temp_store = memory", - "pragma default_synchronous=Normal", - "pragma temp_store = memory", - "pragma synchronous=Normal", + "pragma temp_store = memory" })); string[] queries = { diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs index a47aaa305..fd576e081 100644 --- a/Emby.Server.Implementations/TV/TVSeriesManager.cs +++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs @@ -72,7 +72,7 @@ namespace Emby.Server.Implementations.TV return GetResult(episodes, null, request); } - public QueryResult GetNextUp(NextUpQuery request, IEnumerable parentsFolders) + public QueryResult GetNextUp(NextUpQuery request, List parentsFolders) { var user = _userManager.GetUserById(request.UserId); @@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.TV PresentationUniqueKey = presentationUniqueKey, Limit = limit - }, parentsFolders.Select(i => i.Id.ToString("N"))).Cast(); + }, parentsFolders.Cast().ToList()).Cast(); // Avoid implicitly captured closure var episodes = GetNextUpEpisodes(request, user, items); diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index 36a58cc20..695718a25 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -369,7 +369,7 @@ namespace MediaBrowser.Api.Library if (item is Movie || (program != null && program.IsMovie) || item is Trailer) { - return new MoviesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _config, _authContext) + return new MoviesService(_userManager, _libraryManager, _dtoService, _config, _authContext) { Request = Request, diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs index 1b2fa4fff..b5c6f52fc 100644 --- a/MediaBrowser.Api/Movies/MoviesService.cs +++ b/MediaBrowser.Api/Movies/MoviesService.cs @@ -78,16 +78,8 @@ namespace MediaBrowser.Api.Movies /// private readonly IUserManager _userManager; - /// - /// The _user data repository - /// - private readonly IUserDataManager _userDataRepository; - /// - /// The _library manager - /// private readonly ILibraryManager _libraryManager; - private readonly IItemRepository _itemRepo; private readonly IDtoService _dtoService; private readonly IServerConfigurationManager _config; private readonly IAuthorizationContext _authContext; @@ -95,17 +87,10 @@ namespace MediaBrowser.Api.Movies /// /// Initializes a new instance of the class. /// - /// The user manager. - /// The user data repository. - /// The library manager. - /// The item repo. - /// The dto service. - public MoviesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext) + public MoviesService(IUserManager userManager, ILibraryManager libraryManager, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext) { _userManager = userManager; - _userDataRepository = userDataRepository; _libraryManager = libraryManager; - _itemRepo = itemRepo; _dtoService = dtoService; _config = config; _authContext = authContext; diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index 539cc5f22..e4f638cb6 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -61,6 +61,12 @@ namespace MediaBrowser.Controller.Entities.Audio get { return true; } } + [IgnoreDataMember] + public override bool SupportsInheritedParentImages + { + get { return true; } + } + [IgnoreDataMember] protected override bool SupportsOwnedItems { diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index cd61d2cce..b7ea7a92d 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1569,6 +1569,12 @@ namespace MediaBrowser.Controller.Entities return IsVisibleStandaloneInternal(user, true); } + [IgnoreDataMember] + public virtual bool SupportsInheritedParentImages + { + get { return false; } + } + protected bool IsVisibleStandaloneInternal(User user, bool checkFolders) { if (!IsVisible(user)) @@ -2329,17 +2335,25 @@ namespace MediaBrowser.Controller.Entities { get { - if (GetParent() is AggregateFolder || this is BasePluginFolder || this is Channel) + if (this is BasePluginFolder || this is Channel) { return true; } var view = this as UserView; - if (view != null && string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase)) + if (view != null) { - return true; + if (string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + if (string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase)) + { + return true; + } } - if (view != null && string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase)) + + if (GetParent() is AggregateFolder) { return true; } diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 3df77673f..d4ddab7b2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1383,6 +1383,15 @@ namespace MediaBrowser.Controller.Entities { return false; } + var iItemByName = this as IItemByName; + if (iItemByName != null) + { + var hasDualAccess = this as IHasDualAccess; + if (hasDualAccess == null || hasDualAccess.IsAccessedByName) + { + return false; + } + } return true; } @@ -1395,17 +1404,6 @@ namespace MediaBrowser.Controller.Entities return; } - var unplayedQueryResult = await GetItems(new InternalItemsQuery(user) - { - Recursive = true, - IsFolder = false, - IsVirtualItem = false, - EnableTotalRecordCount = true, - Limit = 0, - IsPlayed = false - - }).ConfigureAwait(false); - var allItemsQueryResult = await GetItems(new InternalItemsQuery(user) { Recursive = true, @@ -1415,17 +1413,28 @@ namespace MediaBrowser.Controller.Entities Limit = 0 }).ConfigureAwait(false); + var recursiveItemCount = allItemsQueryResult.TotalRecordCount; if (itemDto != null) { itemDto.RecursiveItemCount = allItemsQueryResult.TotalRecordCount; } - var recursiveItemCount = allItemsQueryResult.TotalRecordCount; - double unplayedCount = unplayedQueryResult.TotalRecordCount; - - if (recursiveItemCount > 0) + if (recursiveItemCount > 0 && SupportsPlayedStatus) { + var unplayedQueryResult = recursiveItemCount > 0 ? await GetItems(new InternalItemsQuery(user) + { + Recursive = true, + IsFolder = false, + IsVirtualItem = false, + EnableTotalRecordCount = true, + Limit = 0, + IsPlayed = false + + }).ConfigureAwait(false) : new QueryResult(); + + double unplayedCount = unplayedQueryResult.TotalRecordCount; + var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100; dto.PlayedPercentage = 100 - unplayedPercentage; dto.Played = dto.PlayedPercentage.Value >= 100; diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index 94baacf13..be6e95ddd 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -124,7 +124,6 @@ namespace MediaBrowser.Controller.Entities public int? MaxParentalRating { get; set; } public bool? HasDeadParentId { get; set; } - public bool? IsOffline { get; set; } public bool? IsVirtualItem { get; set; } public Guid? ParentId { get; set; } diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 99abf5611..29a63f317 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -71,6 +71,12 @@ namespace MediaBrowser.Controller.Entities.TV { return IsStacked || MediaSourceCount > 1; } + } + + [IgnoreDataMember] + public override bool SupportsInheritedParentImages + { + get { return true; } } [IgnoreDataMember] diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index d8a9a16c1..2663a9dd5 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -39,6 +39,12 @@ namespace MediaBrowser.Controller.Entities.TV } } + [IgnoreDataMember] + public override bool SupportsInheritedParentImages + { + get { return true; } + } + [IgnoreDataMember] public override Guid? DisplayParentId { diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index a997d3476..69a3a67c8 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -135,7 +135,6 @@ namespace MediaBrowser.Controller.Entities.TV { AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(this), IncludeItemTypes = new[] { typeof(Season).Name }, - SortBy = new[] { ItemSortBy.SortName }, IsVirtualItem = false, Limit = 0 }); diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index 3820de83d..d5781d21e 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -1812,7 +1812,7 @@ namespace MediaBrowser.Controller.Entities .Where(i => user.IsFolderGrouped(i.Id) && UserView.IsEligibleForGrouping(i)); } - private IEnumerable GetMediaFolders(User user, IEnumerable viewTypes) + private List GetMediaFolders(User user, IEnumerable viewTypes) { if (user == null) { @@ -1822,7 +1822,7 @@ namespace MediaBrowser.Controller.Entities var folder = i as ICollectionFolder; return folder != null && viewTypes.Contains(folder.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase); - }); + }).ToList(); } return GetMediaFolders(user) .Where(i => @@ -1830,17 +1830,17 @@ namespace MediaBrowser.Controller.Entities var folder = i as ICollectionFolder; return folder != null && viewTypes.Contains(folder.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase); - }); + }).ToList(); } - private IEnumerable GetMediaFolders(Folder parent, User user, IEnumerable viewTypes) + private List GetMediaFolders(Folder parent, User user, IEnumerable viewTypes) { if (parent == null || parent is UserView) { return GetMediaFolders(user, viewTypes); } - return new[] { parent }; + return new List { parent }; } private IEnumerable GetRecursiveChildren(Folder parent, User user, IEnumerable viewTypes) diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index acdd9a042..955230b8a 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -538,10 +538,7 @@ namespace MediaBrowser.Controller.Library /// /// Gets the items. /// - /// The query. - /// The parent ids. - /// List<BaseItem>. - IEnumerable GetItemList(InternalItemsQuery query, IEnumerable parentIds); + IEnumerable GetItemList(InternalItemsQuery query, List parents); /// /// Gets the items result. diff --git a/MediaBrowser.Controller/TV/ITVSeriesManager.cs b/MediaBrowser.Controller/TV/ITVSeriesManager.cs index 3d6e87474..771fa602a 100644 --- a/MediaBrowser.Controller/TV/ITVSeriesManager.cs +++ b/MediaBrowser.Controller/TV/ITVSeriesManager.cs @@ -19,6 +19,6 @@ namespace MediaBrowser.Controller.TV /// The request. /// The parents folders. /// QueryResult<BaseItem>. - QueryResult GetNextUp(NextUpQuery request, IEnumerable parentsFolders); + QueryResult GetNextUp(NextUpQuery request, List parentsFolders); } } diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 7e7d81e30..f9795a568 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -14,6 +14,7 @@ namespace MediaBrowser.Model.System Architecture SystemArchitecture { get; } string GetEnvironmentVariable(string name); string GetUserId(); + string StackTrace { get; } } public enum OperatingSystem diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index 3046fc395..0491e800f 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -536,7 +536,7 @@ namespace MediaBrowser.Providers.Manager refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport; // Only one local provider allowed per item - if (item.IsLocked || IsFullLocalMetadata(localItem.Item)) + if (item.IsLocked || localItem.Item.IsLocked || IsFullLocalMetadata(localItem.Item)) { hasLocalMetadata = true; } @@ -573,14 +573,16 @@ namespace MediaBrowser.Providers.Manager { if (refreshResult.UpdateType > ItemUpdateType.None) { - // If no local metadata, take data from item itself - if (!hasLocalMetadata) + if (hasLocalMetadata) + { + MergeData(temp, metadata, item.LockedFields, true, true); + } + else { // TODO: If the new metadata from above has some blank data, this can cause old data to get filled into those empty fields - MergeData(metadata, temp, new List(), false, true); + MergeData(metadata, temp, new List(), false, false); + MergeData(temp, metadata, item.LockedFields, true, false); } - - MergeData(temp, metadata, item.LockedFields, true, true); } } -- cgit v1.2.3 From 62f84acd2640de815992436ceb392b199af656de Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 21 Nov 2016 13:49:07 -0500 Subject: fix auto-organize --- .../Data/SqliteFileOrganizationRepository.cs | 161 ++++++++++++--------- .../Data/SqliteUserDataRepository.cs | 4 +- .../Entities/Audio/MusicGenre.cs | 9 ++ MediaBrowser.Controller/Entities/GameGenre.cs | 9 ++ MediaBrowser.Controller/Entities/Genre.cs | 9 ++ MediaBrowser.Controller/Entities/Studio.cs | 9 ++ MediaBrowser.Controller/Entities/Year.cs | 9 ++ 7 files changed, 141 insertions(+), 69 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index efc0ee2ed..2d1aabf5f 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -59,28 +59,34 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection()) { - connection.RunInTransaction(db => + using (WriteLock.Write()) { - var paramList = new List(); - var commandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; - - paramList.Add(result.Id.ToGuidParamValue()); - paramList.Add(result.OriginalPath); - paramList.Add(result.TargetPath); - paramList.Add(result.FileSize); - paramList.Add(result.Date.ToDateTimeParamValue()); - paramList.Add(result.Status.ToString()); - paramList.Add(result.Type.ToString()); - paramList.Add(result.StatusMessage); - paramList.Add(result.ExtractedName); - paramList.Add(result.ExtractedSeasonNumber); - paramList.Add(result.ExtractedEpisodeNumber); - paramList.Add(result.ExtractedEndingEpisodeNumber); - paramList.Add(string.Join("|", result.DuplicatePaths.ToArray())); - - - db.Execute(commandText, paramList.ToArray()); - }); + connection.RunInTransaction(db => + { + var 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)"; + + using (var statement = db.PrepareStatement(commandText)) + { + statement.TryBind("@ResultId", result.Id.ToGuidParamValue()); + statement.TryBind("@OriginalPath", result.OriginalPath); + + statement.TryBind("@TargetPath", result.TargetPath); + statement.TryBind("@FileLength", result.FileSize); + statement.TryBind("@OrganizationDate", result.Date.ToDateTimeParamValue()); + statement.TryBind("@Status", result.Status.ToString()); + statement.TryBind("@OrganizationType", result.Type.ToString()); + statement.TryBind("@StatusMessage", result.StatusMessage); + statement.TryBind("@ExtractedName", result.ExtractedName); + statement.TryBind("@ExtractedYear", result.ExtractedYear); + statement.TryBind("@ExtractedSeasonNumber", result.ExtractedSeasonNumber); + statement.TryBind("@ExtractedEpisodeNumber", result.ExtractedEpisodeNumber); + statement.TryBind("@ExtractedEndingEpisodeNumber", result.ExtractedEndingEpisodeNumber); + statement.TryBind("@DuplicatePaths", string.Join("|", result.DuplicatePaths.ToArray())); + + statement.MoveNext(); + } + }); + } } } @@ -93,15 +99,17 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection()) { - connection.RunInTransaction(db => + using (WriteLock.Write()) { - var paramList = new List(); - var commandText = "delete from FileOrganizerResults where ResultId = ?"; - - paramList.Add(id.ToGuidParamValue()); - - db.Execute(commandText, paramList.ToArray()); - }); + connection.RunInTransaction(db => + { + using (var statement = db.PrepareStatement("delete from FileOrganizerResults where ResultId = @ResultId")) + { + statement.TryBind("@ResultId", id.ToGuidParamValue()); + statement.MoveNext(); + } + }); + } } } @@ -109,12 +117,15 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { - connection.RunInTransaction(db => + using (WriteLock.Write()) { - var commandText = "delete from FileOrganizerResults"; + connection.RunInTransaction(db => + { + var commandText = "delete from FileOrganizerResults"; - db.Execute(commandText); - }); + db.Execute(commandText); + }); + } } } @@ -127,34 +138,45 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection(true)) { - var commandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults"; - - if (query.StartIndex.HasValue && query.StartIndex.Value > 0) - { - commandText += string.Format(" WHERE ResultId NOT IN (SELECT ResultId FROM FileOrganizerResults ORDER BY OrganizationDate desc LIMIT {0})", - query.StartIndex.Value.ToString(_usCulture)); - } - - commandText += " ORDER BY OrganizationDate desc"; - - if (query.Limit.HasValue) + using (WriteLock.Read()) { - commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + var commandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults"; + + if (query.StartIndex.HasValue && query.StartIndex.Value > 0) + { + commandText += string.Format(" WHERE ResultId NOT IN (SELECT ResultId FROM FileOrganizerResults ORDER BY OrganizationDate desc LIMIT {0})", + query.StartIndex.Value.ToString(_usCulture)); + } + + commandText += " ORDER BY OrganizationDate desc"; + + if (query.Limit.HasValue) + { + commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + } + + var list = new List(); + + using (var statement = connection.PrepareStatement(commandText)) + { + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetResult(row)); + } + } + + int count; + using (var statement = connection.PrepareStatement("select count (ResultId) from FileOrganizerResults")) + { + count = statement.ExecuteQuery().SelectScalarInt().First(); + } + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = count + }; } - - var list = new List(); - var count = connection.Query("select count (ResultId) from FileOrganizerResults").SelectScalarInt().First(); - - foreach (var row in connection.Query(commandText)) - { - list.Add(GetResult(row)); - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; } } @@ -167,16 +189,21 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection(true)) { - var paramList = new List(); - - paramList.Add(id.ToGuidParamValue()); - - foreach (var row in connection.Query("select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=?", paramList.ToArray())) + using (WriteLock.Read()) { - return GetResult(row); + using (var statement = connection.PrepareStatement("select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@ResultId")) + { + statement.TryBind("@ResultId", id.ToGuidParamValue()); + statement.MoveNext(); + + foreach (var row in statement.ExecuteQuery()) + { + return GetResult(row); + } + } + + return null; } - - return null; } } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 9f7cce13b..feeb212f1 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -159,8 +159,8 @@ namespace Emby.Server.Implementations.Data { using (var statement = db.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)")) { - statement.TryBind("@UserId", userId.ToGuidParamValue()); - statement.TryBind("@Key", key); + statement.TryBind("@userId", userId.ToGuidParamValue()); + statement.TryBind("@key", key); if (userData.Rating.HasValue) { diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs index c930f2563..d75b31f6a 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs @@ -31,6 +31,15 @@ namespace MediaBrowser.Controller.Entities.Audio get { return true; } } + [IgnoreDataMember] + public override bool SupportsAncestors + { + get + { + return false; + } + } + /// /// Returns the folder containing the item. /// If the item is a folder, it returns the folder itself diff --git a/MediaBrowser.Controller/Entities/GameGenre.cs b/MediaBrowser.Controller/Entities/GameGenre.cs index d62d3c8fd..22a8675c5 100644 --- a/MediaBrowser.Controller/Entities/GameGenre.cs +++ b/MediaBrowser.Controller/Entities/GameGenre.cs @@ -37,6 +37,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public override bool SupportsAncestors + { + get + { + return false; + } + } + /// /// Gets a value indicating whether this instance is owned item. /// diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs index 731391bc4..da4ee352f 100644 --- a/MediaBrowser.Controller/Entities/Genre.cs +++ b/MediaBrowser.Controller/Entities/Genre.cs @@ -40,6 +40,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public override bool SupportsAncestors + { + get + { + return false; + } + } + public override bool IsSaveLocalMetadataEnabled() { return true; diff --git a/MediaBrowser.Controller/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs index 508eb1514..ec623eeda 100644 --- a/MediaBrowser.Controller/Entities/Studio.cs +++ b/MediaBrowser.Controller/Entities/Studio.cs @@ -39,6 +39,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public override bool SupportsAncestors + { + get + { + return false; + } + } + public override bool CanDelete() { return false; diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs index ab904cbd8..75fb69435 100644 --- a/MediaBrowser.Controller/Entities/Year.cs +++ b/MediaBrowser.Controller/Entities/Year.cs @@ -33,6 +33,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public override bool SupportsAncestors + { + get + { + return false; + } + } + public override bool CanDelete() { return false; -- cgit v1.2.3 From 92cf390fb0d8cb23d56128591e15f496210fcc7e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 21 Nov 2016 15:22:43 -0500 Subject: update user data db --- Emby.Server.Core/ApplicationHost.cs | 2 +- .../Data/BaseSqliteRepository.cs | 20 +++--- .../Data/SqliteItemRepository.cs | 45 ++++-------- .../Data/SqliteUserDataRepository.cs | 81 ++++++++++++++++------ 4 files changed, 85 insertions(+), 63 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index d48138080..7e5d6e31c 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -694,7 +694,7 @@ namespace Emby.Server.Core displayPreferencesRepo.Initialize(); - var userDataRepo = new SqliteUserDataRepository(LogManager.GetLogger("SqliteUserDataRepository"), ApplicationPaths); + var userDataRepo = new SqliteUserDataRepository(LogManager.GetLogger("SqliteUserDataRepository"), ApplicationPaths, FileSystemManager); ((UserDataManager)UserDataManager).Repository = userDataRepo; itemRepo.Initialize(userDataRepo); diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index d4226ec25..5c60a6f86 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.Data private string _defaultWal; - protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action onConnect = null) + protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false) { if (!_versionLogged) { @@ -88,9 +88,8 @@ namespace Emby.Server.Implementations.Data var queries = new List { - "PRAGMA default_temp_store=memory", - "pragma temp_store = memory", - "PRAGMA journal_mode=WAL" + "PRAGMA temp_store = memory", + //"PRAGMA journal_mode=WAL" //"PRAGMA cache size=-10000" }; @@ -108,18 +107,19 @@ namespace Emby.Server.Implementations.Data //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First()); //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First()); - //if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase) || onConnect != null) + if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase)) { + queries.Add("PRAGMA journal_mode=WAL"); + using (WriteLock.Write()) { db.ExecuteAll(string.Join(";", queries.ToArray())); - - if (onConnect != null) - { - onConnect(db); - } } } + else + { + db.ExecuteAll(string.Join(";", queries.ToArray())); + } return db; } diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index bc1eca06a..5c24c9ac4 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -357,23 +357,6 @@ namespace Emby.Server.Implementations.Data //await Vacuum(_connection).ConfigureAwait(false); } - - private SQLiteDatabaseConnection CreateConnection(bool readOnly, bool attachUserdata) - { - Action onConnect = null; - - if (attachUserdata) - { - onConnect = - c => SqliteExtensions.Attach(c, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), - "UserDataDb"); - } - - var conn = CreateConnection(readOnly, onConnect); - - return conn; - } - private readonly string[] _retriveItemColumns = { "type", @@ -2265,13 +2248,13 @@ namespace Emby.Server.Implementations.Data if (EnableJoinUserData(query)) { - list.Add("UserDataDb.UserData.UserId"); - list.Add("UserDataDb.UserData.lastPlayedDate"); - list.Add("UserDataDb.UserData.playbackPositionTicks"); - list.Add("UserDataDb.UserData.playcount"); - list.Add("UserDataDb.UserData.isFavorite"); - list.Add("UserDataDb.UserData.played"); - list.Add("UserDataDb.UserData.rating"); + list.Add("UserData.UserId"); + list.Add("UserData.lastPlayedDate"); + list.Add("UserData.playbackPositionTicks"); + list.Add("UserData.playcount"); + list.Add("UserData.isFavorite"); + list.Add("UserData.played"); + list.Add("UserData.rating"); } if (query.SimilarTo != null) @@ -2336,7 +2319,7 @@ namespace Emby.Server.Implementations.Data return string.Empty; } - return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; + return " left join UserData on UserDataKey=UserData.Key And (UserId=@UserId)"; } private string GetGroupBy(InternalItemsQuery query) @@ -2412,7 +2395,7 @@ namespace Emby.Server.Implementations.Data } } - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { @@ -2581,7 +2564,7 @@ namespace Emby.Server.Implementations.Data } } - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { @@ -2811,7 +2794,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { @@ -2882,7 +2865,7 @@ namespace Emby.Server.Implementations.Data var list = new List>(); - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { @@ -2972,7 +2955,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { @@ -4880,7 +4863,7 @@ namespace Emby.Server.Implementations.Data var list = new List>(); var count = 0; - using (var connection = CreateConnection(true, EnableJoinUserData(query))) + using (var connection = CreateConnection(true)) { using (WriteLock.Read()) { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index feeb212f1..4c1b8fcd9 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using SQLitePCL.pretty; @@ -14,10 +15,15 @@ namespace Emby.Server.Implementations.Data { public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository { - public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths) + private readonly string _importFile; + private readonly IFileSystem _fileSystem; + + public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem) : base(logger) { - DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db"); + _fileSystem = fileSystem; + DbFilePath = Path.Combine(appPaths.DataPath, "library.db"); + _importFile = Path.Combine(appPaths.DataPath, "userdata_v2.db"); } /// @@ -43,31 +49,23 @@ namespace Emby.Server.Implementations.Data using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); - string[] queries = { - "PRAGMA locking_mode=NORMAL", + "pragma temp_store = memory", - "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", + "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", - "drop index if exists UserDataDb.idx_userdata", - "drop index if exists UserDataDb.idx_userdata1", - "drop index if exists UserDataDb.idx_userdata2", - "drop index if exists UserDataDb.userdataindex1", + "create table if not exists DataSettings (IsUserDataImported bit)", - "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)", - "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)", - "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)", - "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)", + "drop index if exists idx_userdata", + "drop index if exists idx_userdata1", + "drop index if exists idx_userdata2", + "drop index if exists userdataindex1", - //pragmas - "pragma temp_store = memory", + "create unique index if not exists userdataindex on userdata (key, userId)", + "create index if not exists userdataindex2 on userdata (key, userId, played)", + "create index if not exists userdataindex3 on userdata (key, userId, playbackPositionTicks)", + "create index if not exists userdataindex4 on userdata (key, userId, isFavorite)", "pragma shrink_memory" }; @@ -81,7 +79,48 @@ namespace Emby.Server.Implementations.Data AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); }); + + ImportUserDataIfNeeded(connection); + } + } + + private void ImportUserDataIfNeeded(IDatabaseConnection connection) + { + if (!_fileSystem.FileExists(_importFile)) + { + return; + } + + var fileToImport = _importFile; + var isImported = connection.Query("select IsUserDataImported from DataSettings").SelectScalarBool().FirstOrDefault(); + + if (isImported) + { + return; } + + ImportUserData(connection, fileToImport); + + connection.RunInTransaction(db => + { + using (var statement = db.PrepareStatement("replace into DataSettings (IsUserDataImported) values (@IsUserDataImported)")) + { + statement.TryBind("@IsUserDataImported", true); + statement.MoveNext(); + } + }); + } + + private void ImportUserData(IDatabaseConnection connection, string file) + { + SqliteExtensions.Attach(connection, file, "UserDataBackup"); + + var columns = "key, userId, rating, played, playCount, isFavorite, playbackPositionTicks, lastPlayedDate, AudioStreamIndex, SubtitleStreamIndex"; + + connection.RunInTransaction(db => + { + db.Execute("REPLACE INTO userdata(" + columns + ") SELECT " + columns + " FROM UserDataBackup.userdata;"); + }); } /// -- cgit v1.2.3 From 26ef23d628c6f84baca5491203e1fe2a9a82d6b9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 27 Nov 2016 14:36:56 -0500 Subject: update caching headers --- .../IO/ManagedFileSystem.cs | 30 +++++++++++--- Emby.Server.Core/ApplicationHost.cs | 2 +- .../Data/BaseSqliteRepository.cs | 17 ++++++-- .../Data/SqliteDisplayPreferencesRepository.cs | 10 ++--- .../Data/SqliteItemRepository.cs | 46 ++++++++++++++++++++-- .../Data/SqliteUserDataRepository.cs | 8 ++++ .../HttpServer/HttpResultFactory.cs | 13 ++++-- Emby.Server.Implementations/Sync/SyncRepository.cs | 8 ++++ MediaBrowser.Model/IO/IFileSystem.cs | 13 +----- MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 1 - MediaBrowser.Providers/Manager/MetadataService.cs | 36 +++++++---------- MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs | 22 ++++++----- 12 files changed, 139 insertions(+), 67 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Common.Implementations/IO/ManagedFileSystem.cs b/Emby.Common.Implementations/IO/ManagedFileSystem.cs index 4fb70d4e2..b5943e17b 100644 --- a/Emby.Common.Implementations/IO/ManagedFileSystem.cs +++ b/Emby.Common.Implementations/IO/ManagedFileSystem.cs @@ -397,16 +397,34 @@ namespace Emby.Common.Implementations.IO private FileAccess GetFileAccess(FileAccessMode mode) { - var val = (int)mode; - - return (FileAccess)val; + switch (mode) + { + case FileAccessMode.ReadWrite: + return FileAccess.ReadWrite; + case FileAccessMode.Write: + return FileAccess.Write; + case FileAccessMode.Read: + return FileAccess.Read; + default: + throw new Exception("Unrecognized FileAccessMode"); + } } private FileShare GetFileShare(FileShareMode mode) { - var val = (int)mode; - - return (FileShare)val; + switch (mode) + { + case FileShareMode.ReadWrite: + return FileShare.ReadWrite; + case FileShareMode.Write: + return FileShare.Write; + case FileShareMode.Read: + return FileShare.Read; + case FileShareMode.None: + return FileShare.None; + default: + throw new Exception("Unrecognized FileShareMode"); + } } public void SetHidden(string path, bool isHidden) diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 7e5d6e31c..90848d930 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -551,7 +551,7 @@ namespace Emby.Server.Core DisplayPreferencesRepository = displayPreferencesRepo; RegisterSingleInstance(DisplayPreferencesRepository); - var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo); + var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo, TimerFactory); ItemRepository = itemRepo; RegisterSingleInstance(ItemRepository); diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 5c60a6f86..308b8356f 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -88,11 +88,14 @@ namespace Emby.Server.Implementations.Data var queries = new List { - "PRAGMA temp_store = memory", - //"PRAGMA journal_mode=WAL" //"PRAGMA cache size=-10000" }; + if (EnableTempStoreMemory) + { + queries.Add("PRAGMA temp_store = memory"); + } + //var cacheSize = CacheSize; //if (cacheSize.HasValue) //{ @@ -116,7 +119,7 @@ namespace Emby.Server.Implementations.Data db.ExecuteAll(string.Join(";", queries.ToArray())); } } - else + else if (queries.Count > 0) { db.ExecuteAll(string.Join(";", queries.ToArray())); } @@ -124,6 +127,14 @@ namespace Emby.Server.Implementations.Data return db; } + protected virtual bool EnableTempStoreMemory + { + get + { + return false; + } + } + protected virtual int? CacheSize { get diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 17afbcfa9..1bd64b21d 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -63,8 +63,8 @@ namespace Emby.Server.Implementations.Data string[] queries = { - "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)", - "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)" + "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)", + "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)" }; connection.RunQueries(queries); @@ -107,10 +107,10 @@ namespace Emby.Server.Implementations.Data private void SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, IDatabaseConnection connection) { - using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userid, @client, @data)")) - { - var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider); + var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider); + using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userId, @client, @data)")) + { statement.TryBind("@id", displayPreferences.Id.ToGuidParamValue()); statement.TryBind("@userId", userId.ToGuidParamValue()); statement.TryBind("@client", client); diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index c6e5a6dcf..29aacc059 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -30,6 +30,7 @@ using MediaBrowser.Server.Implementations.Playlists; using MediaBrowser.Model.Reflection; using SQLitePCL.pretty; using MediaBrowser.Model.System; +using MediaBrowser.Model.Threading; namespace Emby.Server.Implementations.Data { @@ -68,11 +69,13 @@ namespace Emby.Server.Implementations.Data private readonly IMemoryStreamFactory _memoryStreamProvider; private readonly IFileSystem _fileSystem; private readonly IEnvironmentInfo _environmentInfo; + private readonly ITimerFactory _timerFactory; + private ITimer _shrinkMemoryTimer; /// /// Initializes a new instance of the class. /// - public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo) + public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo, ITimerFactory timerFactory) : base(logger) { if (config == null) @@ -89,6 +92,7 @@ namespace Emby.Server.Implementations.Data _memoryStreamProvider = memoryStreamProvider; _fileSystem = fileSystem; _environmentInfo = environmentInfo; + _timerFactory = timerFactory; _typeMapper = new TypeMapper(assemblyInfo); _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews"); @@ -119,6 +123,14 @@ namespace Emby.Server.Implementations.Data } } + protected override bool EnableTempStoreMemory + { + get + { + return true; + } + } + private SQLiteDatabaseConnection _backgroundConnection; protected override void CloseConnection() { @@ -129,6 +141,12 @@ namespace Emby.Server.Implementations.Data _backgroundConnection.Dispose(); _backgroundConnection = null; } + + if (_shrinkMemoryTimer != null) + { + _shrinkMemoryTimer.Dispose(); + _shrinkMemoryTimer = null; + } } /// @@ -364,13 +382,35 @@ namespace Emby.Server.Implementations.Data connection.RunQueries(postQueries); - //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb"); //await Vacuum(_connection).ConfigureAwait(false); } userDataRepo.Initialize(WriteLock); _backgroundConnection = CreateConnection(true); + + _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30)); + } + + private void OnShrinkMemoryTimerCallback(object state) + { + try + { + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + connection.RunQueries(new string[] + { + "pragma shrink_memory" + }); + } + } + } + catch (Exception ex) + { + Logger.ErrorException("Error running shrink memory", ex); + } } private readonly string[] _retriveItemColumns = @@ -666,7 +706,7 @@ namespace Emby.Server.Implementations.Data { var requiresReset = false; - var statements = db.PrepareAll(string.Join(";", new string[] + var statements = db.PrepareAll(string.Join(";", new string[] { GetSaveItemCommandText(), "delete from AncestorIds where ItemId=@ItemId", diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 4c1b8fcd9..b01f215e0 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -84,6 +84,14 @@ namespace Emby.Server.Implementations.Data } } + protected override bool EnableTempStoreMemory + { + get + { + return true; + } + } + private void ImportUserDataIfNeeded(IDatabaseConnection connection) { if (!_fileSystem.FileExists(_importFile)) diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs index 313db6a75..995dc7b7b 100644 --- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs +++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs @@ -735,7 +735,7 @@ namespace Emby.Server.Implementations.HttpServer /// true if [is not modified] [the specified cache key]; otherwise, false. private bool IsNotModified(IRequest requestContext, Guid? cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration) { - var isNotModified = true; + //var isNotModified = true; var ifModifiedSinceHeader = requestContext.Headers.Get("If-Modified-Since"); @@ -745,18 +745,23 @@ namespace Emby.Server.Implementations.HttpServer if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince)) { - isNotModified = IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified); + if (IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified)) + { + return true; + } } } var ifNoneMatchHeader = requestContext.Headers.Get("If-None-Match"); // Validate If-None-Match - if (isNotModified && (cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader))) + if ((cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader))) { Guid ifNoneMatch; - if (Guid.TryParse(ifNoneMatchHeader ?? string.Empty, out ifNoneMatch)) + ifNoneMatchHeader = (ifNoneMatchHeader ?? string.Empty).Trim('\"'); + + if (Guid.TryParse(ifNoneMatchHeader, out ifNoneMatch)) { if (cacheKey.HasValue && cacheKey.Value == ifNoneMatch) { diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index 8cce7a8bf..b2d9fbcc9 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -83,6 +83,14 @@ namespace Emby.Server.Implementations.Sync } } + protected override bool EnableTempStoreMemory + { + get + { + return true; + } + } + private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs"; private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems"; diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs index 22e1e7758..62bb66ea8 100644 --- a/MediaBrowser.Model/IO/IFileSystem.cs +++ b/MediaBrowser.Model/IO/IFileSystem.cs @@ -369,7 +369,6 @@ namespace MediaBrowser.Model.IO Append = 6 } - [Flags] public enum FileAccessMode { // @@ -388,7 +387,6 @@ namespace MediaBrowser.Model.IO ReadWrite = 3 } - [Flags] public enum FileShareMode { // @@ -417,16 +415,7 @@ namespace MediaBrowser.Model.IO // or another process) will fail until the file is closed. However, even if this // flag is specified, additional permissions might still be needed to access the // file. - ReadWrite = 3, - // - // Summary: - // Allows subsequent deleting of a file. - Delete = 4, - // - // Summary: - // Makes the file handle inheritable by child processes. This is not directly supported - // by Win32. - Inheritable = 16 + ReadWrite = 3 } } diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index 8f7e94cf0..c5e140032 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -32,7 +32,6 @@ namespace MediaBrowser.Model.LiveTv public LiveTvOptions() { EnableMovieProviders = true; - EnableRecordingSubfolders = true; TunerHosts = new List(); ListingProviders = new List(); MediaLocationsCreated = new string[] { }; diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index 9f8dca434..9c6d6a482 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -78,16 +78,15 @@ namespace MediaBrowser.Providers.Manager bool hasRefreshedMetadata = true; bool hasRefreshedImages = true; + var isFirstRefresh = item.DateLastRefreshed == default(DateTime); // Next run metadata providers if (refreshOptions.MetadataRefreshMode != MetadataRefreshMode.None) { - var providers = GetProviders(item, refreshOptions, requiresRefresh) + var providers = GetProviders(item, refreshOptions, isFirstRefresh, requiresRefresh) .ToList(); - var dateLastRefresh = item.DateLastRefreshed; - - if (providers.Count > 0 || dateLastRefresh == default(DateTime)) + if (providers.Count > 0 || isFirstRefresh) { if (item.BeforeMetadataRefresh()) { @@ -110,11 +109,7 @@ namespace MediaBrowser.Providers.Manager var result = await RefreshWithProviders(metadataResult, id, refreshOptions, providers, itemImageProvider, cancellationToken).ConfigureAwait(false); updateType = updateType | result.UpdateType; - if (result.Failures == 0) - { - hasRefreshedMetadata = true; - } - else + if (result.Failures > 0) { hasRefreshedMetadata = false; } @@ -138,19 +133,13 @@ namespace MediaBrowser.Providers.Manager var result = await itemImageProvider.RefreshImages(itemOfType, libraryOptions, providers, refreshOptions, config, cancellationToken).ConfigureAwait(false); updateType = updateType | result.UpdateType; - if (result.Failures == 0) - { - hasRefreshedImages = true; - } - else + if (result.Failures > 0) { hasRefreshedImages = false; } } } - var isFirstRefresh = item.DateLastRefreshed == default(DateTime); - var beforeSaveResult = await BeforeSave(itemOfType, isFirstRefresh || refreshOptions.ReplaceAllMetadata || refreshOptions.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || requiresRefresh, updateType).ConfigureAwait(false); updateType = updateType | beforeSaveResult; @@ -373,15 +362,18 @@ namespace MediaBrowser.Providers.Manager /// Gets the providers. /// /// IEnumerable{`0}. - protected IEnumerable GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool requiresRefresh) + protected IEnumerable GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool isFirstRefresh, bool requiresRefresh) { // Get providers to refresh var providers = ((ProviderManager)ProviderManager).GetMetadataProviders(item).ToList(); - var dateLastRefresh = item.DateLastRefreshed; + var metadataRefreshMode = options.MetadataRefreshMode; // Run all if either of these flags are true - var runAllProviders = options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || dateLastRefresh == default(DateTime) || requiresRefresh; + var runAllProviders = options.ReplaceAllMetadata || + metadataRefreshMode == MetadataRefreshMode.FullRefresh || + (isFirstRefresh && metadataRefreshMode >= MetadataRefreshMode.Default) || + (requiresRefresh && metadataRefreshMode >= MetadataRefreshMode.Default); if (!runAllProviders) { @@ -404,6 +396,9 @@ namespace MediaBrowser.Providers.Manager } else { + var anyRemoteProvidersChanged = providersWithChanges.OfType() + .Any(); + providers = providers.Where(i => { // If any provider reports a change, always run local ones as well @@ -412,9 +407,6 @@ namespace MediaBrowser.Providers.Manager return true; } - var anyRemoteProvidersChanged = providersWithChanges.OfType() - .Any(); - // If any remote providers changed, run them all so that priorities can be honored if (i is IRemoteMetadataProvider) { diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index 84dd095cd..125ac5291 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -911,17 +911,14 @@ namespace MediaBrowser.XbmcMetadata.Savers var image = item.GetImageInfo(ImageType.Primary, 0); - if (image != null && image.IsLocalFile) + if (image != null) { - writer.WriteElementString("poster", GetPathToSave(image.Path, libraryManager, config)); + writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager, config)); } foreach (var backdrop in item.GetImages(ImageType.Backdrop)) { - if (backdrop.IsLocalFile) - { - writer.WriteElementString("fanart", GetPathToSave(backdrop.Path, libraryManager, config)); - } + writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager, config)); } writer.WriteEndElement(); @@ -1012,9 +1009,9 @@ namespace MediaBrowser.XbmcMetadata.Savers var personEntity = libraryManager.GetPerson(person.Name); var image = personEntity.GetImageInfo(ImageType.Primary, 0); - if (image != null && image.IsLocalFile) + if (image != null) { - writer.WriteElementString("thumb", GetPathToSave(image.Path, libraryManager, config)); + writer.WriteElementString("thumb", GetImagePathToSave(image, libraryManager, config)); } } catch (Exception) @@ -1026,9 +1023,14 @@ namespace MediaBrowser.XbmcMetadata.Savers } } - private static string GetPathToSave(string path, ILibraryManager libraryManager, IServerConfigurationManager config) + private static string GetImagePathToSave(ItemImageInfo image, ILibraryManager libraryManager, IServerConfigurationManager config) { - return libraryManager.GetPathAfterNetworkSubstitution(path); + if (!image.IsLocalFile) + { + return image.Path; + } + + return libraryManager.GetPathAfterNetworkSubstitution(image.Path); } private static bool IsPersonType(PersonInfo person, string type) -- cgit v1.2.3 From 1c52e4f51b1a9732264203fb0d987cf9752ef45b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 28 Nov 2016 14:26:48 -0500 Subject: update transaction modes --- .../Activity/ActivityRepository.cs | 2 +- .../Data/BaseSqliteRepository.cs | 5 +++++ .../Data/SqliteDisplayPreferencesRepository.cs | 4 ++-- .../Data/SqliteFileOrganizationRepository.cs | 6 +++--- .../Data/SqliteItemRepository.cs | 8 ++++---- .../Data/SqliteUserDataRepository.cs | 10 +++++----- .../Data/SqliteUserRepository.cs | 4 ++-- .../Notifications/SqliteNotificationsRepository.cs | 6 +++--- .../Security/AuthenticationRepository.cs | 18 ++++++++++-------- .../Social/SharingRepository.cs | 2 +- Emby.Server.Implementations/Sync/SyncRepository.cs | 8 ++++---- 11 files changed, 40 insertions(+), 33 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index ba81992ac..f7419de80 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Activity statement.MoveNext(); } - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 308b8356f..af8de0e84 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -30,6 +30,11 @@ namespace Emby.Server.Implementations.Data get { return false; } } + protected TransactionMode TransactionMode + { + get { return TransactionMode.Immediate; } + } + static BaseSqliteRepository() { SQLite3.EnableSharedCache = false; diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 1bd64b21d..743186db2 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -100,7 +100,7 @@ namespace Emby.Server.Implementations.Data connection.RunInTransaction(db => { SaveDisplayPreferences(displayPreferences, userId, client, db); - }); + }, TransactionMode); } } } @@ -147,7 +147,7 @@ namespace Emby.Server.Implementations.Data { SaveDisplayPreferences(displayPreference, userId, displayPreference.Client, db); } - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index 23bab883e..448d38c8c 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -85,7 +85,7 @@ namespace Emby.Server.Implementations.Data statement.MoveNext(); } - }); + }, TransactionMode); } } } @@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.Data statement.TryBind("@ResultId", id.ToGuidParamValue()); statement.MoveNext(); } - }); + }, TransactionMode); } } } @@ -124,7 +124,7 @@ namespace Emby.Server.Implementations.Data var commandText = "delete from FileOrganizerResults"; db.Execute(commandText); - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 29aacc059..54820ab53 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -316,7 +316,7 @@ namespace Emby.Server.Implementations.Data AddColumn(db, "MediaStreams", "RefFrames", "INT", existingColumnNames); AddColumn(db, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames); AddColumn(db, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames); - }); + }, TransactionMode); string[] postQueries = @@ -697,7 +697,7 @@ namespace Emby.Server.Implementations.Data connection.RunInTransaction(db => { SaveItemsInTranscation(db, tuples); - }); + }, TransactionMode); } } } @@ -2211,7 +2211,7 @@ namespace Emby.Server.Implementations.Data index++; } } - }); + }, TransactionMode); } } } @@ -4531,7 +4531,7 @@ namespace Emby.Server.Implementations.Data // Delete the item ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue()); - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index b01f215e0..f7184540a 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -78,7 +78,7 @@ namespace Emby.Server.Implementations.Data AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames); AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames); - }); + }, TransactionMode); ImportUserDataIfNeeded(connection); } @@ -116,7 +116,7 @@ namespace Emby.Server.Implementations.Data statement.TryBind("@IsUserDataImported", true); statement.MoveNext(); } - }); + }, TransactionMode); } private void ImportUserData(IDatabaseConnection connection, string file) @@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Data connection.RunInTransaction(db => { db.Execute("REPLACE INTO userdata(" + columns + ") SELECT " + columns + " FROM UserDataBackup.userdata;"); - }); + }, TransactionMode); } /// @@ -197,7 +197,7 @@ namespace Emby.Server.Implementations.Data connection.RunInTransaction(db => { SaveUserData(db, userId, key, userData); - }); + }, TransactionMode); } } } @@ -271,7 +271,7 @@ namespace Emby.Server.Implementations.Data { SaveUserData(db, userId, userItemData.Key, userItemData); } - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index f902d981f..5fb27d081 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.Data statement.TryBind("@data", serialized); statement.MoveNext(); } - }); + }, TransactionMode); } } } @@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.Data statement.TryBind("@id", user.Id.ToGuidParamValue()); statement.MoveNext(); } - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 66ef5d5d1..5f0d4d29a 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -249,7 +249,7 @@ namespace Emby.Server.Implementations.Notifications statement.MoveNext(); } - }); + }, TransactionMode); } } } @@ -304,7 +304,7 @@ namespace Emby.Server.Implementations.Notifications statement.MoveNext(); } - }); + }, TransactionMode); } } } @@ -334,7 +334,7 @@ namespace Emby.Server.Implementations.Notifications } } - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index 2632b9666..e498253c3 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -50,7 +50,8 @@ namespace Emby.Server.Implementations.Security var existingColumnNames = GetColumnNames(db, "AccessTokens"); AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames); - }); + + }, TransactionMode); } } @@ -70,9 +71,9 @@ namespace Emby.Server.Implementations.Security cancellationToken.ThrowIfCancellationRequested(); - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -100,7 +101,8 @@ namespace Emby.Server.Implementations.Security statement.MoveNext(); } - }); + + }, TransactionMode); } } } @@ -137,9 +139,9 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("query"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseSelectText; @@ -244,9 +246,9 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("id"); } - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseSelectText + " where Id=@Id"; diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index 6dab54bc6..71f80a575 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Social info.ItemId, info.UserId, info.ExpirationDate.ToDateTimeParamValue()); - }); + }, TransactionMode); } } } diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index b2d9fbcc9..caf98e666 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Sync existingColumnNames = GetColumnNames(db, "SyncJobItems"); AddColumn(db, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT", existingColumnNames); - }); + }, TransactionMode); } } @@ -268,7 +268,7 @@ namespace Emby.Server.Implementations.Sync connection.RunInTransaction(conn => { conn.Execute(commandText, paramList.ToArray()); - }); + }, TransactionMode); } } } @@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Sync { conn.Execute("delete from SyncJobs where Id=?", id.ToGuidParamValue()); conn.Execute("delete from SyncJobItems where JobId=?", id); - }); + }, TransactionMode); } } } @@ -743,7 +743,7 @@ namespace Emby.Server.Implementations.Sync connection.RunInTransaction(conn => { conn.Execute(commandText, paramList.ToArray()); - }); + }, TransactionMode); } } } -- cgit v1.2.3 From 61e195c096dfc2c5713bbbcbc0be73ddff99cb55 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 29 Nov 2016 14:12:37 -0500 Subject: update repositories --- .../Activity/ActivityRepository.cs | 20 ++-- .../Data/BaseSqliteRepository.cs | 42 +++++--- .../Data/SqliteDisplayPreferencesRepository.cs | 7 +- .../Data/SqliteFileOrganizationRepository.cs | 7 +- .../Data/SqliteItemRepository.cs | 11 +- .../Data/SqliteUserDataRepository.cs | 2 - .../Data/SqliteUserRepository.cs | 7 +- .../Notifications/SqliteNotificationsRepository.cs | 11 +- .../Security/AuthenticationRepository.cs | 119 ++++++++++----------- .../Social/SharingRepository.cs | 7 +- Emby.Server.Implementations/Sync/SyncRepository.cs | 7 +- 11 files changed, 101 insertions(+), 139 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index f7419de80..9513c224f 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -27,17 +27,11 @@ namespace Emby.Server.Implementations.Activity { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { - - "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)", - "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)" + "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)", + "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)" }; connection.RunQueries(queries); @@ -58,9 +52,9 @@ namespace Emby.Server.Implementations.Activity throw new ArgumentNullException("entry"); } - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunInTransaction(db => { @@ -86,9 +80,9 @@ namespace Emby.Server.Implementations.Activity public QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { var commandText = BaseActivitySelectText; var whereClauses = new List(); diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index af8de0e84..e066d02d3 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -67,20 +67,8 @@ namespace Emby.Server.Implementations.Data //Logger.Info("Opening write connection"); } - isReadOnly = false; - - if (isReadOnly) - { - connectionFlags = ConnectionFlags.ReadOnly; - //connectionFlags = ConnectionFlags.Create; - //connectionFlags |= ConnectionFlags.ReadWrite; - } - else - { - connectionFlags = ConnectionFlags.Create; - connectionFlags |= ConnectionFlags.ReadWrite; - } - + connectionFlags = ConnectionFlags.Create; + connectionFlags |= ConnectionFlags.ReadWrite; connectionFlags |= ConnectionFlags.SharedCached; connectionFlags |= ConnectionFlags.NoMutex; @@ -89,6 +77,8 @@ namespace Emby.Server.Implementations.Data if (string.IsNullOrWhiteSpace(_defaultWal)) { _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First(); + + Logger.Info("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal); } var queries = new List @@ -115,7 +105,7 @@ namespace Emby.Server.Implementations.Data //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First()); //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First()); - if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase)) + /*if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase)) { queries.Add("PRAGMA journal_mode=WAL"); @@ -124,7 +114,7 @@ namespace Emby.Server.Implementations.Data db.ExecuteAll(string.Join(";", queries.ToArray())); } } - else if (queries.Count > 0) + else*/ if (queries.Count > 0) { db.ExecuteAll(string.Join(";", queries.ToArray())); } @@ -132,6 +122,26 @@ namespace Emby.Server.Implementations.Data return db; } + protected void RunDefaultInitialization(IDatabaseConnection db) + { + var queries = new List + { + "PRAGMA journal_mode=WAL", + "PRAGMA page_size=4096", + }; + + if (EnableTempStoreMemory) + { + queries.AddRange(new List + { + "pragma default_temp_store = memory", + "pragma temp_store = memory" + }); + } + + db.ExecuteAll(string.Join(";", queries.ToArray())); + } + protected virtual bool EnableTempStoreMemory { get diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 743186db2..0197efb51 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -54,12 +54,7 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index 448d38c8c..603437120 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -31,12 +31,7 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 54820ab53..9c096916f 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -157,12 +157,7 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "PRAGMA default_temp_store=memory", - "PRAGMA temp_store=memory" - })); + RunDefaultInitialization(connection); var createMediaStreamsTableCommand = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))"; @@ -396,9 +391,9 @@ namespace Emby.Server.Implementations.Data { try { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { connection.RunQueries(new string[] { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index f7184540a..b65e5d1b3 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -51,8 +51,6 @@ namespace Emby.Server.Implementations.Data { string[] queries = { - "pragma temp_store = memory", - "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)", "create table if not exists DataSettings (IsUserDataImported bit)", diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index 5fb27d081..99d7563c7 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -50,12 +50,7 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 5f0d4d29a..767ba5504 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -29,12 +29,7 @@ namespace Emby.Server.Implementations.Notifications { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { @@ -58,7 +53,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection(true)) { - //using (WriteLock.Read()) + using (WriteLock.Read()) { var clauses = new List(); var paramList = new List(); @@ -113,7 +108,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection(true)) { - //using (WriteLock.Read()) + using (WriteLock.Read()) { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index e498253c3..dbda4a460 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -30,12 +30,7 @@ namespace Emby.Server.Implementations.Security { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { @@ -139,78 +134,78 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("query"); } - using (var connection = CreateConnection(true)) - { - using (WriteLock.Read()) - { - var commandText = BaseSelectText; + var commandText = BaseSelectText; - var whereClauses = new List(); + var whereClauses = new List(); - var startIndex = query.StartIndex ?? 0; + var startIndex = query.StartIndex ?? 0; - if (!string.IsNullOrWhiteSpace(query.AccessToken)) - { - whereClauses.Add("AccessToken=@AccessToken"); - } + if (!string.IsNullOrWhiteSpace(query.AccessToken)) + { + whereClauses.Add("AccessToken=@AccessToken"); + } - if (!string.IsNullOrWhiteSpace(query.UserId)) - { - whereClauses.Add("UserId=@UserId"); - } + if (!string.IsNullOrWhiteSpace(query.UserId)) + { + whereClauses.Add("UserId=@UserId"); + } - if (!string.IsNullOrWhiteSpace(query.DeviceId)) - { - whereClauses.Add("DeviceId=@DeviceId"); - } + if (!string.IsNullOrWhiteSpace(query.DeviceId)) + { + whereClauses.Add("DeviceId=@DeviceId"); + } - if (query.IsActive.HasValue) - { - whereClauses.Add("IsActive=@IsActive"); - } + if (query.IsActive.HasValue) + { + whereClauses.Add("IsActive=@IsActive"); + } - if (query.HasUser.HasValue) - { - if (query.HasUser.Value) - { - whereClauses.Add("UserId not null"); - } - else - { - whereClauses.Add("UserId is null"); - } - } + if (query.HasUser.HasValue) + { + if (query.HasUser.Value) + { + whereClauses.Add("UserId not null"); + } + else + { + whereClauses.Add("UserId is null"); + } + } - var whereTextWithoutPaging = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); + var whereTextWithoutPaging = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); - if (startIndex > 0) - { - var pagingWhereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); + if (startIndex > 0) + { + var pagingWhereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); - whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})", - pagingWhereText, - startIndex.ToString(_usCulture))); - } + whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})", + pagingWhereText, + startIndex.ToString(_usCulture))); + } - var whereText = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); + var whereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); - commandText += whereText; + commandText += whereText; - commandText += " ORDER BY DateCreated"; + commandText += " ORDER BY DateCreated"; - if (query.Limit.HasValue) - { - commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); - } + if (query.Limit.HasValue) + { + commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + } - var list = new List(); + var list = new List(); + using (var connection = CreateConnection(true)) + { + using (WriteLock.Read()) + { using (var statement = connection.PrepareStatement(commandText)) { BindAuthenticationQueryParams(query, statement); diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index 71f80a575..12d846e81 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -27,12 +27,7 @@ namespace Emby.Server.Implementations.Social { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index caf98e666..037507872 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -43,12 +43,7 @@ namespace Emby.Server.Implementations.Sync { using (var connection = CreateConnection()) { - connection.ExecuteAll(string.Join(";", new[] - { - "PRAGMA page_size=4096", - "pragma default_temp_store = memory", - "pragma temp_store = memory" - })); + RunDefaultInitialization(connection); string[] queries = { -- cgit v1.2.3 From a9a808a9c407a14af9e041cff20e7fe6af3e5061 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 11 Dec 2016 00:12:00 -0500 Subject: fix db locking errors --- .../Activity/ActivityRepository.cs | 8 +- .../Data/BaseSqliteRepository.cs | 114 ++++++++++-- .../Data/SqliteDisplayPreferencesRepository.cs | 16 +- .../Data/SqliteFileOrganizationRepository.cs | 20 +-- .../Data/SqliteItemRepository.cs | 197 +++++++++++---------- .../Data/SqliteUserDataRepository.cs | 16 +- .../Data/SqliteUserRepository.cs | 12 +- .../Notifications/SqliteNotificationsRepository.cs | 36 ++-- .../Security/AuthenticationRepository.cs | 12 +- .../Social/SharingRepository.cs | 8 +- Emby.Server.Implementations/Sync/SyncRepository.cs | 74 ++++---- MediaBrowser.Controller/Entities/TV/Season.cs | 6 +- 12 files changed, 306 insertions(+), 213 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index 9513c224f..17aef7268 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Activity throw new ArgumentNullException("entry"); } - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -80,9 +80,9 @@ namespace Emby.Server.Implementations.Activity public QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit) { - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = BaseActivitySelectText; var whereClauses = new List(); diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index f132c9765..bef2ce149 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -20,27 +20,34 @@ namespace Emby.Server.Implementations.Data { Logger = logger; - WriteLock = AllowLockRecursion ? - new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion) : - new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); + WriteLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); } - protected virtual bool AllowLockRecursion + protected TransactionMode TransactionMode { - get { return false; } + get { return TransactionMode.Immediate; } } - protected TransactionMode TransactionMode + protected TransactionMode ReadTransactionMode { - get { return TransactionMode.Immediate; } + get { return TransactionMode.Deferred; } } + internal static int ThreadSafeMode { get; set; } + static BaseSqliteRepository() { SQLite3.EnableSharedCache = false; int rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MEMSTATUS, 0); //CheckOk(rc); + + rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1); + //CheckOk(rc); + + rc = raw.sqlite3_enable_shared_cache(1); + + ThreadSafeMode = raw.sqlite3_threadsafe(); } private static bool _versionLogged; @@ -61,16 +68,19 @@ namespace Emby.Server.Implementations.Data if (isReadOnly) { //Logger.Info("Opening read connection"); + //connectionFlags = ConnectionFlags.ReadOnly; + connectionFlags = ConnectionFlags.Create; + connectionFlags |= ConnectionFlags.ReadWrite; } else { //Logger.Info("Opening write connection"); + connectionFlags = ConnectionFlags.Create; + connectionFlags |= ConnectionFlags.ReadWrite; } - connectionFlags = ConnectionFlags.Create; - connectionFlags |= ConnectionFlags.ReadWrite; - connectionFlags |= ConnectionFlags.SharedCached; - //connectionFlags |= ConnectionFlags.NoMutex; + //connectionFlags |= ConnectionFlags.SharedCached; + connectionFlags |= ConnectionFlags.NoMutex; var db = SQLite3.Open(DbFilePath, connectionFlags, null); @@ -114,7 +124,8 @@ namespace Emby.Server.Implementations.Data db.ExecuteAll(string.Join(";", queries.ToArray())); } } - else*/ if (queries.Count > 0) + else*/ + if (queries.Count > 0) { db.ExecuteAll(string.Join(";", queries.ToArray())); } @@ -122,6 +133,26 @@ namespace Emby.Server.Implementations.Data return db; } + public IStatement PrepareStatement(IDatabaseConnection connection, string sql) + { + return connection.PrepareStatement(sql); + } + + public IStatement PrepareStatementSafe(IDatabaseConnection connection, string sql) + { + return connection.PrepareStatement(sql); + } + + public List PrepareAll(IDatabaseConnection connection, string sql) + { + return connection.PrepareAll(sql).ToList(); + } + + public List PrepareAllSafe(IDatabaseConnection connection, string sql) + { + return connection.PrepareAll(sql).ToList(); + } + protected void RunDefaultInitialization(IDatabaseConnection db) { var queries = new List @@ -288,12 +319,69 @@ namespace Emby.Server.Implementations.Data } } + public class DummyToken : IDisposable + { + public void Dispose() + { + } + } + public static IDisposable Read(this ReaderWriterLockSlim obj) { - return new ReadLockToken(obj); + //if (BaseSqliteRepository.ThreadSafeMode > 0) + //{ + // return new DummyToken(); + //} + return new WriteLockToken(obj); } public static IDisposable Write(this ReaderWriterLockSlim obj) { + //if (BaseSqliteRepository.ThreadSafeMode > 0) + //{ + // return new DummyToken(); + //} + return new WriteLockToken(obj); + } + } + + public static class SemaphpreSlimExtensions + { + private sealed class WriteLockToken : IDisposable + { + private SemaphoreSlim _sync; + public WriteLockToken(SemaphoreSlim sync) + { + _sync = sync; + var task = sync.WaitAsync(); + Task.WaitAll(task); + } + public void Dispose() + { + if (_sync != null) + { + _sync.Release(); + _sync = null; + } + } + } + + public class DummyToken : IDisposable + { + public void Dispose() + { + } + } + + public static IDisposable Read(this SemaphoreSlim obj) + { + return Write(obj); + } + public static IDisposable Write(this SemaphoreSlim obj) + { + //if (BaseSqliteRepository.ThreadSafeMode > 0) + //{ + // return new DummyToken(); + //} return new WriteLockToken(obj); } } diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 0197efb51..f3d84315e 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -88,9 +88,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -132,9 +132,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -164,9 +164,9 @@ namespace Emby.Server.Implementations.Data var guidId = displayPreferencesId.GetMD5(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client")) { @@ -198,9 +198,9 @@ namespace Emby.Server.Implementations.Data { var list = new List(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId")) { diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs index 603437120..9fbe8669d 100644 --- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -92,9 +92,9 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -110,9 +110,9 @@ namespace Emby.Server.Implementations.Data public async Task DeleteAll() { - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -131,9 +131,9 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("query"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults"; @@ -182,9 +182,9 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement("select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@ResultId")) { diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 14723c0a7..1d9cec87e 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -99,14 +99,6 @@ namespace Emby.Server.Implementations.Data DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db"); } - protected override bool AllowLockRecursion - { - get - { - return true; - } - } - private const string ChaptersTableName = "Chapters2"; protected override int? CacheSize @@ -387,7 +379,7 @@ namespace Emby.Server.Implementations.Data userDataRepo.Initialize(WriteLock); - _backgroundConnection = CreateConnection(true); + //_backgroundConnection = CreateConnection(true); _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30)); } @@ -396,9 +388,9 @@ namespace Emby.Server.Implementations.Data { try { - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunQueries(new string[] { @@ -682,19 +674,23 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - var tuples = new List>>(); + var tuples = new List, BaseItem, string>>(); foreach (var item in items) { var ancestorIds = item.SupportsAncestors ? item.GetAncestorIds().Distinct().ToList() : null; - tuples.Add(new Tuple>(item, ancestorIds)); + var topParent = item.GetTopParent(); + + var userdataKey = item.GetUserDataKeys().FirstOrDefault(); + + tuples.Add(new Tuple, BaseItem, string>(item, ancestorIds, topParent, userdataKey)); } - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -704,11 +700,11 @@ namespace Emby.Server.Implementations.Data } } - private void SaveItemsInTranscation(IDatabaseConnection db, List>> tuples) + private void SaveItemsInTranscation(IDatabaseConnection db, List, BaseItem, string>> tuples) { var requiresReset = false; - var statements = db.PrepareAll(string.Join(";", new string[] + var statements = PrepareAll(db, string.Join(";", new string[] { GetSaveItemCommandText(), "delete from AncestorIds where ItemId=@ItemId", @@ -729,8 +725,10 @@ namespace Emby.Server.Implementations.Data } var item = tuple.Item1; + var topParent = tuple.Item3; + var userDataKey = tuple.Item4; - SaveItem(item, saveItemStatement); + SaveItem(item, topParent, userDataKey, saveItemStatement); //Logger.Debug(_saveItemCommand.CommandText); if (item.SupportsAncestors) @@ -747,7 +745,7 @@ namespace Emby.Server.Implementations.Data } } - private void SaveItem(BaseItem item, IStatement saveItemStatement) + private void SaveItem(BaseItem item, BaseItem topParent, string userDataKey, IStatement saveItemStatement) { saveItemStatement.TryBind("@guid", item.Id); saveItemStatement.TryBind("@type", item.GetType().FullName); @@ -840,7 +838,7 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBindNull("@Genres"); } - saveItemStatement.TryBind("@InheritedParentalRatingValue", item.GetInheritedParentalRatingValue() ?? 0); + saveItemStatement.TryBind("@InheritedParentalRatingValue", item.InheritedParentalRatingValue); saveItemStatement.TryBind("@SortName", item.SortName); saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks); @@ -922,7 +920,6 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBind("@UnratedType", item.GetBlockUnratedType().ToString()); - var topParent = item.GetTopParent(); if (topParent != null) { //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id); @@ -957,7 +954,7 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBind("@CriticRating", item.CriticRating); saveItemStatement.TryBind("@CriticRatingSummary", item.CriticRatingSummary); - var inheritedTags = item.GetInheritedTags(); + var inheritedTags = item.InheritedTags; if (inheritedTags.Count > 0) { saveItemStatement.TryBind("@InheritedTags", string.Join("|", inheritedTags.ToArray())); @@ -976,7 +973,7 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBind("@CleanName", GetCleanValue(item.Name)); } - saveItemStatement.TryBind("@PresentationUniqueKey", item.GetPresentationUniqueKey()); + saveItemStatement.TryBind("@PresentationUniqueKey", item.PresentationUniqueKey); saveItemStatement.TryBind("@SlugName", item.SlugName); saveItemStatement.TryBind("@OriginalTitle", item.OriginalTitle); @@ -1013,7 +1010,14 @@ namespace Emby.Server.Implementations.Data saveItemStatement.TryBindNull("@SeriesName"); } - saveItemStatement.TryBind("@UserDataKey", item.GetUserDataKeys().FirstOrDefault()); + if (string.IsNullOrWhiteSpace(userDataKey)) + { + saveItemStatement.TryBindNull("@UserDataKey"); + } + else + { + saveItemStatement.TryBind("@UserDataKey", userDataKey); + } var episode = item as Episode; if (episode != null) @@ -1253,11 +1257,11 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); //Logger.Info("Retrieving item {0}", id.ToString("N")); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) + using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) { statement.TryBind("@guid", id); @@ -2079,11 +2083,11 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) + using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) { statement.TryBind("@ItemId", id); @@ -2113,11 +2117,11 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex")) + using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex")) { statement.TryBind("@ItemId", id); statement.TryBind("@ChapterIndex", index); @@ -2194,16 +2198,16 @@ namespace Emby.Server.Implementations.Data var index = 0; - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { // First delete chapters db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue()); - using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)")) + using (var saveChapterStatement = PrepareStatement(db, "replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)")) { foreach (var chapter in chapters) { @@ -2488,11 +2492,11 @@ namespace Emby.Server.Implementations.Data } } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { if (EnableJoinUserData(query)) { @@ -2513,9 +2517,9 @@ namespace Emby.Server.Implementations.Data } } } - - LogQueryTime("GetItemList", commandText, now); } + + LogQueryTime("GetItemList", commandText, now); } // Hack for right now since we currently don't support filtering out these duplicates within a query @@ -2683,11 +2687,11 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray())) + var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())) .ToList(); if (!isReturningZeroItems) @@ -2902,11 +2906,11 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { if (EnableJoinUserData(query)) { @@ -2923,11 +2927,11 @@ namespace Emby.Server.Implementations.Data list.Add(row[0].ReadGuid()); } } + } - LogQueryTime("GetItemList", commandText, now); + LogQueryTime("GetItemList", commandText, now); - return list; - } + return list; } } @@ -2973,11 +2977,11 @@ namespace Emby.Server.Implementations.Data var list = new List>(); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { if (EnableJoinUserData(query)) { @@ -2999,11 +3003,11 @@ namespace Emby.Server.Implementations.Data list.Add(new Tuple(id, path)); } } + } - LogQueryTime("GetItemIdsWithPath", commandText, now); + LogQueryTime("GetItemIdsWithPath", commandText, now); - return list; - } + return list; } } @@ -3087,13 +3091,13 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray())) - .ToList(); - - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { + var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())) + .ToList(); + var totalRecordCount = 0; if (!isReturningZeroItems) @@ -4457,9 +4461,9 @@ namespace Emby.Server.Implementations.Data var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { foreach (var row in connection.Query(commandText)) { @@ -4476,7 +4480,7 @@ namespace Emby.Server.Implementations.Data } // write lock here - using (var statement = connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid")) + using (var statement = PrepareStatement(connection, "Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid")) { foreach (var item in newValues) { @@ -4531,9 +4535,9 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -4561,7 +4565,7 @@ namespace Emby.Server.Implementations.Data private void ExecuteWithSingleParam(IDatabaseConnection db, string query, byte[] value) { - using (var statement = db.PrepareStatement(query)) + using (var statement = PrepareStatement(db, query)) { statement.TryBind("@Id", value); @@ -4591,11 +4595,11 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { // Run this again to bind the params GetPeopleWhereClauses(query, statement); @@ -4605,8 +4609,8 @@ namespace Emby.Server.Implementations.Data list.Add(row.GetString(0)); } } - return list; } + return list; } } @@ -4632,11 +4636,11 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { // Run this again to bind the params GetPeopleWhereClauses(query, statement); @@ -4847,15 +4851,18 @@ namespace Emby.Server.Implementations.Data commandText += " Group By CleanValue"; - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - foreach (var row in connection.Query(commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) { - if (!row.IsDBNull(0)) + foreach (var row in statement.ExecuteQuery()) { - list.Add(row.GetString(0)); + if (!row.IsDBNull(0)) + { + list.Add(row.GetString(0)); + } } } } @@ -5023,11 +5030,11 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(countText); } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray())).ToList(); + var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())).ToList(); if (!isReturningZeroItems) { @@ -5208,7 +5215,7 @@ namespace Emby.Server.Implementations.Data // First delete db.Execute("delete from ItemValues where ItemId=@Id", itemId.ToGuidParamValue()); - using (var statement = db.PrepareStatement("insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)")) + using (var statement = PrepareStatement(db, "insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)")) { foreach (var pair in values) { @@ -5246,16 +5253,17 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) - { // First delete + using (var connection = CreateConnection()) + { + // First delete // "delete from People where ItemId=?" connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue()); var listIndex = 0; - using (var statement = connection.PrepareStatement( + using (var statement = PrepareStatement(connection, "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)")) { foreach (var person in people) @@ -5332,11 +5340,11 @@ namespace Emby.Server.Implementations.Data cmdText += " order by StreamIndex ASC"; - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(cmdText)) + using (var statement = PrepareStatementSafe(connection, cmdText)) { statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); @@ -5377,13 +5385,14 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) - { // First delete chapters + using (var connection = CreateConnection()) + { + // First delete chapters connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue()); - using (var statement = connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})", + using (var statement = PrepareStatement(connection, string.Format("replace into mediastreams ({0}) values ({1})", string.Join(",", _mediaStreamSaveColumns), string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray())))) { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index b65e5d1b3..8acbd0bb8 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -188,9 +188,9 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -259,9 +259,9 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -296,9 +296,9 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("key"); } - using (var connection = CreateConnection(true)) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) { @@ -349,9 +349,9 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (var connection = CreateConnection()) + lock (WriteLock) { - using (WriteLock.Read()) + using (var connection = CreateConnection()) { using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId")) { diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs index 99d7563c7..b2b917e5e 100644 --- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -85,9 +85,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -110,9 +110,9 @@ namespace Emby.Server.Implementations.Data { var list = new List(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { foreach (var row in connection.Query("select guid,data from users")) { @@ -148,9 +148,9 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index aae41da19..43e19da65 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -51,24 +51,24 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationResult(); - using (var connection = CreateConnection(true)) - { - using (WriteLock.Read()) - { - var clauses = new List(); - var paramList = new List(); + var clauses = new List(); + var paramList = new List(); - if (query.IsRead.HasValue) - { - clauses.Add("IsRead=?"); - paramList.Add(query.IsRead.Value); - } + if (query.IsRead.HasValue) + { + clauses.Add("IsRead=?"); + paramList.Add(query.IsRead.Value); + } - clauses.Add("UserId=?"); - paramList.Add(query.UserId.ToGuidParamValue()); + clauses.Add("UserId=?"); + paramList.Add(query.UserId.ToGuidParamValue()); - var whereClause = " where " + string.Join(" And ", clauses.ToArray()); + var whereClause = " where " + string.Join(" And ", clauses.ToArray()); + using (var connection = CreateConnection(true)) + { + lock (WriteLock) + { result.TotalRecordCount = connection.Query("select count(Id) from Notifications" + whereClause, paramList.ToArray()).SelectScalarInt().First(); var commandText = string.Format("select Id,UserId,Date,Name,Description,Url,Level,IsRead,Category,RelatedId from Notifications{0} order by IsRead asc, Date desc", whereClause); @@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection(true)) { - using (WriteLock.Read()) + lock (WriteLock) { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { @@ -225,7 +225,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection()) { - using (WriteLock.Write()) + lock (WriteLock) { connection.RunInTransaction(conn => { @@ -288,7 +288,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection()) { - using (WriteLock.Write()) + lock (WriteLock) { connection.RunInTransaction(conn => { @@ -310,7 +310,7 @@ namespace Emby.Server.Implementations.Notifications using (var connection = CreateConnection()) { - using (WriteLock.Write()) + lock (WriteLock) { connection.RunInTransaction(conn => { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index dbda4a460..dbca4931b 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -66,9 +66,9 @@ namespace Emby.Server.Implementations.Security cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -202,9 +202,9 @@ namespace Emby.Server.Implementations.Security var list = new List(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement(commandText)) { @@ -241,9 +241,9 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("id"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = BaseSelectText + " where Id=@Id"; diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index 12d846e81..e8230947e 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("info.Id"); } - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(db => { @@ -77,9 +77,9 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("id"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = ?"; diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs index 037507872..885f8e64a 100644 --- a/Emby.Server.Implementations/Sync/SyncRepository.cs +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -105,9 +105,9 @@ namespace Emby.Server.Implementations.Sync throw new ArgumentNullException("id"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = BaseJobSelectText + " where Id=?"; var paramList = new List(); @@ -216,9 +216,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { string commandText; var paramList = new List(); @@ -277,9 +277,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { connection.RunInTransaction(conn => { @@ -299,9 +299,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = BaseJobSelectText; var paramList = new List(); @@ -399,9 +399,9 @@ namespace Emby.Server.Implementations.Sync var guid = new Guid(id); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = BaseJobItemSelectText + " where Id=?"; var paramList = new List(); @@ -425,9 +425,9 @@ namespace Emby.Server.Implementations.Sync throw new ArgumentNullException("query"); } - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - using (WriteLock.Read()) + using (var connection = CreateConnection(true)) { var commandText = baseSelectText; var paramList = new List(); @@ -505,41 +505,41 @@ namespace Emby.Server.Implementations.Sync var now = DateTime.UtcNow; - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - var commandText = "select ItemId,Status,Progress from SyncJobItems"; - var whereClauses = new List(); - - if (!string.IsNullOrWhiteSpace(query.TargetId)) + using (var connection = CreateConnection(true)) { - whereClauses.Add("TargetId=@TargetId"); - } + var commandText = "select ItemId,Status,Progress from SyncJobItems"; + var whereClauses = new List(); - if (query.Statuses.Length > 0) - { - var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); + if (!string.IsNullOrWhiteSpace(query.TargetId)) + { + whereClauses.Add("TargetId=@TargetId"); + } - whereClauses.Add(string.Format("Status in ({0})", statuses)); - } + if (query.Statuses.Length > 0) + { + var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); - if (whereClauses.Count > 0) - { - commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } + whereClauses.Add(string.Format("Status in ({0})", statuses)); + } + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } - var statementTexts = new List + var statementTexts = new List { commandText }; - commandText = commandText - .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs") - .Replace("'Synced'", "'Completed','CompletedWithError'"); + commandText = commandText + .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs") + .Replace("'Synced'", "'Completed','CompletedWithError'"); - statementTexts.Add(commandText); + statementTexts.Add(commandText); - using (WriteLock.Read()) - { var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray())) .ToList(); @@ -692,9 +692,9 @@ namespace Emby.Server.Implementations.Sync CheckDisposed(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - using (WriteLock.Write()) + using (var connection = CreateConnection()) { string commandText; diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index e0cc496a1..f2a6586e2 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -48,11 +48,7 @@ namespace MediaBrowser.Controller.Entities.TV [IgnoreDataMember] public override Guid? DisplayParentId { - get - { - var series = Series; - return series == null ? ParentId : series.Id; - } + get { return SeriesId; } } [IgnoreDataMember] -- cgit v1.2.3 From 7669e821f19101aa1202c2e0a1e00c7e29f46f4b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 11 Dec 2016 00:17:04 -0500 Subject: update db locks --- .../Data/BaseSqliteRepository.cs | 2 +- .../Data/SqliteItemRepository.cs | 40 +++++++++++----------- .../Data/SqliteUserDataRepository.cs | 8 ++--- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index bef2ce149..be5b4d006 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -332,7 +332,7 @@ namespace Emby.Server.Implementations.Data //{ // return new DummyToken(); //} - return new WriteLockToken(obj); + return new ReadLockToken(obj); } public static IDisposable Write(this ReaderWriterLockSlim obj) { diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 1d9cec87e..58fcf62d9 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -388,7 +388,7 @@ namespace Emby.Server.Implementations.Data { try { - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -688,7 +688,7 @@ namespace Emby.Server.Implementations.Data tuples.Add(new Tuple, BaseItem, string>(item, ancestorIds, topParent, userdataKey)); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -1257,7 +1257,7 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); //Logger.Info("Retrieving item {0}", id.ToString("N")); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2083,7 +2083,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2117,7 +2117,7 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2198,7 +2198,7 @@ namespace Emby.Server.Implementations.Data var index = 0; - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -2492,7 +2492,7 @@ namespace Emby.Server.Implementations.Data } } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2687,7 +2687,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2906,7 +2906,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -2977,7 +2977,7 @@ namespace Emby.Server.Implementations.Data var list = new List>(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -3091,7 +3091,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -4461,7 +4461,7 @@ namespace Emby.Server.Implementations.Data var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags"; - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -4535,7 +4535,7 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -4595,7 +4595,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -4636,7 +4636,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -4851,7 +4851,7 @@ namespace Emby.Server.Implementations.Data commandText += " Group By CleanValue"; - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -5030,7 +5030,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(countText); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -5253,7 +5253,7 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -5340,7 +5340,7 @@ namespace Emby.Server.Implementations.Data cmdText += " order by StreamIndex ASC"; - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -5385,7 +5385,7 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 8acbd0bb8..b113582ed 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -259,7 +259,7 @@ namespace Emby.Server.Implementations.Data { cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("key"); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection(true)) { @@ -349,7 +349,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { -- cgit v1.2.3 From 71919dcc055b8ecb64aa18ff7dbdd1eaa4621649 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 11 Dec 2016 00:27:08 -0500 Subject: update components --- .../Data/BaseSqliteRepository.cs | 42 ---------------------- .../Data/SqliteItemRepository.cs | 26 +++++++------- .../Data/SqliteUserDataRepository.cs | 4 +-- 3 files changed, 15 insertions(+), 57 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index be5b4d006..8f2bb2cea 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -343,46 +343,4 @@ namespace Emby.Server.Implementations.Data return new WriteLockToken(obj); } } - - public static class SemaphpreSlimExtensions - { - private sealed class WriteLockToken : IDisposable - { - private SemaphoreSlim _sync; - public WriteLockToken(SemaphoreSlim sync) - { - _sync = sync; - var task = sync.WaitAsync(); - Task.WaitAll(task); - } - public void Dispose() - { - if (_sync != null) - { - _sync.Release(); - _sync = null; - } - } - } - - public class DummyToken : IDisposable - { - public void Dispose() - { - } - } - - public static IDisposable Read(this SemaphoreSlim obj) - { - return Write(obj); - } - public static IDisposable Write(this SemaphoreSlim obj) - { - //if (BaseSqliteRepository.ThreadSafeMode > 0) - //{ - // return new DummyToken(); - //} - return new WriteLockToken(obj); - } - } } diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 58fcf62d9..e3dd3f884 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -1257,7 +1257,7 @@ namespace Emby.Server.Implementations.Data CheckDisposed(); //Logger.Info("Retrieving item {0}", id.ToString("N")); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2083,7 +2083,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2117,7 +2117,7 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2492,7 +2492,7 @@ namespace Emby.Server.Implementations.Data } } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2687,7 +2687,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2906,7 +2906,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -2977,7 +2977,7 @@ namespace Emby.Server.Implementations.Data var list = new List>(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -3091,7 +3091,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(commandText); } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -4595,7 +4595,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -4636,7 +4636,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -4851,7 +4851,7 @@ namespace Emby.Server.Implementations.Data commandText += " Group By CleanValue"; - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -5030,7 +5030,7 @@ namespace Emby.Server.Implementations.Data statementTexts.Add(countText); } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -5340,7 +5340,7 @@ namespace Emby.Server.Implementations.Data cmdText += " order by StreamIndex ASC"; - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index b113582ed..be59d71b3 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("key"); } - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -349,7 +349,7 @@ namespace Emby.Server.Implementations.Data var list = new List(); - using (WriteLock.Write()) + using (WriteLock.Read()) { using (var connection = CreateConnection()) { -- cgit v1.2.3 From 1aff48b93b72fe7d418b4798f504bd0d145f44e8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 12 Dec 2016 00:49:19 -0500 Subject: move book support into the core --- Emby.Server.Core/ApplicationHost.cs | 1 + .../Activity/ActivityRepository.cs | 44 +-- .../Data/BaseSqliteRepository.cs | 2 +- .../Data/SqliteItemRepository.cs | 306 +++++++++++---------- .../Data/SqliteUserDataRepository.cs | 24 +- .../Emby.Server.Implementations.csproj | 1 + .../Library/Resolvers/Audio/AudioResolver.cs | 6 + .../Library/Resolvers/Books/BookResolver.cs | 77 ++++++ .../Library/UserDataManager.cs | 2 +- .../Security/AuthenticationRepository.cs | 44 +-- Emby.Server.Implementations/TV/TVSeriesManager.cs | 70 +++-- MediaBrowser.Api/UserLibrary/UserLibraryService.cs | 3 +- .../Entities/Audio/AudioPodcast.cs | 12 +- MediaBrowser.Controller/Entities/AudioBook.cs | 64 +++++ MediaBrowser.Controller/Entities/BaseItem.cs | 9 + .../Entities/CollectionFolder.cs | 1 + MediaBrowser.Controller/Entities/TV/Episode.cs | 3 +- MediaBrowser.Controller/Entities/Video.cs | 9 + .../LiveTv/LiveTvAudioRecording.cs | 9 + MediaBrowser.Controller/LiveTv/LiveTvChannel.cs | 9 + .../MediaBrowser.Controller.csproj | 1 + .../Books/AudioBookMetadataService.cs | 41 +++ .../Books/AudioPodcastMetadataService.cs | 41 +++ .../MediaBrowser.Providers.csproj | 2 + .../MediaBrowser.WebDashboard.csproj | 3 - 25 files changed, 567 insertions(+), 217 deletions(-) create mode 100644 Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs create mode 100644 MediaBrowser.Controller/Entities/AudioBook.cs create mode 100644 MediaBrowser.Providers/Books/AudioBookMetadataService.cs create mode 100644 MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 2074b5ae4..a6d2d32c0 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -424,6 +424,7 @@ namespace Emby.Server.Core ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "Artists", "AlbumArtists", "ChannelMediaSources", "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; + ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "Artists", "AlbumArtists", "ChannelMediaSources", "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index 17aef7268..fda8b949b 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -84,6 +84,9 @@ namespace Emby.Server.Implementations.Activity { using (var connection = CreateConnection(true)) { + var list = new List(); + int totalRecordCount = 0; + var commandText = BaseActivitySelectText; var whereClauses = new List(); @@ -120,32 +123,37 @@ namespace Emby.Server.Implementations.Activity commandText += " LIMIT " + limit.Value.ToString(_usCulture); } - var list = new List(); + var statementTexts = new List(); + statementTexts.Add(commandText); + statementTexts.Add("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging); - using (var statement = connection.PrepareStatement(commandText)) + connection.RunInTransaction(db => { - if (minDate.HasValue) - { - statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue()); - } + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList(); - foreach (var row in statement.ExecuteQuery()) + using (var statement = statements[0]) { - list.Add(GetEntry(row)); + if (minDate.HasValue) + { + statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue()); + } + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetEntry(row)); + } } - } - - int totalRecordCount; - using (var statement = connection.PrepareStatement("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging)) - { - if (minDate.HasValue) + using (var statement = statements[1]) { - statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue()); - } + if (minDate.HasValue) + { + statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue()); + } - totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); - } + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } + }, ReadTransactionMode); return new QueryResult() { diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 8f2bb2cea..9e60a43aa 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Data connectionFlags |= ConnectionFlags.ReadWrite; } - //connectionFlags |= ConnectionFlags.SharedCached; + connectionFlags |= ConnectionFlags.SharedCached; connectionFlags |= ConnectionFlags.NoMutex; var db = SQLite3.Open(DbFilePath, connectionFlags, null); diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index e3dd3f884..768f5b5a0 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -123,17 +123,10 @@ namespace Emby.Server.Implementations.Data } } - private SQLiteDatabaseConnection _backgroundConnection; protected override void CloseConnection() { base.CloseConnection(); - if (_backgroundConnection != null) - { - _backgroundConnection.Dispose(); - _backgroundConnection = null; - } - if (_shrinkMemoryTimer != null) { _shrinkMemoryTimer.Dispose(); @@ -379,8 +372,6 @@ namespace Emby.Server.Implementations.Data userDataRepo.Initialize(WriteLock); - //_backgroundConnection = CreateConnection(true); - _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30)); } @@ -1370,6 +1361,10 @@ namespace Emby.Server.Implementations.Data { return false; } + if (type == typeof(AudioBook)) + { + return false; + } if (type == typeof(MusicAlbum)) { return false; @@ -2691,51 +2686,55 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())) - .ToList(); - - if (!isReturningZeroItems) + connection.RunInTransaction(db => { - using (var statement = statements[0]) + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())) + .ToList(); + + if (!isReturningZeroItems) { - if (EnableJoinUserData(query)) + using (var statement = statements[0]) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row, query); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - list.Add(item); + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } } } - } - } - if (query.EnableTotalRecordCount) - { - using (var statement = statements[statements.Count - 1]) - { - if (EnableJoinUserData(query)) + if (query.EnableTotalRecordCount) { - statement.TryBind("@UserId", query.User.Id); - } + using (var statement = statements[statements.Count - 1]) + { + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } + } } - } + + }, ReadTransactionMode); LogQueryTime("GetItems", commandText, now); @@ -3095,49 +3094,53 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())) - .ToList(); - var totalRecordCount = 0; - if (!isReturningZeroItems) + connection.RunInTransaction(db => { - using (var statement = statements[0]) + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())) + .ToList(); + + if (!isReturningZeroItems) { - if (EnableJoinUserData(query)) + using (var statement = statements[0]) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row[0].ReadGuid()); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } } } - } - if (query.EnableTotalRecordCount) - { - using (var statement = statements[statements.Count - 1]) + if (query.EnableTotalRecordCount) { - if (EnableJoinUserData(query)) + using (var statement = statements[statements.Count - 1]) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); + } } - } + + }, ReadTransactionMode); LogQueryTime("GetItemIds", commandText, now); @@ -4426,6 +4429,7 @@ namespace Emby.Server.Implementations.Data typeof(Movie), typeof(Playlist), typeof(AudioPodcast), + typeof(AudioBook), typeof(Trailer), typeof(BoxSet), typeof(Episode), @@ -4594,21 +4598,23 @@ namespace Emby.Server.Implementations.Data commandText += " order by ListOrder"; var list = new List(); - using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + connection.RunInTransaction(db => { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = PrepareStatementSafe(db, commandText)) { - list.Add(row.GetString(0)); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row.GetString(0)); + } } - } + }, ReadTransactionMode); } return list; } @@ -4640,16 +4646,19 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + connection.RunInTransaction(db => { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); - - foreach (var row in statement.ExecuteQuery()) + using (var statement = PrepareStatementSafe(db, commandText)) { - list.Add(GetPerson(row)); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetPerson(row)); + } } - } + }, ReadTransactionMode); } } @@ -4855,16 +4864,19 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + connection.RunInTransaction(db => { - foreach (var row in statement.ExecuteQuery()) + using (var statement = PrepareStatementSafe(db, commandText)) { - if (!row.IsDBNull(0)) + foreach (var row in statement.ExecuteQuery()) { - list.Add(row.GetString(0)); + if (!row.IsDBNull(0)) + { + list.Add(row.GetString(0)); + } } } - } + }, ReadTransactionMode); } } LogQueryTime("GetItemValueNames", commandText, now); @@ -5034,69 +5046,72 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())).ToList(); - - if (!isReturningZeroItems) + connection.RunInTransaction(db => { - using (var statement = statements[0]) + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList(); + + if (!isReturningZeroItems) { - statement.TryBind("@SelectType", returnType); - if (EnableJoinUserData(query)) + using (var statement = statements[0]) { - statement.TryBind("@UserId", query.User.Id); - } + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - if (typeSubQuery != null) - { - GetWhereClauses(typeSubQuery, null, "itemTypes"); - } - BindSimilarParams(query, statement); - GetWhereClauses(innerQuery, statement); - GetWhereClauses(outerQuery, statement); + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - var countStartColumn = columns.Count - 1; + var item = GetItem(row); + if (item != null) + { + var countStartColumn = columns.Count - 1; - list.Add(new Tuple(item, GetItemCounts(row, countStartColumn, typesToCount))); + list.Add(new Tuple(item, GetItemCounts(row, countStartColumn, typesToCount))); + } } - } - LogQueryTime("GetItemValues", commandText, now); + LogQueryTime("GetItemValues", commandText, now); + } } - } - if (query.EnableTotalRecordCount) - { - commandText = "select count (distinct PresentationUniqueKey)" + GetFromText(); + if (query.EnableTotalRecordCount) + { + commandText = "select count (distinct PresentationUniqueKey)" + GetFromText(); - commandText += GetJoinUserDataText(query); - commandText += whereText; + commandText += GetJoinUserDataText(query); + commandText += whereText; - using (var statement = statements[statements.Count - 1]) - { - statement.TryBind("@SelectType", returnType); - if (EnableJoinUserData(query)) + using (var statement = statements[statements.Count - 1]) { - statement.TryBind("@UserId", query.User.Id); - } + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - if (typeSubQuery != null) - { - GetWhereClauses(typeSubQuery, null, "itemTypes"); - } - BindSimilarParams(query, statement); - GetWhereClauses(innerQuery, statement); - GetWhereClauses(outerQuery, statement); + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); - count = statement.ExecuteQuery().SelectScalarInt().First(); + count = statement.ExecuteQuery().SelectScalarInt().First(); - LogQueryTime("GetItemValues", commandText, now); + LogQueryTime("GetItemValues", commandText, now); + } } - } + }, ReadTransactionMode); } } @@ -5344,25 +5359,28 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, cmdText)) + connection.RunInTransaction(db => { - statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - - if (query.Type.HasValue) + using (var statement = PrepareStatementSafe(db, cmdText)) { - statement.TryBind("@StreamType", query.Type.Value.ToString()); - } + statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - if (query.Index.HasValue) - { - statement.TryBind("@StreamIndex", query.Index.Value); - } + if (query.Type.HasValue) + { + statement.TryBind("@StreamType", query.Type.Value.ToString()); + } - foreach (var row in statement.ExecuteQuery()) - { - list.Add(GetMediaStream(row)); + if (query.Index.HasValue) + { + statement.TryBind("@StreamIndex", query.Index.Value); + } + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetMediaStream(row)); + } } - } + }, ReadTransactionMode); } } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index be59d71b3..7afb5720e 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -300,20 +300,26 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) - { - statement.TryBind("@UserId", userId.ToGuidParamValue()); - statement.TryBind("@Key", key); + UserItemData result = null; - foreach (var row in statement.ExecuteQuery()) + connection.RunInTransaction(db => + { + using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) { - return ReadRow(row); + statement.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@Key", key); + + foreach (var row in statement.ExecuteQuery()) + { + result = ReadRow(row); + break; + } } - } + }, ReadTransactionMode); + + return result; } } - - return null; } public UserItemData GetUserData(Guid userId, List keys) diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 47f4e7ced..e478b9d81 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -119,6 +119,7 @@ + diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs index d8805355a..2e3d81474 100644 --- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; using System; +using MediaBrowser.Controller.Entities; namespace Emby.Server.Implementations.Library.Resolvers.Audio { @@ -59,6 +60,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio { return new MediaBrowser.Controller.Entities.Audio.Audio(); } + + if (string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase)) + { + return new AudioBook(); + } } } diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs new file mode 100644 index 000000000..4852c3c6a --- /dev/null +++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs @@ -0,0 +1,77 @@ +using System; +using System.IO; +using System.Linq; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Model.Entities; + +namespace Emby.Server.Implementations.Library.Resolvers.Books +{ + /// + /// + /// + public class BookResolver : MediaBrowser.Controller.Resolvers.ItemResolver + { + private readonly string[] _validExtensions = {".pdf", ".epub", ".mobi", ".cbr", ".cbz"}; + + /// + /// + /// + /// + /// + protected override Book Resolve(ItemResolveArgs args) + { + var collectionType = args.GetCollectionType(); + + // Only process items that are in a collection folder containing books + if (!string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase)) + return null; + + if (args.IsDirectory) + { + return GetBook(args); + } + + var extension = Path.GetExtension(args.Path); + + if (extension != null && _validExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase)) + { + // It's a book + return new Book + { + Path = args.Path, + IsInMixedFolder = true + }; + } + + return null; + } + + /// + /// + /// + /// + /// + private Book GetBook(ItemResolveArgs args) + { + var bookFiles = args.FileSystemChildren.Where(f => + { + var fileExtension = Path.GetExtension(f.FullName) ?? + string.Empty; + + return _validExtensions.Contains(fileExtension, + StringComparer + .OrdinalIgnoreCase); + }).ToList(); + + // Don't return a Book if there is more (or less) than one document in the directory + if (bookFiles.Count != 1) + return null; + + return new Book + { + Path = bookFiles[0].FullName + }; + } + } +} diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index c8dde1287..f4a30fc00 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -274,7 +274,7 @@ namespace Emby.Server.Implementations.Library positionTicks = 0; data.Played = false; } - if (item is Audio) + if (!item.SupportsPositionTicksResume) { positionTicks = 0; } diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index dbca4931b..a136701da 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -201,35 +201,47 @@ namespace Emby.Server.Implementations.Security } var list = new List(); + int totalRecordCount = 0; using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - using (var statement = connection.PrepareStatement(commandText)) + connection.RunInTransaction(db => { - BindAuthenticationQueryParams(query, statement); + var statementTexts = new List(); + statementTexts.Add(commandText); + statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(Get(row)); - } + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())) + .ToList(); - using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging)) + using (var statement = statements[0]) { - BindAuthenticationQueryParams(query, totalCountStatement); + BindAuthenticationQueryParams(query, statement); - var count = totalCountStatement.ExecuteQuery() - .SelectScalarInt() - .First(); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(Get(row)); + } - return new QueryResult() + using (var totalCountStatement = statements[1]) { - Items = list.ToArray(), - TotalRecordCount = count - }; + BindAuthenticationQueryParams(query, totalCountStatement); + + totalRecordCount = totalCountStatement.ExecuteQuery() + .SelectScalarInt() + .First(); + } } - } + + }, ReadTransactionMode); + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = totalRecordCount + }; } } } diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs index 4f876f6a3..88d224525 100644 --- a/Emby.Server.Implementations/TV/TVSeriesManager.cs +++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs @@ -62,7 +62,14 @@ namespace Emby.Server.Implementations.TV PresentationUniqueKey = presentationUniqueKey, Limit = limit, ParentId = parentIdGuid, - Recursive = true + Recursive = true, + DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions + { + Fields = new List + { + + } + } }).Cast(); @@ -104,7 +111,15 @@ namespace Emby.Server.Implementations.TV IncludeItemTypes = new[] { typeof(Series).Name }, SortOrder = SortOrder.Ascending, PresentationUniqueKey = presentationUniqueKey, - Limit = limit + Limit = limit, + DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions + { + Fields = new List + { + + }, + EnableImages = false + } }, parentsFolders.Cast().ToList()).Cast(); @@ -120,26 +135,32 @@ namespace Emby.Server.Implementations.TV var currentUser = user; var allNextUp = series - .Select(i => GetNextUp(i, currentUser)) + .Select(i => GetNextUp(GetUniqueSeriesKey(i), currentUser)) // Include if an episode was found, and either the series is not unwatched or the specific series was requested - .OrderByDescending(i => i.Item1) - .ToList(); + .OrderByDescending(i => i.Item1); // If viewing all next up for all series, remove first episodes - if (string.IsNullOrWhiteSpace(request.SeriesId)) - { - var withoutFirstEpisode = allNextUp - .Where(i => i.Item1 != DateTime.MinValue) - .ToList(); - - // But if that returns empty, keep those first episodes (avoid completely empty view) - if (withoutFirstEpisode.Count > 0) - { - allNextUp = withoutFirstEpisode; - } - } + // But if that returns empty, keep those first episodes (avoid completely empty view) + var alwaysEnableFirstEpisode = string.IsNullOrWhiteSpace(request.SeriesId); + var isFirstItemAFirstEpisode = true; return allNextUp + .Where(i => + { + if (alwaysEnableFirstEpisode || i.Item1 != DateTime.MinValue) + { + isFirstItemAFirstEpisode = false; + return true; + } + + if (isFirstItemAFirstEpisode) + { + return false; + } + + return true; + }) + .Take(request.Limit.HasValue ? (request.Limit.Value * 2) : int.MaxValue) .Select(i => i.Item2()) .Where(i => i != null) .Take(request.Limit ?? int.MaxValue); @@ -153,13 +174,10 @@ namespace Emby.Server.Implementations.TV /// /// Gets the next up. /// - /// The series. - /// The user. /// Task{Episode}. - private Tuple> GetNextUp(Series series, User user) + private Tuple> GetNextUp(string seriesKey, User user) { var enableSeriesPresentationKey = _config.Configuration.EnableSeriesPresentationUniqueKey; - var seriesKey = GetUniqueSeriesKey(series); var lastWatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user) { @@ -170,7 +188,15 @@ namespace Emby.Server.Implementations.TV SortOrder = SortOrder.Descending, IsPlayed = true, Limit = 1, - ParentIndexNumberNotEquals = 0 + ParentIndexNumberNotEquals = 0, + DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions + { + Fields = new List + { + + }, + EnableImages = false + } }).FirstOrDefault(); diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index 4121cc295..1ac98d165 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; using MediaBrowser.Controller.Providers; @@ -324,7 +325,7 @@ namespace MediaBrowser.Api.UserLibrary var item = i.Item2[0]; var childCount = 0; - if (i.Item1 != null && i.Item2.Count > 1) + if (i.Item1 != null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum)) { item = i.Item1; childCount = i.Item2.Count; diff --git a/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs b/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs index 9072e1094..8c820d367 100644 --- a/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs +++ b/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs @@ -1,6 +1,16 @@ -namespace MediaBrowser.Controller.Entities.Audio +using MediaBrowser.Model.Serialization; + +namespace MediaBrowser.Controller.Entities.Audio { public class AudioPodcast : Audio { + [IgnoreDataMember] + public override bool SupportsPositionTicksResume + { + get + { + return true; + } + } } } diff --git a/MediaBrowser.Controller/Entities/AudioBook.cs b/MediaBrowser.Controller/Entities/AudioBook.cs new file mode 100644 index 000000000..efeb9b497 --- /dev/null +++ b/MediaBrowser.Controller/Entities/AudioBook.cs @@ -0,0 +1,64 @@ +using System; +using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Controller.Entities +{ + public class AudioBook : Audio.Audio, IHasSeries + { + [IgnoreDataMember] + public override bool SupportsPositionTicksResume + { + get + { + return true; + } + } + + [IgnoreDataMember] + public string SeriesPresentationUniqueKey { get; set; } + [IgnoreDataMember] + public string SeriesName { get; set; } + [IgnoreDataMember] + public Guid? SeriesId { get; set; } + [IgnoreDataMember] + public string SeriesSortName { get; set; } + + public string FindSeriesSortName() + { + return SeriesSortName; + } + public string FindSeriesName() + { + return SeriesName; + } + public string FindSeriesPresentationUniqueKey() + { + return SeriesPresentationUniqueKey; + } + + [IgnoreDataMember] + public override bool EnableRefreshOnDateModifiedChange + { + get { return true; } + } + + public Guid? FindSeriesId() + { + return SeriesId; + } + + public override bool CanDownload() + { + var locationType = LocationType; + return locationType != LocationType.Remote && + locationType != LocationType.Virtual; + } + + public override UnratedItem GetBlockUnratedType() + { + return UnratedItem.Book; + } + } +} diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index b7ea7a92d..9f4503466 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -142,6 +142,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public virtual bool SupportsPositionTicksResume + { + get + { + return false; + } + } + public bool DetectIsInMixedFolder() { if (SupportsIsInMixedFolderDetection) diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 68dd055f3..ebc55ca8a 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -264,6 +264,7 @@ namespace MediaBrowser.Controller.Entities /// Our children are actually just references to the ones in the physical root... /// /// The linked children. + [IgnoreDataMember] public override List LinkedChildren { get { return GetLinkedChildrenInternal(); } diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 737257898..e6ebcb7fd 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -193,9 +193,10 @@ namespace MediaBrowser.Controller.Entities.TV { return "Season " + ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture); } + return "Season Unknown"; } - return season == null ? SeasonName : season.Name; + return season.Name; } public string FindSeriesName() diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 2dd134334..7ba59df4f 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -44,6 +44,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public override bool SupportsPositionTicksResume + { + get + { + return true; + } + } + [IgnoreDataMember] protected override bool SupportsIsInMixedFolderDetection { diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs index 88e5b2802..e67fc5759 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs @@ -46,6 +46,15 @@ namespace MediaBrowser.Controller.LiveTv set { } } + [IgnoreDataMember] + public override bool SupportsPositionTicksResume + { + get + { + return true; + } + } + /// /// Gets a value indicating whether this instance is owned item. /// diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs index f568ae6ae..d164b5e0d 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs @@ -38,6 +38,15 @@ namespace MediaBrowser.Controller.LiveTv } } + [IgnoreDataMember] + public override bool SupportsPositionTicksResume + { + get + { + return false; + } + } + [IgnoreDataMember] public override SourceType SourceType { diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 2f96088ab..28229f8a7 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -96,6 +96,7 @@ + diff --git a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs new file mode 100644 index 000000000..696619a8c --- /dev/null +++ b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs @@ -0,0 +1,41 @@ +using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; +using MediaBrowser.Providers.Manager; +using System.Collections.Generic; +using System.Linq; +using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.IO; +using MediaBrowser.Model.IO; + +namespace MediaBrowser.Providers.Books +{ + public class AudioBookMetadataService : MetadataService + { + protected override void MergeData(MetadataResult source, MetadataResult target, List lockedFields, bool replaceData, bool mergeMetadataSettings) + { + ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); + + var sourceItem = source.Item; + var targetItem = target.Item; + + if (replaceData || targetItem.Artists.Count == 0) + { + targetItem.Artists = sourceItem.Artists.ToList(); + } + + if (replaceData || string.IsNullOrEmpty(targetItem.Album)) + { + targetItem.Album = sourceItem.Album; + } + } + + public AudioBookMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager) + { + } + } +} diff --git a/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs b/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs new file mode 100644 index 000000000..86b2cf1b1 --- /dev/null +++ b/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs @@ -0,0 +1,41 @@ +using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; +using MediaBrowser.Providers.Manager; +using System.Collections.Generic; +using System.Linq; +using MediaBrowser.Common.IO; +using MediaBrowser.Controller.Entities.Audio; +using MediaBrowser.Controller.IO; +using MediaBrowser.Model.IO; + +namespace MediaBrowser.Providers.Books +{ + public class AudioPodcastMetadataService : MetadataService + { + protected override void MergeData(MetadataResult source, MetadataResult target, List lockedFields, bool replaceData, bool mergeMetadataSettings) + { + ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings); + + var sourceItem = source.Item; + var targetItem = target.Item; + + if (replaceData || targetItem.Artists.Count == 0) + { + targetItem.Artists = sourceItem.Artists.ToList(); + } + + if (replaceData || string.IsNullOrEmpty(targetItem.Album)) + { + targetItem.Album = sourceItem.Album; + } + } + + public AudioPodcastMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager) + { + } + } +} diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj index dcb21612f..fe554545f 100644 --- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj +++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj @@ -46,6 +46,8 @@ Properties\SharedVersion.cs + + diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 3cf7e54c0..be5db5a0e 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -1400,9 +1400,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest -- cgit v1.2.3 From e1b880a5a072764cabace79cd6d1d65315ec65e4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 13 Dec 2016 02:36:30 -0500 Subject: update series queries --- .../Activity/ActivityRepository.cs | 15 +- .../Data/BaseSqliteRepository.cs | 2 + .../Data/SqliteItemRepository.cs | 261 +++++++++++---------- .../Data/SqliteUserDataRepository.cs | 12 +- Emby.Server.Implementations/Dto/DtoService.cs | 105 ++++++--- .../FileOrganization/EpisodeFileOrganizer.cs | 6 + .../SocketSharp/WebSocketSharpListener.cs | 3 +- .../Library/LibraryManager.cs | 58 +++-- .../Library/UserDataManager.cs | 7 +- .../Notifications/SqliteNotificationsRepository.cs | 20 +- .../Security/AuthenticationRepository.cs | 12 +- MediaBrowser.Api/BaseApiService.cs | 32 ++- MediaBrowser.Api/ItemLookupService.cs | 15 +- MediaBrowser.Controller/Entities/BaseItem.cs | 3 +- .../Entities/CollectionFolder.cs | 68 ++++-- MediaBrowser.Controller/Entities/Folder.cs | 36 +-- MediaBrowser.Controller/Entities/IHasUserData.cs | 6 +- MediaBrowser.Controller/Library/ILibraryManager.cs | 2 + .../Library/IUserDataManager.cs | 6 +- MediaBrowser.Model/Querying/ItemFields.cs | 2 + RSSDP/SsdpDevicePublisherBase.cs | 8 +- 21 files changed, 418 insertions(+), 261 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index 7ac0e680c..5f6518a14 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -84,9 +84,6 @@ namespace Emby.Server.Implementations.Activity { using (var connection = CreateConnection(true)) { - var list = new List(); - var result = new QueryResult(); - var commandText = BaseActivitySelectText; var whereClauses = new List(); @@ -127,8 +124,11 @@ namespace Emby.Server.Implementations.Activity statementTexts.Add(commandText); statementTexts.Add("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging); - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List(); + var result = new QueryResult(); + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList(); using (var statement = statements[0]) @@ -153,10 +153,11 @@ namespace Emby.Server.Implementations.Activity result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); } - }, ReadTransactionMode); - result.Items = list.ToArray(); - return result; + result.Items = list.ToArray(); + return result; + + }, ReadTransactionMode); } } } diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 9e60a43aa..2fc721f83 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -43,6 +43,7 @@ namespace Emby.Server.Implementations.Data //CheckOk(rc); rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1); + //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SERIALIZED, 1); //CheckOk(rc); rc = raw.sqlite3_enable_shared_cache(1); @@ -94,6 +95,7 @@ namespace Emby.Server.Implementations.Data var queries = new List { //"PRAGMA cache size=-10000" + //"PRAGMA read_uncommitted = true" }; if (EnableTempStoreMemory) diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 42cbf1965..803ebeca0 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -328,6 +328,8 @@ namespace Emby.Server.Implementations.Data "drop table if exists Images", "drop index if exists idx_Images", "drop index if exists idx_TypeSeriesPresentationUniqueKey", + "drop index if exists idx_SeriesPresentationUniqueKey", + "drop index if exists idx_TypeSeriesPresentationUniqueKey2", "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", @@ -343,8 +345,9 @@ namespace Emby.Server.Implementations.Data // series "create index if not exists idx_TypeSeriesPresentationUniqueKey1 on TypedBaseItems(Type,SeriesPresentationUniqueKey,PresentationUniqueKey,SortName)", - // series next up - "create index if not exists idx_SeriesPresentationUniqueKey on TypedBaseItems(SeriesPresentationUniqueKey)", + // series counts + // seriesdateplayed sort order + "create index if not exists idx_TypeSeriesPresentationUniqueKey3 on TypedBaseItems(SeriesPresentationUniqueKey,Type,IsFolder,IsVirtualItem)", // live tv programs "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)", @@ -2079,25 +2082,29 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("id"); } - var list = new List(); - using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) + return connection.RunInTransaction(db => { - statement.TryBind("@ItemId", id); + var list = new List(); - foreach (var row in statement.ExecuteQuery()) + using (var statement = PrepareStatementSafe(db, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) { - list.Add(GetChapter(row)); + statement.TryBind("@ItemId", id); + + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetChapter(row)); + } } - } + + return list; + + }, ReadTransactionMode); } } - - return list; } /// @@ -2470,32 +2477,33 @@ namespace Emby.Server.Implementations.Data //commandText += GetGroupBy(query); - int count = 0; - using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + return connection.RunInTransaction(db => { - if (EnableJoinUserData(query)) + using (var statement = PrepareStatementSafe(db, commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - count = statement.ExecuteQuery().SelectScalarInt().First(); - } + var count = statement.ExecuteQuery().SelectScalarInt().First(); + LogQueryTime("GetCount", commandText, now); + return count; + } + + }, ReadTransactionMode); } - LogQueryTime("GetCount", commandText, now); } - - return count; } public List GetItemList(InternalItemsQuery query) @@ -2511,8 +2519,6 @@ namespace Emby.Server.Implementations.Data var now = DateTime.UtcNow; - var list = new List(); - // Hack for right now since we currently don't support filtering out these duplicates within a query if (query.Limit.HasValue && query.EnableGroupByMetadataKey) { @@ -2553,53 +2559,59 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + return connection.RunInTransaction(db => { - if (EnableJoinUserData(query)) + var list = new List(); + + using (var statement = PrepareStatementSafe(db, commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - var item = GetItem(row, query); - if (item != null) + foreach (var row in statement.ExecuteQuery()) { - list.Add(item); + var item = GetItem(row, query); + if (item != null) + { + list.Add(item); + } } } - } - } - LogQueryTime("GetItemList", commandText, now); - } + // Hack for right now since we currently don't support filtering out these duplicates within a query + if (query.EnableGroupByMetadataKey) + { + var limit = query.Limit ?? int.MaxValue; + limit -= 4; + var newList = new List(); - // Hack for right now since we currently don't support filtering out these duplicates within a query - if (query.EnableGroupByMetadataKey) - { - var limit = query.Limit ?? int.MaxValue; - limit -= 4; - var newList = new List(); + foreach (var item in list) + { + AddItem(newList, item); - foreach (var item in list) - { - AddItem(newList, item); + if (newList.Count >= limit) + { + break; + } + } - if (newList.Count >= limit) - { - break; - } - } + list = newList; + } - list = newList; - } + LogQueryTime("GetItemList", commandText, now); - return list; + return list; + + }, ReadTransactionMode); + } + } } private void AddItem(List items, BaseItem newItem) @@ -2637,7 +2649,7 @@ namespace Emby.Server.Implementations.Data var slowThreshold = 1000; #if DEBUG - slowThreshold = 50; + slowThreshold = 2; #endif if (elapsed >= slowThreshold) @@ -2718,7 +2730,6 @@ namespace Emby.Server.Implementations.Data } } - var result = new QueryResult(); var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; var statementTexts = new List(); @@ -2748,8 +2759,9 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var result = new QueryResult(); var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())) .ToList(); @@ -2796,12 +2808,12 @@ namespace Emby.Server.Implementations.Data } } - }, ReadTransactionMode); + LogQueryTime("GetItems", commandText, now); - LogQueryTime("GetItems", commandText, now); + result.Items = list.ToArray(); + return result; - result.Items = list.ToArray(); - return result; + }, ReadTransactionMode); } } } @@ -2962,34 +2974,38 @@ namespace Emby.Server.Implementations.Data } } - var list = new List(); - using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - using (var statement = PrepareStatementSafe(connection, commandText)) + return connection.RunInTransaction(db => { - if (EnableJoinUserData(query)) + var list = new List(); + + using (var statement = PrepareStatementSafe(db, commandText)) { - statement.TryBind("@UserId", query.User.Id); - } + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row[0].ReadGuid()); + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); + } } - } - } - LogQueryTime("GetItemList", commandText, now); + LogQueryTime("GetItemList", commandText, now); - return list; + return list; + + }, ReadTransactionMode); + } } } @@ -3153,10 +3169,10 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - var result = new QueryResult(); - - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var result = new QueryResult(); + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())) .ToList(); @@ -3199,12 +3215,12 @@ namespace Emby.Server.Implementations.Data } } - }, ReadTransactionMode); + LogQueryTime("GetItemIds", commandText, now); - LogQueryTime("GetItemIds", commandText, now); + result.Items = list.ToArray(); + return result; - result.Items = list.ToArray(); - return result; + }, ReadTransactionMode); } } } @@ -4653,13 +4669,13 @@ namespace Emby.Server.Implementations.Data commandText += " order by ListOrder"; - var list = new List(); using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List(); using (var statement = PrepareStatementSafe(db, commandText)) { // Run this again to bind the params @@ -4670,9 +4686,9 @@ namespace Emby.Server.Implementations.Data list.Add(row.GetString(0)); } } + return list; }, ReadTransactionMode); } - return list; } } @@ -4696,14 +4712,14 @@ namespace Emby.Server.Implementations.Data commandText += " order by ListOrder"; - var list = new List(); - using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List(); + using (var statement = PrepareStatementSafe(db, commandText)) { // Run this again to bind the params @@ -4714,11 +4730,11 @@ namespace Emby.Server.Implementations.Data list.Add(GetPerson(row)); } } + + return list; }, ReadTransactionMode); } } - - return list; } private List GetPeopleWhereClauses(InternalPeopleQuery query, IStatement statement) @@ -4899,8 +4915,6 @@ namespace Emby.Server.Implementations.Data ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); - var list = new List(); - var commandText = "Select Value From ItemValues where " + typeClause; if (withItemTypes.Count > 0) @@ -4920,8 +4934,10 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List(); + using (var statement = PrepareStatementSafe(db, commandText)) { foreach (var row in statement.ExecuteQuery()) @@ -4932,12 +4948,13 @@ namespace Emby.Server.Implementations.Data } } } + + LogQueryTime("GetItemValueNames", commandText, now); + + return list; }, ReadTransactionMode); } } - LogQueryTime("GetItemValueNames", commandText, now); - - return list; } private QueryResult> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType) @@ -5081,9 +5098,6 @@ namespace Emby.Server.Implementations.Data var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - var list = new List>(); - var result = new QueryResult>(); - var statementTexts = new List(); if (!isReturningZeroItems) { @@ -5102,8 +5116,11 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List>(); + var result = new QueryResult>(); + var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList(); if (!isReturningZeroItems) @@ -5167,17 +5184,18 @@ namespace Emby.Server.Implementations.Data LogQueryTime("GetItemValues", commandText, now); } } + + if (result.TotalRecordCount == 0) + { + result.TotalRecordCount = list.Count; + } + result.Items = list.ToArray(); + + return result; + }, ReadTransactionMode); } } - - if (result.TotalRecordCount == 0) - { - result.TotalRecordCount = list.Count; - } - result.Items = list.ToArray(); - - return result; } private ItemCounts GetItemCounts(IReadOnlyList reader, int countStartColumn, List typesToCount) @@ -5390,8 +5408,6 @@ namespace Emby.Server.Implementations.Data throw new ArgumentNullException("query"); } - var list = new List(); - var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where"; cmdText += " ItemId=@ItemId"; @@ -5412,8 +5428,10 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var list = new List(); + using (var statement = PrepareStatementSafe(db, cmdText)) { statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); @@ -5433,11 +5451,12 @@ namespace Emby.Server.Implementations.Data list.Add(GetMediaStream(row)); } } + + return list; + }, ReadTransactionMode); } } - - return list; } public async Task SaveMediaStreams(Guid id, List streams, CancellationToken cancellationToken) diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 7afb5720e..7767ae892 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -300,9 +300,7 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - UserItemData result = null; - - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) { @@ -311,13 +309,13 @@ namespace Emby.Server.Implementations.Data foreach (var row in statement.ExecuteQuery()) { - result = ReadRow(row); - break; + return ReadRow(row); } } - }, ReadTransactionMode); - return result; + return null; + + }, ReadTransactionMode); } } } diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 2b2c3e000..d0c473777 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -459,12 +459,21 @@ namespace Emby.Server.Implementations.Dto if (dtoOptions.EnableUserData) { - dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user).ConfigureAwait(false); + dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user, dtoOptions.Fields).ConfigureAwait(false); } if (!dto.ChildCount.HasValue && item.SourceType == SourceType.Library) { - dto.ChildCount = GetChildCount(folder, user); + // For these types we can try to optimize and assume these values will be equal + if (item is MusicAlbum || item is Season) + { + dto.ChildCount = dto.RecursiveItemCount; + } + + if (dtoOptions.Fields.Contains(ItemFields.ChildCount)) + { + dto.ChildCount = dto.ChildCount ?? GetChildCount(folder, user); + } } if (fields.Contains(ItemFields.CumulativeRunTimeTicks)) @@ -1151,28 +1160,29 @@ namespace Emby.Server.Implementations.Dto { dto.Artists = hasArtist.Artists; - var artistItems = _libraryManager.GetArtists(new InternalItemsQuery - { - EnableTotalRecordCount = false, - ItemIds = new[] { item.Id.ToString("N") } - }); - - dto.ArtistItems = artistItems.Items - .Select(i => - { - var artist = i.Item1; - return new NameIdPair - { - Name = artist.Name, - Id = artist.Id.ToString("N") - }; - }) - .ToList(); + //var artistItems = _libraryManager.GetArtists(new InternalItemsQuery + //{ + // EnableTotalRecordCount = false, + // ItemIds = new[] { item.Id.ToString("N") } + //}); + + //dto.ArtistItems = artistItems.Items + // .Select(i => + // { + // var artist = i.Item1; + // return new NameIdPair + // { + // Name = artist.Name, + // Id = artist.Id.ToString("N") + // }; + // }) + // .ToList(); // Include artists that are not in the database yet, e.g., just added via metadata editor - var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList(); + //var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList(); + dto.ArtistItems = new List(); dto.ArtistItems.AddRange(hasArtist.Artists - .Except(foundArtists, new DistinctNameComparer()) + //.Except(foundArtists, new DistinctNameComparer()) .Select(i => { // This should not be necessary but we're seeing some cases of it @@ -1201,23 +1211,48 @@ namespace Emby.Server.Implementations.Dto { dto.AlbumArtist = hasAlbumArtist.AlbumArtists.FirstOrDefault(); - var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery - { - EnableTotalRecordCount = false, - ItemIds = new[] { item.Id.ToString("N") } - }); - - dto.AlbumArtists = artistItems.Items + //var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery + //{ + // EnableTotalRecordCount = false, + // ItemIds = new[] { item.Id.ToString("N") } + //}); + + //dto.AlbumArtists = artistItems.Items + // .Select(i => + // { + // var artist = i.Item1; + // return new NameIdPair + // { + // Name = artist.Name, + // Id = artist.Id.ToString("N") + // }; + // }) + // .ToList(); + + dto.AlbumArtists = new List(); + dto.AlbumArtists.AddRange(hasAlbumArtist.AlbumArtists + //.Except(foundArtists, new DistinctNameComparer()) .Select(i => { - var artist = i.Item1; - return new NameIdPair + // This should not be necessary but we're seeing some cases of it + if (string.IsNullOrWhiteSpace(i)) { - Name = artist.Name, - Id = artist.Id.ToString("N") - }; - }) - .ToList(); + return null; + } + + var artist = _libraryManager.GetArtist(i); + if (artist != null) + { + return new NameIdPair + { + Name = artist.Name, + Id = artist.Id.ToString("N") + }; + } + + return null; + + }).Where(i => i != null)); } // Add video info diff --git a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs index cc2dcb6fd..5bb21d02a 100644 --- a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs +++ b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs @@ -519,6 +519,12 @@ namespace Emby.Server.Implementations.FileOrganization private void PerformFileSorting(TvFileOrganizationOptions options, FileOrganizationResult result) { + // We should probably handle this earlier so that we never even make it this far + if (string.Equals(result.OriginalPath, result.TargetPath, StringComparison.OrdinalIgnoreCase)) + { + return; + } + _libraryMonitor.ReportFileSystemChangeBeginning(result.TargetPath); _fileSystem.CreateDirectory(Path.GetDirectoryName(result.TargetPath)); diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs index 94cc383a7..4606d0e31 100644 --- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs +++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs @@ -76,7 +76,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp private void ProcessContext(HttpListenerContext context) { - Task.Factory.StartNew(() => InitTask(context)); + //Task.Factory.StartNew(() => InitTask(context), TaskCreationOptions.DenyChildAttach | TaskCreationOptions.PreferFairness); + Task.Run(() => InitTask(context)); } private Task InitTask(HttpListenerContext context) diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index ad91988e5..1ff61286f 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -817,7 +817,31 @@ namespace Emby.Server.Implementations.Library return _userRootFolder; } - + + public Guid? FindIdByPath(string path, bool? isFolder) + { + // If this returns multiple items it could be tricky figuring out which one is correct. + // In most cases, the newest one will be and the others obsolete but not yet cleaned up + + var query = new InternalItemsQuery + { + Path = path, + IsFolder = isFolder, + SortBy = new[] { ItemSortBy.DateCreated }, + SortOrder = SortOrder.Descending, + Limit = 1 + }; + + var id = GetItemIds(query); + + if (id.Count == 0) + { + return null; + } + + return id[0]; + } + public BaseItem FindByPath(string path, bool? isFolder) { // If this returns multiple items it could be tricky figuring out which one is correct. @@ -1430,7 +1454,7 @@ namespace Emby.Server.Implementations.Library })) { // Optimize by querying against top level views - query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray(); + query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray(); query.AncestorIds = new string[] { }; } } @@ -1489,7 +1513,7 @@ namespace Emby.Server.Implementations.Library })) { // Optimize by querying against top level views - query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray(); + query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray(); } else { @@ -1515,11 +1539,11 @@ namespace Emby.Server.Implementations.Library }, CancellationToken.None).Result.ToList(); - query.TopParentIds = userViews.SelectMany(i => GetTopParentsForQuery(i, user)).Select(i => i.Id.ToString("N")).ToArray(); + query.TopParentIds = userViews.SelectMany(i => GetTopParentIdsForQuery(i, user)).Select(i => i.ToString("N")).ToArray(); } } - private IEnumerable GetTopParentsForQuery(BaseItem item, User user) + private IEnumerable GetTopParentIdsForQuery(BaseItem item, User user) { var view = item as UserView; @@ -1527,7 +1551,7 @@ namespace Emby.Server.Implementations.Library { if (string.Equals(view.ViewType, CollectionType.LiveTv)) { - return new[] { view }; + return new[] { view.Id }; } if (string.Equals(view.ViewType, CollectionType.Channels)) { @@ -1537,7 +1561,7 @@ namespace Emby.Server.Implementations.Library }, CancellationToken.None).Result; - return channelResult.Items; + return channelResult.Items.Select(i => i.Id); } // Translate view into folders @@ -1546,18 +1570,18 @@ namespace Emby.Server.Implementations.Library var displayParent = GetItemById(view.DisplayParentId); if (displayParent != null) { - return GetTopParentsForQuery(displayParent, user); + return GetTopParentIdsForQuery(displayParent, user); } - return new BaseItem[] { }; + return new Guid[] { }; } if (view.ParentId != Guid.Empty) { var displayParent = GetItemById(view.ParentId); if (displayParent != null) { - return GetTopParentsForQuery(displayParent, user); + return GetTopParentIdsForQuery(displayParent, user); } - return new BaseItem[] { }; + return new Guid[] { }; } // Handle grouping @@ -1568,23 +1592,23 @@ namespace Emby.Server.Implementations.Library .OfType() .Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase)) .Where(i => user.IsFolderGrouped(i.Id)) - .SelectMany(i => GetTopParentsForQuery(i, user)); + .SelectMany(i => GetTopParentIdsForQuery(i, user)); } - return new BaseItem[] { }; + return new Guid[] { }; } var collectionFolder = item as CollectionFolder; if (collectionFolder != null) { - return collectionFolder.GetPhysicalParents(); + return collectionFolder.PhysicalFolderIds; } - + var topParent = item.GetTopParent(); if (topParent != null) { - return new[] { topParent }; + return new[] { topParent.Id }; } - return new BaseItem[] { }; + return new Guid[] { }; } /// diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index f4a30fc00..5a14edf13 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -12,6 +12,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.Querying; namespace Emby.Server.Implementations.Library { @@ -186,16 +187,16 @@ namespace Emby.Server.Implementations.Library var userData = GetUserData(user.Id, item); var dto = GetUserItemDataDto(userData); - await item.FillUserDataDtoValues(dto, userData, null, user).ConfigureAwait(false); + await item.FillUserDataDtoValues(dto, userData, null, user, new List()).ConfigureAwait(false); return dto; } - public async Task GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user) + public async Task GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List fields) { var userData = GetUserData(user.Id, item); var dto = GetUserItemDataDto(userData); - await item.FillUserDataDtoValues(dto, userData, itemDto, user).ConfigureAwait(false); + await item.FillUserDataDtoValues(dto, userData, itemDto, user, fields).ConfigureAwait(false); return dto; } diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index 43e19da65..f18278cb2 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -65,9 +65,9 @@ namespace Emby.Server.Implementations.Notifications var whereClause = " where " + string.Join(" And ", clauses.ToArray()); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - lock (WriteLock) + using (var connection = CreateConnection(true)) { result.TotalRecordCount = connection.Query("select count(Id) from Notifications" + whereClause, paramList.ToArray()).SelectScalarInt().First(); @@ -106,9 +106,9 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationsSummary(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - lock (WriteLock) + using (var connection = CreateConnection(true)) { using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead")) { @@ -223,9 +223,9 @@ namespace Emby.Server.Implementations.Notifications cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + lock (WriteLock) { - lock (WriteLock) + using (var connection = CreateConnection()) { connection.RunInTransaction(conn => { @@ -286,9 +286,9 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - lock (WriteLock) + using (var connection = CreateConnection()) { connection.RunInTransaction(conn => { @@ -308,9 +308,9 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - using (var connection = CreateConnection()) + using (WriteLock.Write()) { - lock (WriteLock) + using (var connection = CreateConnection()) { connection.RunInTransaction(conn => { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index 392db6935..7199f4f4d 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -206,10 +206,10 @@ namespace Emby.Server.Implementations.Security { using (var connection = CreateConnection(true)) { - var result = new QueryResult(); - - connection.RunInTransaction(db => + return connection.RunInTransaction(db => { + var result = new QueryResult(); + var statementTexts = new List(); statementTexts.Add(commandText); statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging); @@ -236,10 +236,10 @@ namespace Emby.Server.Implementations.Security } } - }, ReadTransactionMode); + result.Items = list.ToArray(); + return result; - result.Items = list.ToArray(); - return result; + }, ReadTransactionMode); } } } diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 73a2bedb9..7a8951396 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -121,7 +121,9 @@ namespace MediaBrowser.Api { var options = new DtoOptions(); - options.DeviceId = authContext.GetAuthorizationInfo(Request).DeviceId; + var authInfo = authContext.GetAuthorizationInfo(Request); + + options.DeviceId = authInfo.DeviceId; var hasFields = request as IHasItemFields; if (hasFields != null) @@ -129,6 +131,34 @@ namespace MediaBrowser.Api options.Fields = hasFields.GetItemFields().ToList(); } + var client = authInfo.Client ?? string.Empty; + if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1) + { + options.Fields.Add(Model.Querying.ItemFields.RecursiveItemCount); + } + + if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1 || + client.IndexOf("samsung", StringComparison.OrdinalIgnoreCase) != -1) + { + options.Fields.Add(Model.Querying.ItemFields.ChildCount); + } + + if (client.IndexOf("web", StringComparison.OrdinalIgnoreCase) == -1 && + client.IndexOf("mobile", StringComparison.OrdinalIgnoreCase) == -1 && + client.IndexOf("ios", StringComparison.OrdinalIgnoreCase) == -1 && + client.IndexOf("android", StringComparison.OrdinalIgnoreCase) == -1 && + client.IndexOf("theater", StringComparison.OrdinalIgnoreCase) == -1) + { + options.Fields.Add(Model.Querying.ItemFields.ChildCount); + } + var hasDtoOptions = request as IHasDtoOptions; if (hasDtoOptions != null) { diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs index 0ae1fbff4..b5c51bfef 100644 --- a/MediaBrowser.Api/ItemLookupService.cs +++ b/MediaBrowser.Api/ItemLookupService.cs @@ -14,8 +14,6 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Common.IO; -using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Services; @@ -88,6 +86,12 @@ namespace MediaBrowser.Api { } + [Route("/Items/RemoteSearch/Book", "POST")] + [Authenticated] + public class GetBookRemoteSearchResults : RemoteSearchQuery, IReturn> + { + } + [Route("/Items/RemoteSearch/Image", "GET", Summary = "Gets a remote image")] public class GetRemoteSearchImage { @@ -147,6 +151,13 @@ namespace MediaBrowser.Api return ToOptimizedResult(result); } + public async Task Post(GetBookRemoteSearchResults request) + { + var result = await _providerManager.GetRemoteSearchResults(request, CancellationToken.None).ConfigureAwait(false); + + return ToOptimizedResult(result); + } + public async Task Post(GetMovieRemoteSearchResults request) { var result = await _providerManager.GetRemoteSearchResults(request, CancellationToken.None).ConfigureAwait(false); diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 9f4503466..2aa53d651 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -30,6 +30,7 @@ using MediaBrowser.Model.Globalization; using MediaBrowser.Model.IO; using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.Providers; +using MediaBrowser.Model.Querying; using MediaBrowser.Model.Serialization; namespace MediaBrowser.Controller.Entities @@ -2191,7 +2192,7 @@ namespace MediaBrowser.Controller.Entities return path; } - public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user) + public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List itemFields) { if (RunTimeTicks.HasValue) { diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index ebc55ca8a..c505aefb3 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -27,6 +27,7 @@ namespace MediaBrowser.Controller.Entities public CollectionFolder() { PhysicalLocationsList = new List(); + PhysicalFolderIds = new List(); } [IgnoreDataMember] @@ -153,6 +154,7 @@ namespace MediaBrowser.Controller.Entities } public List PhysicalLocationsList { get; set; } + public List PhysicalFolderIds { get; set; } protected override IEnumerable GetFileSystemChildren(IDirectoryService directoryService) { @@ -176,6 +178,18 @@ namespace MediaBrowser.Controller.Entities } } + if (!changed) + { + var folderIds = PhysicalFolderIds.ToList(); + + var newFolderIds = GetPhysicalFolders(false).Select(i => i.Id).ToList(); + + if (!folderIds.SequenceEqual(newFolderIds)) + { + changed = true; + } + } + return changed; } @@ -186,6 +200,31 @@ namespace MediaBrowser.Controller.Entities return changed; } + protected override bool RefreshLinkedChildren(IEnumerable fileSystemChildren) + { + var physicalFolders = GetPhysicalFolders(false) + .ToList(); + + var linkedChildren = physicalFolders + .SelectMany(c => c.LinkedChildren) + .ToList(); + + var changed = !linkedChildren.SequenceEqual(LinkedChildren, new LinkedChildComparer()); + + LinkedChildren = linkedChildren; + + var folderIds = PhysicalFolderIds.ToList(); + var newFolderIds = physicalFolders.Select(i => i.Id).ToList(); + + if (!folderIds.SequenceEqual(newFolderIds)) + { + changed = true; + PhysicalFolderIds = newFolderIds.ToList(); + } + + return changed; + } + internal override bool IsValidFromResolver(BaseItem newItem) { var newCollectionFolder = newItem as CollectionFolder; @@ -260,26 +299,6 @@ namespace MediaBrowser.Controller.Entities return Task.FromResult(true); } - /// - /// Our children are actually just references to the ones in the physical root... - /// - /// The linked children. - [IgnoreDataMember] - public override List LinkedChildren - { - get { return GetLinkedChildrenInternal(); } - set - { - base.LinkedChildren = value; - } - } - private List GetLinkedChildrenInternal() - { - return GetPhysicalParents() - .SelectMany(c => c.LinkedChildren) - .ToList(); - } - /// /// Our children are actually just references to the ones in the physical root... /// @@ -292,11 +311,16 @@ namespace MediaBrowser.Controller.Entities private IEnumerable GetActualChildren() { - return GetPhysicalParents().SelectMany(c => c.Children); + return GetPhysicalFolders(true).SelectMany(c => c.Children); } - public IEnumerable GetPhysicalParents() + private IEnumerable GetPhysicalFolders(bool enableCache) { + if (enableCache) + { + return PhysicalFolderIds.Select(i => LibraryManager.GetItemById(i)).OfType(); + } + var rootChildren = LibraryManager.RootFolder.Children .OfType() .ToList(); diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 4705f03fa..a84e9a5d2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1222,7 +1222,7 @@ namespace MediaBrowser.Controller.Entities /// Refreshes the linked children. /// /// true if XXXX, false otherwise - private bool RefreshLinkedChildren(IEnumerable fileSystemChildren) + protected virtual bool RefreshLinkedChildren(IEnumerable fileSystemChildren) { var currentManualLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Manual).ToList(); var currentShortcutLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut).ToList(); @@ -1410,23 +1410,24 @@ namespace MediaBrowser.Controller.Entities } } - public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user) + public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List itemFields) { if (!SupportsUserDataFromChildren) { return; } - var recursiveItemCount = GetRecursiveChildCount(user); - if (itemDto != null) { - itemDto.RecursiveItemCount = recursiveItemCount; + if (itemFields.Contains(ItemFields.RecursiveItemCount)) + { + itemDto.RecursiveItemCount = GetRecursiveChildCount(user); + } } - if (recursiveItemCount > 0 && SupportsPlayedStatus) + if (SupportsPlayedStatus) { - var unplayedQueryResult = recursiveItemCount > 0 ? await GetItems(new InternalItemsQuery(user) + var unplayedQueryResult = await GetItems(new InternalItemsQuery(user) { Recursive = true, IsFolder = false, @@ -1435,21 +1436,24 @@ namespace MediaBrowser.Controller.Entities Limit = 0, IsPlayed = false - }).ConfigureAwait(false) : new QueryResult(); + }).ConfigureAwait(false); double unplayedCount = unplayedQueryResult.TotalRecordCount; - var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100; - dto.PlayedPercentage = 100 - unplayedPercentage; - dto.Played = dto.PlayedPercentage.Value >= 100; dto.UnplayedItemCount = unplayedQueryResult.TotalRecordCount; - } - if (itemDto != null) - { - if (this is Season || this is MusicAlbum) + if (itemDto != null && itemDto.RecursiveItemCount.HasValue) + { + if (itemDto.RecursiveItemCount.Value > 0) + { + var unplayedPercentage = (unplayedCount/itemDto.RecursiveItemCount.Value)*100; + dto.PlayedPercentage = 100 - unplayedPercentage; + dto.Played = dto.PlayedPercentage.Value >= 100; + } + } + else { - itemDto.ChildCount = recursiveItemCount; + dto.Played = (dto.UnplayedItemCount ?? 0) == 0; } } } diff --git a/MediaBrowser.Controller/Entities/IHasUserData.cs b/MediaBrowser.Controller/Entities/IHasUserData.cs index c21e170ae..0b3b7dc8d 100644 --- a/MediaBrowser.Controller/Entities/IHasUserData.cs +++ b/MediaBrowser.Controller/Entities/IHasUserData.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Querying; namespace MediaBrowser.Controller.Entities { @@ -14,10 +15,7 @@ namespace MediaBrowser.Controller.Entities /// /// Fills the user data dto values. /// - /// The dto. - /// The user data. - /// The user. - Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user); + Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List fields); bool EnableRememberingTrackSelections { get; } diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index d297fd006..bf9a07626 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -62,6 +62,8 @@ namespace MediaBrowser.Controller.Library /// BaseItem. BaseItem FindByPath(string path, bool? isFolder); + Guid? FindIdByPath(string path, bool? isFolder); + /// /// Gets the artist. /// diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs index 86c52c4c3..5940c7e29 100644 --- a/MediaBrowser.Controller/Library/IUserDataManager.cs +++ b/MediaBrowser.Controller/Library/IUserDataManager.cs @@ -5,6 +5,7 @@ using MediaBrowser.Model.Entities; using System; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.Querying; namespace MediaBrowser.Controller.Library { @@ -37,12 +38,9 @@ namespace MediaBrowser.Controller.Library /// /// Gets the user data dto. /// - /// The item. - /// The user. - /// UserItemDataDto. Task GetUserDataDto(IHasUserData item, User user); - Task GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user); + Task GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List fields); /// /// Get all user data for the given user diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index bf1d4991c..e36abf16e 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -171,6 +171,8 @@ /// PrimaryImageAspectRatio, + RecursiveItemCount, + /// /// The revenue /// diff --git a/RSSDP/SsdpDevicePublisherBase.cs b/RSSDP/SsdpDevicePublisherBase.cs index 260c00896..8ab35d661 100644 --- a/RSSDP/SsdpDevicePublisherBase.cs +++ b/RSSDP/SsdpDevicePublisherBase.cs @@ -291,7 +291,7 @@ namespace Rssdp.Infrastructure if (devices != null) { var deviceList = devices.ToList(); - WriteTrace(String.Format("Sending {0} search responses", deviceList.Count)); + //WriteTrace(String.Format("Sending {0} search responses", deviceList.Count)); foreach (var device in deviceList) { @@ -300,7 +300,7 @@ namespace Rssdp.Infrastructure } else { - WriteTrace(String.Format("Sending 0 search responses.")); + //WriteTrace(String.Format("Sending 0 search responses.")); } }); } @@ -413,7 +413,7 @@ namespace Rssdp.Infrastructure //DisposeRebroadcastTimer(); - WriteTrace("Begin Sending Alive Notifications For All Devices"); + //WriteTrace("Begin Sending Alive Notifications For All Devices"); _LastNotificationTime = DateTime.Now; @@ -430,7 +430,7 @@ namespace Rssdp.Infrastructure SendAliveNotifications(device, true); } - WriteTrace("Completed Sending Alive Notifications For All Devices"); + //WriteTrace("Completed Sending Alive Notifications For All Devices"); } catch (ObjectDisposedException ex) { -- cgit v1.2.3 From 81d685b882de369cd42ed8f3dbf78fc6bc0f36df Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 13 Dec 2016 10:44:34 -0500 Subject: update db connections --- .../ScheduledTasks/ScheduledTaskWorker.cs | 1 + .../Data/BaseSqliteRepository.cs | 64 ++++++- .../Data/SqliteExtensions.cs | 2 +- .../Data/SqliteItemRepository.cs | 209 +++++++++------------ .../Data/SqliteUserDataRepository.cs | 28 ++- .../Emby.Server.Implementations.csproj | 1 + .../Configuration/ServerConfiguration.cs | 2 - 7 files changed, 157 insertions(+), 150 deletions(-) (limited to 'Emby.Server.Implementations/Data/SqliteUserDataRepository.cs') diff --git a/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index f288c5c0f..cbc7c7c2d 100644 --- a/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs +++ b/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs @@ -387,6 +387,7 @@ namespace Emby.Common.Implementations.ScheduledTasks finally { _currentTask = null; + GC.Collect(); } } diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index b29309ef2..206422176 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Threading; using System.Threading.Tasks; using MediaBrowser.Model.Logging; @@ -43,6 +44,7 @@ namespace Emby.Server.Implementations.Data //CheckOk(rc); rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1); + //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SINGLETHREAD, 1); //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SERIALIZED, 1); //CheckOk(rc); @@ -54,9 +56,20 @@ namespace Emby.Server.Implementations.Data private static bool _versionLogged; private string _defaultWal; + protected ManagedConnection _connection; - protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false) + protected virtual bool EnableSingleConnection { + get { return true; } + } + + protected ManagedConnection CreateConnection(bool isReadOnly = false) + { + if (_connection != null) + { + return _connection; + } + lock (WriteLock) { if (!_versionLogged) @@ -82,7 +95,15 @@ namespace Emby.Server.Implementations.Data connectionFlags |= ConnectionFlags.ReadWrite; } - connectionFlags |= ConnectionFlags.SharedCached; + if (EnableSingleConnection) + { + connectionFlags |= ConnectionFlags.PrivateCache; + } + else + { + connectionFlags |= ConnectionFlags.SharedCached; + } + connectionFlags |= ConnectionFlags.NoMutex; var db = SQLite3.Open(DbFilePath, connectionFlags, null); @@ -95,11 +116,16 @@ namespace Emby.Server.Implementations.Data } var queries = new List - { - //"PRAGMA cache size=-10000" - //"PRAGMA read_uncommitted = true", - "PRAGMA synchronous=Normal" - }; + { + //"PRAGMA cache size=-10000" + //"PRAGMA read_uncommitted = true", + "PRAGMA synchronous=Normal" + }; + + if (CacheSize.HasValue) + { + queries.Add("PRAGMA cache_size=-" + CacheSize.Value.ToString(CultureInfo.InvariantCulture)); + } if (EnableTempStoreMemory) { @@ -135,10 +161,22 @@ namespace Emby.Server.Implementations.Data db.Execute(query); } - return db; + _connection = new ManagedConnection(db, false); + + return _connection; } } + public IStatement PrepareStatement(ManagedConnection connection, string sql) + { + return connection.PrepareStatement(sql); + } + + public IStatement PrepareStatementSafe(ManagedConnection connection, string sql) + { + return connection.PrepareStatement(sql); + } + public IStatement PrepareStatement(IDatabaseConnection connection, string sql) { return connection.PrepareStatement(sql); @@ -159,7 +197,7 @@ namespace Emby.Server.Implementations.Data return sql.Select(connection.PrepareStatement).ToList(); } - protected void RunDefaultInitialization(IDatabaseConnection db) + protected void RunDefaultInitialization(ManagedConnection db) { var queries = new List { @@ -246,6 +284,12 @@ namespace Emby.Server.Implementations.Data { using (WriteLock.Write()) { + if (_connection != null) + { + _connection.Close(); + _connection = null; + } + CloseConnection(); } } @@ -340,7 +384,7 @@ namespace Emby.Server.Implementations.Data //{ // return new DummyToken(); //} - return new ReadLockToken(obj); + return new WriteLockToken(obj); } public static IDisposable Write(this ReaderWriterLockSlim obj) { diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs index 5b2549087..d6ad0ba8a 100644 --- a/Emby.Server.Implementations/Data/SqliteExtensions.cs +++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs @@ -129,7 +129,7 @@ namespace Emby.Server.Implementations.Data } } - public static void Attach(IDatabaseConnection db, string path, string alias) + public static void Attach(ManagedConnection db, string path, string alias) { var commandText = string.Format("attach @path as {0};", alias); diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index f93819322..5f2a314f9 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -105,13 +105,7 @@ namespace Emby.Server.Implementations.Data { get { - var cacheSize = _config.Configuration.SqliteCacheSize; - if (cacheSize <= 0) - { - cacheSize = Math.Min(Environment.ProcessorCount * 50000, 100000); - } - - return 0 - cacheSize; + return 20000; } } @@ -376,9 +370,9 @@ namespace Emby.Server.Implementations.Data //await Vacuum(_connection).ConfigureAwait(false); } - userDataRepo.Initialize(WriteLock); + userDataRepo.Initialize(WriteLock, _connection); - _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30)); + _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(15)); } private void OnShrinkMemoryTimerCallback(object state) @@ -1258,21 +1252,17 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) { - using (var statement = PrepareStatementSafe(db, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid")) - { - statement.TryBind("@guid", id); + statement.TryBind("@guid", id); - foreach (var row in statement.ExecuteQuery()) - { - return GetItem(row); - } + foreach (var row in statement.ExecuteQuery()) + { + return GetItem(row); } + } - return null; - - }, ReadTransactionMode); + return null; } } } @@ -2091,23 +2081,19 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + var list = new List(); + + using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) { - var list = new List(); + statement.TryBind("@ItemId", id); - using (var statement = PrepareStatementSafe(db, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc")) + foreach (var row in statement.ExecuteQuery()) { - statement.TryBind("@ItemId", id); - - foreach (var row in statement.ExecuteQuery()) - { - list.Add(GetChapter(row)); - } + list.Add(GetChapter(row)); } + } - return list; - - }, ReadTransactionMode); + return list; } } } @@ -2486,26 +2472,22 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + using (var statement = PrepareStatementSafe(connection, commandText)) { - using (var statement = PrepareStatementSafe(db, commandText)) + if (EnableJoinUserData(query)) { - if (EnableJoinUserData(query)) - { - statement.TryBind("@UserId", query.User.Id); - } - - BindSimilarParams(query, statement); + statement.TryBind("@UserId", query.User.Id); + } - // Running this again will bind the params - GetWhereClauses(query, statement); + BindSimilarParams(query, statement); - var count = statement.ExecuteQuery().SelectScalarInt().First(); - LogQueryTime("GetCount", commandText, now); - return count; - } + // Running this again will bind the params + GetWhereClauses(query, statement); - }, ReadTransactionMode); + var count = statement.ExecuteQuery().SelectScalarInt().First(); + LogQueryTime("GetCount", commandText, now); + return count; + } } } @@ -2983,33 +2965,29 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => - { - var list = new List(); + var list = new List(); - using (var statement = PrepareStatementSafe(db, commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) + { + if (EnableJoinUserData(query)) { - if (EnableJoinUserData(query)) - { - statement.TryBind("@UserId", query.User.Id); - } + statement.TryBind("@UserId", query.User.Id); + } - BindSimilarParams(query, statement); + BindSimilarParams(query, statement); - // Running this again will bind the params - GetWhereClauses(query, statement); + // Running this again will bind the params + GetWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row[0].ReadGuid()); - } + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row[0].ReadGuid()); } + } - LogQueryTime("GetItemList", commandText, now); - - return list; + LogQueryTime("GetItemList", commandText, now); - }, ReadTransactionMode); + return list; } } } @@ -4678,21 +4656,18 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + var list = new List(); + using (var statement = PrepareStatementSafe(connection, commandText)) { - var list = new List(); - using (var statement = PrepareStatementSafe(db, commandText)) - { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); - foreach (var row in statement.ExecuteQuery()) - { - list.Add(row.GetString(0)); - } + foreach (var row in statement.ExecuteQuery()) + { + list.Add(row.GetString(0)); } - return list; - }, ReadTransactionMode); + } + return list; } } } @@ -4721,23 +4696,20 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + var list = new List(); + + using (var statement = PrepareStatementSafe(connection, commandText)) { - var list = new List(); + // Run this again to bind the params + GetPeopleWhereClauses(query, statement); - using (var statement = PrepareStatementSafe(db, commandText)) + foreach (var row in statement.ExecuteQuery()) { - // Run this again to bind the params - GetPeopleWhereClauses(query, statement); - - foreach (var row in statement.ExecuteQuery()) - { - list.Add(GetPerson(row)); - } + list.Add(GetPerson(row)); } + } - return list; - }, ReadTransactionMode); + return list; } } } @@ -4939,25 +4911,22 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => - { - var list = new List(); + var list = new List(); - using (var statement = PrepareStatementSafe(db, commandText)) + using (var statement = PrepareStatementSafe(connection, commandText)) + { + foreach (var row in statement.ExecuteQuery()) { - foreach (var row in statement.ExecuteQuery()) + if (!row.IsDBNull(0)) { - if (!row.IsDBNull(0)) - { - list.Add(row.GetString(0)); - } + list.Add(row.GetString(0)); } } + } - LogQueryTime("GetItemValueNames", commandText, now); + LogQueryTime("GetItemValueNames", commandText, now); - return list; - }, ReadTransactionMode); + return list; } } } @@ -5434,33 +5403,29 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + var list = new List(); + + using (var statement = PrepareStatementSafe(connection, cmdText)) { - var list = new List(); + statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - using (var statement = PrepareStatementSafe(db, cmdText)) + if (query.Type.HasValue) { - statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue()); - - if (query.Type.HasValue) - { - statement.TryBind("@StreamType", query.Type.Value.ToString()); - } - - if (query.Index.HasValue) - { - statement.TryBind("@StreamIndex", query.Index.Value); - } + statement.TryBind("@StreamType", query.Type.Value.ToString()); + } - foreach (var row in statement.ExecuteQuery()) - { - list.Add(GetMediaStream(row)); - } + if (query.Index.HasValue) + { + statement.TryBind("@StreamIndex", query.Index.Value); } - return list; + foreach (var row in statement.ExecuteQuery()) + { + list.Add(GetMediaStream(row)); + } + } - }, ReadTransactionMode); + return list; } } } diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs index 7767ae892..2e39b038a 100644 --- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs @@ -42,8 +42,10 @@ namespace Emby.Server.Implementations.Data /// Opens the connection to the database /// /// Task. - public void Initialize(ReaderWriterLockSlim writeLock) + public void Initialize(ReaderWriterLockSlim writeLock, ManagedConnection managedConnection) { + _connection = managedConnection; + WriteLock.Dispose(); WriteLock = writeLock; @@ -90,7 +92,7 @@ namespace Emby.Server.Implementations.Data } } - private void ImportUserDataIfNeeded(IDatabaseConnection connection) + private void ImportUserDataIfNeeded(ManagedConnection connection) { if (!_fileSystem.FileExists(_importFile)) { @@ -117,7 +119,7 @@ namespace Emby.Server.Implementations.Data }, TransactionMode); } - private void ImportUserData(IDatabaseConnection connection, string file) + private void ImportUserData(ManagedConnection connection, string file) { SqliteExtensions.Attach(connection, file, "UserDataBackup"); @@ -300,22 +302,18 @@ namespace Emby.Server.Implementations.Data { using (var connection = CreateConnection(true)) { - return connection.RunInTransaction(db => + using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) { - using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId")) - { - statement.TryBind("@UserId", userId.ToGuidParamValue()); - statement.TryBind("@Key", key); + statement.TryBind("@UserId", userId.ToGuidParamValue()); + statement.TryBind("@Key", key); - foreach (var row in statement.ExecuteQuery()) - { - return ReadRow(row); - } + foreach (var row in statement.ExecuteQuery()) + { + return ReadRow(row); } + } - return null; - - }, ReadTransactionMode); + return null; } } } diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index e478b9d81..92e83f05b 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -51,6 +51,7 @@ + diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 35677813d..f5c4bba50 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -191,7 +191,6 @@ namespace MediaBrowser.Model.Configuration public int SharingExpirationDays { get; set; } public int SchemaVersion { get; set; } - public int SqliteCacheSize { get; set; } public bool EnableAnonymousUsageReporting { get; set; } public bool EnableStandaloneMusicKeys { get; set; } @@ -214,7 +213,6 @@ namespace MediaBrowser.Model.Configuration { LocalNetworkAddresses = new string[] { }; CodecsUsed = new string[] { }; - SqliteCacheSize = 0; ImageExtractionTimeoutMs = 0; EnableLocalizedGuids = true; -- cgit v1.2.3