diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index c1e341973e..d13f3637a8 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Entities /// /// Class BaseItem /// - public abstract class BaseItem : IHasProviderIds + public abstract class BaseItem : IHasProviderIds, ILibraryItem { /// /// MusicAlbums in the library that are the soundtrack for this item diff --git a/MediaBrowser.Controller/Entities/ILibraryItem.cs b/MediaBrowser.Controller/Entities/ILibraryItem.cs new file mode 100644 index 0000000000..b2f39608f3 --- /dev/null +++ b/MediaBrowser.Controller/Entities/ILibraryItem.cs @@ -0,0 +1,28 @@ +using System; + +namespace MediaBrowser.Controller.Entities +{ + /// + /// Interface ILibraryItem + /// + public interface ILibraryItem + { + /// + /// Gets the name. + /// + /// The name. + string Name { get; } + + /// + /// Gets the id. + /// + /// The id. + Guid Id { get; } + + /// + /// Gets the path. + /// + /// The path. + string Path { get; } + } +} diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs index 3bc16a1689..5f0e625371 100644 --- a/MediaBrowser.Controller/Entities/UserItemData.cs +++ b/MediaBrowser.Controller/Entities/UserItemData.cs @@ -14,6 +14,12 @@ namespace MediaBrowser.Controller.Entities /// The user id. public Guid UserId { get; set; } + /// + /// Gets or sets the key. + /// + /// The key. + public string Key { get; set; } + /// /// The _rating /// diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 57219ae513..df777c0ce5 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -90,6 +90,7 @@ + diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 27dc44ee5d..a46b4e219a 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -37,6 +37,13 @@ ..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll + + False + ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.63\lib\net40\ServiceStack.OrmLite.dll + + + ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.63\lib\net40\ServiceStack.OrmLite.SqliteNET.dll + @@ -155,6 +162,7 @@ + diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs index 1d127ae966..4065975afc 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs @@ -16,13 +16,13 @@ namespace MediaBrowser.Server.Implementations.Persistence public class SqliteUserDataRepository : IUserDataRepository { private readonly ILogger _logger; - + private readonly ConcurrentDictionary _userData = new ConcurrentDictionary(); private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1); private SQLiteConnection _connection; - + /// /// Gets the name of the repository /// @@ -75,20 +75,28 @@ namespace MediaBrowser.Server.Implementations.Persistence /// Task. public async Task Initialize() { - var dbFile = Path.Combine(_appPaths.DataPath, "userdata.db"); + var dbFile = Path.Combine(_appPaths.DataPath, "userdata_v2.db"); _connection = await SqliteExtensions.ConnectToDb(dbFile).ConfigureAwait(false); string[] queries = { - "create table if not exists userdata (key nvarchar, userId GUID, data BLOB)", + "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 unique index if not exists userdataindex on userdata (key, userId)", - "create table if not exists schema_version (table_name primary key, version)", + //pragmas "pragma temp_store = memory" }; _connection.RunQueries(queries, _logger); + + var oldFile = Path.Combine(_appPaths.DataPath, "userdata.db"); + + if (File.Exists(oldFile)) + { + await UserDataMigration.Migrate(oldFile, _connection, _logger, _jsonSerializer).ConfigureAwait(false); + } } /// @@ -167,10 +175,6 @@ namespace MediaBrowser.Server.Implementations.Persistence { cancellationToken.ThrowIfCancellationRequested(); - var serialized = _jsonSerializer.SerializeToBytes(userData); - - cancellationToken.ThrowIfCancellationRequested(); - await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); SQLiteTransaction transaction = null; @@ -181,11 +185,18 @@ namespace MediaBrowser.Server.Implementations.Persistence using (var cmd = _connection.CreateCommand()) { - cmd.CommandText = "replace into userdata (key, userId, data) values (@1, @2, @3)"; - cmd.AddParam("@1", key); - cmd.AddParam("@2", userId); - cmd.AddParam("@3", serialized); + cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate)"; + cmd.AddParam("@key", key); + cmd.AddParam("@userId", userId); + + cmd.AddParam("@rating", userData.Rating); + cmd.AddParam("@played", userData.Played); + cmd.AddParam("@playCount", userData.PlayCount); + cmd.AddParam("@isFavorite", userData.IsFavorite); + cmd.AddParam("@playbackPositionTicks", userData.PlaybackPositionTicks); + cmd.AddParam("@lastPlayedDate", userData.LastPlayedDate); + cmd.Transaction = transaction; await cmd.ExecuteNonQueryAsync(cancellationToken); @@ -259,7 +270,7 @@ namespace MediaBrowser.Server.Implementations.Persistence { using (var cmd = _connection.CreateCommand()) { - cmd.CommandText = "select data from userdata where key = @key and userId=@userId"; + cmd.CommandText = "select rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate from userdata where key = @key and userId=@userId"; var idParam = cmd.Parameters.Add("@key", DbType.String); idParam.Value = key; @@ -267,18 +278,34 @@ namespace MediaBrowser.Server.Implementations.Persistence var userIdParam = cmd.Parameters.Add("@userId", DbType.Guid); userIdParam.Value = userId; + var userData = new UserItemData + { + UserId = userId, + Key = key + }; + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) { if (reader.Read()) { - using (var stream = reader.GetMemoryStream(0)) + if (!reader.IsDBNull(0)) { - return _jsonSerializer.DeserializeFromStream(stream); + userData.Rating = reader.GetDouble(0); + } + + userData.Played = reader.GetBoolean(1); + userData.PlayCount = reader.GetInt32(2); + userData.IsFavorite = reader.GetBoolean(3); + userData.PlaybackPositionTicks = reader.GetInt64(4); + + if (!reader.IsDBNull(5)) + { + userData.LastPlayedDate = reader.GetDateTime(5); } } } - return new UserItemData(); + return userData; } } diff --git a/MediaBrowser.Server.Implementations/Persistence/UserDataMigration.cs b/MediaBrowser.Server.Implementations/Persistence/UserDataMigration.cs new file mode 100644 index 0000000000..e06fd14953 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Persistence/UserDataMigration.cs @@ -0,0 +1,137 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Serialization; +using System; +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.Persistence +{ + public static class UserDataMigration + { + /// + /// Migrates the specified old file. + /// + /// The old file. + /// The new database. + /// The logger. + /// The json. + /// Task. + public static async Task Migrate(string oldFile, IDbConnection newDatabase, ILogger logger, IJsonSerializer json) + { + var oldDb = await SqliteExtensions.ConnectToDb(oldFile).ConfigureAwait(false); + + using (oldDb) + { + IDbTransaction transaction = null; + + var data = GetAllUserData(oldDb, json).ToList(); + + try + { + transaction = newDatabase.BeginTransaction(); + + foreach (var userdata in data) + { + PersistUserData(userdata, newDatabase, transaction); + } + + 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(); + } + } + } + + File.Move(oldFile, Path.Combine(Path.GetDirectoryName(oldFile), "userdata_v1.db")); + } + + /// + /// Gets all user data. + /// + /// The old database. + /// The json serializer. + /// IEnumerable{UserItemData}. + private static IEnumerable GetAllUserData(IDbConnection oldDatabase, IJsonSerializer jsonSerializer) + { + using (var cmd = oldDatabase.CreateCommand()) + { + cmd.CommandText = "select userId,key,data from userdata"; + + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) + { + while (reader.Read()) + { + var userId = reader.GetGuid(0); + var key = reader.GetString(1); + + using (var stream = reader.GetMemoryStream(2)) + { + var userData = jsonSerializer.DeserializeFromStream(stream); + + userData.UserId = userId; + userData.Key = key; + + yield return userData; + } + } + } + } + } + + /// + /// Persists the user data. + /// + /// The user data. + /// The database. + /// The transaction. + private static void PersistUserData(UserItemData userData, IDbConnection database, IDbTransaction transaction) + { + using (var cmd = database.CreateCommand()) + { + cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate)"; + + cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userData.Key; + cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userData.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.Transaction = transaction; + + cmd.ExecuteNonQuery(); + } + } + + } +} diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index d4d92f09fc..6dfb01cc0f 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -9,6 +9,7 @@ +