diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs index 1f194968c8..02d7cb31fd 100644 --- a/Emby.Common.Implementations/BaseApplicationHost.cs +++ b/Emby.Common.Implementations/BaseApplicationHost.cs @@ -4,7 +4,6 @@ using Emby.Common.Implementations.Devices; using Emby.Common.Implementations.IO; using Emby.Common.Implementations.ScheduledTasks; using Emby.Common.Implementations.Serialization; -using Emby.Common.Implementations.Updates; using MediaBrowser.Common.Net; using MediaBrowser.Common.Plugins; using MediaBrowser.Common.Progress; diff --git a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs index bd2cb7cf0b..7a92f02d6b 100644 --- a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs +++ b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs @@ -22,5 +22,10 @@ namespace Emby.Common.Implementations.Reflection #endif return type.GetTypeInfo().Assembly.GetManifestResourceNames(); } + + public Assembly[] GetCurrentAssemblies() + { + return AppDomain.CurrentDomain.GetAssemblies(); + } } } diff --git a/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs b/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs index 218af7ed54..b0153c5882 100644 --- a/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs +++ b/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs @@ -55,25 +55,6 @@ namespace Emby.Common.Implementations.ScheduledTasks private ILogger Logger { get; set; } private readonly IFileSystem _fileSystem; - private bool _suspendTriggers; - - public bool SuspendTriggers - { - get { return _suspendTriggers; } - set - { - Logger.Info("Setting SuspendTriggers to {0}", value); - var executeQueued = _suspendTriggers && !value; - - _suspendTriggers = value; - - if (executeQueued) - { - ExecuteQueuedTasks(); - } - } - } - /// /// Initializes a new instance of the class. /// @@ -230,7 +211,7 @@ namespace Emby.Common.Implementations.ScheduledTasks lock (_taskQueue) { - if (task.State == TaskState.Idle && !SuspendTriggers) + if (task.State == TaskState.Idle) { Execute(task, options); return; @@ -322,11 +303,6 @@ namespace Emby.Common.Implementations.ScheduledTasks /// private void ExecuteQueuedTasks() { - if (SuspendTriggers) - { - return; - } - Logger.Info("ExecuteQueuedTasks"); // Execute queued tasks diff --git a/Emby.Common.Implementations/project.json b/Emby.Common.Implementations/project.json index b0a35bdf38..409687ea16 100644 --- a/Emby.Common.Implementations/project.json +++ b/Emby.Common.Implementations/project.json @@ -14,6 +14,7 @@ "System.Net.Http": "4.0.0.0", "System.Net.Primitives": "4.0.0.0", "System.Net.Http.WebRequest": "4.0.0.0", + "System.Reflection": "4.0.0.0", "System.Runtime": "4.0.0.0", "System.Runtime.Extensions": "4.0.0.0", "System.Text.Encoding": "4.0.0.0", @@ -57,6 +58,7 @@ "ServiceStack.Text.Core": "1.0.27", "NLog": "4.4.0-betaV15", "sharpcompress": "0.14.0", + "System.AppDomain": "2.0.11", "MediaBrowser.Model": { "target": "project" }, diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 8a62a9b27a..6b3ca940b6 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -65,7 +65,6 @@ using Emby.Common.Implementations.Networking; using Emby.Common.Implementations.Reflection; using Emby.Common.Implementations.Serialization; using Emby.Common.Implementations.TextEncoding; -using Emby.Common.Implementations.Updates; using Emby.Common.Implementations.Xml; using Emby.Photos; using MediaBrowser.Model.IO; @@ -87,13 +86,13 @@ using Emby.Server.Implementations.Activity; using Emby.Server.Core.Configuration; using Emby.Server.Core.Data; using Emby.Server.Implementations.Devices; -using Emby.Server.Core.FFMpeg; +using Emby.Server.Implementations.FFMpeg; using Emby.Server.Core.IO; using Emby.Server.Core.Localization; -using Emby.Server.Core.Migrations; +using Emby.Server.Implementations.Migrations; using Emby.Server.Implementations.Security; using Emby.Server.Implementations.Social; -using Emby.Server.Core.Sync; +using Emby.Server.Implementations.Sync; using Emby.Server.Implementations.Channels; using Emby.Server.Implementations.Collections; using Emby.Server.Implementations.Connect; @@ -109,7 +108,7 @@ using Emby.Server.Implementations.MediaEncoder; using Emby.Server.Implementations.Notifications; using Emby.Server.Implementations.Data; using Emby.Server.Implementations.Playlists; -using Emby.Server.Implementations.Security; +using Emby.Server.Implementations; using Emby.Server.Implementations.ServerManager; using Emby.Server.Implementations.Session; using Emby.Server.Implementations.Social; @@ -357,12 +356,6 @@ namespace Emby.Server.Core { await PerformPreInitMigrations().ConfigureAwait(false); - if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion && - ServerConfigurationManager.Configuration.IsStartupWizardCompleted) - { - TaskManager.SuspendTriggers = true; - } - await base.RunStartupTasks().ConfigureAwait(false); await MediaEncoder.Init().ConfigureAwait(false); @@ -494,7 +487,6 @@ namespace Emby.Server.Core { var migrations = new List { - new DbMigration(ServerConfigurationManager, TaskManager) }; foreach (var task in migrations) @@ -552,23 +544,23 @@ namespace Emby.Server.Core UserDataManager = new UserDataManager(LogManager, ServerConfigurationManager); RegisterSingleInstance(UserDataManager); - UserRepository = await GetUserRepository().ConfigureAwait(false); + UserRepository = GetUserRepository(); var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LogManager.GetLogger("SqliteDisplayPreferencesRepository"), JsonSerializer, ApplicationPaths, MemoryStreamFactory); DisplayPreferencesRepository = displayPreferencesRepo; RegisterSingleInstance(DisplayPreferencesRepository); - var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager, GetDbConnector(), MemoryStreamFactory); + var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager, GetDbConnector(), MemoryStreamFactory, assemblyInfo); ItemRepository = itemRepo; RegisterSingleInstance(ItemRepository); - FileOrganizationRepository = await GetFileOrganizationRepository().ConfigureAwait(false); + FileOrganizationRepository = GetFileOrganizationRepository(); RegisterSingleInstance(FileOrganizationRepository); AuthenticationRepository = await GetAuthenticationRepository().ConfigureAwait(false); RegisterSingleInstance(AuthenticationRepository); - SyncRepository = await GetSyncRepository().ConfigureAwait(false); + SyncRepository = GetSyncRepository(); RegisterSingleInstance(SyncRepository); UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService, () => ConnectManager, this, JsonSerializer, FileSystemManager, CryptographyProvider, _defaultUserNameFactory()); @@ -591,7 +583,7 @@ namespace Emby.Server.Core CertificatePath = GetCertificatePath(true); Certificate = GetCertificate(CertificatePath); - HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamFactory, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate); + HttpServer = HttpServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, MemoryStreamFactory, "Emby", "web/index.html", textEncoding, SocketFactory, CryptographyProvider, JsonSerializer, XmlSerializer, EnvironmentInfo, Certificate, SupportsDualModeSockets); HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading"); RegisterSingleInstance(HttpServer, false); progress.Report(10); @@ -714,6 +706,8 @@ namespace Emby.Server.Core await ((UserManager)UserManager).Initialize().ConfigureAwait(false); } + protected abstract bool SupportsDualModeSockets { get; } + private ICertificate GetCertificate(string certificateLocation) { if (string.IsNullOrWhiteSpace(certificateLocation)) @@ -804,11 +798,11 @@ namespace Emby.Server.Core /// Gets the user repository. /// /// Task{IUserRepository}. - private async Task GetUserRepository() + private IUserRepository GetUserRepository() { - var repo = new SqliteUserRepository(LogManager, ApplicationPaths, JsonSerializer, GetDbConnector(), MemoryStreamFactory); + var repo = new SqliteUserRepository(LogManager.GetLogger("SqliteUserRepository"), ApplicationPaths, JsonSerializer, MemoryStreamFactory); - await repo.Initialize().ConfigureAwait(false); + repo.Initialize(); return repo; } @@ -817,11 +811,11 @@ namespace Emby.Server.Core /// Gets the file organization repository. /// /// Task{IUserRepository}. - private async Task GetFileOrganizationRepository() + private IFileOrganizationRepository GetFileOrganizationRepository() { - var repo = new SqliteFileOrganizationRepository(LogManager, ServerConfigurationManager.ApplicationPaths, GetDbConnector()); + var repo = new SqliteFileOrganizationRepository(LogManager.GetLogger("SqliteFileOrganizationRepository"), ServerConfigurationManager.ApplicationPaths); - await repo.Initialize().ConfigureAwait(false); + repo.Initialize(); return repo; } @@ -844,11 +838,11 @@ namespace Emby.Server.Core return repo; } - private async Task GetSyncRepository() + private ISyncRepository GetSyncRepository() { - var repo = new SyncRepository(LogManager, JsonSerializer, ServerConfigurationManager.ApplicationPaths, GetDbConnector()); + var repo = new SyncRepository(LogManager.GetLogger("SyncRepository"), JsonSerializer, ServerConfigurationManager.ApplicationPaths); - await repo.Initialize().ConfigureAwait(false); + repo.Initialize(); return repo; } diff --git a/Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs deleted file mode 100644 index a858db28a7..0000000000 --- a/Emby.Server.Core/Data/SqliteFileOrganizationRepository.cs +++ /dev/null @@ -1,408 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Model.FileOrganization; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Querying; - -namespace Emby.Server.Core.Data -{ - public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable - { - private readonly CultureInfo _usCulture = new CultureInfo("en-US"); - - public SqliteFileOrganizationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector) : base(logManager, connector) - { - DbFilePath = Path.Combine(appPaths.DataPath, "fileorganization.db"); - } - - /// - /// Opens the connection to the database - /// - /// Task. - public async Task Initialize() - { - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - string[] queries = { - - "create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)", - "create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)" - }; - - connection.RunQueries(queries, Logger); - } - } - - public async Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken) - { - if (result == null) - { - throw new ArgumentNullException("result"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var saveResultCommand = connection.CreateCommand()) - { - saveResultCommand.CommandText = "replace into FileOrganizerResults (ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths) values (@ResultId, @OriginalPath, @TargetPath, @FileLength, @OrganizationDate, @Status, @OrganizationType, @StatusMessage, @ExtractedName, @ExtractedYear, @ExtractedSeasonNumber, @ExtractedEpisodeNumber, @ExtractedEndingEpisodeNumber, @DuplicatePaths)"; - - saveResultCommand.Parameters.Add(saveResultCommand, "@ResultId"); - saveResultCommand.Parameters.Add(saveResultCommand, "@OriginalPath"); - saveResultCommand.Parameters.Add(saveResultCommand, "@TargetPath"); - saveResultCommand.Parameters.Add(saveResultCommand, "@FileLength"); - saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationDate"); - saveResultCommand.Parameters.Add(saveResultCommand, "@Status"); - saveResultCommand.Parameters.Add(saveResultCommand, "@OrganizationType"); - saveResultCommand.Parameters.Add(saveResultCommand, "@StatusMessage"); - saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedName"); - saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedYear"); - saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedSeasonNumber"); - saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEpisodeNumber"); - saveResultCommand.Parameters.Add(saveResultCommand, "@ExtractedEndingEpisodeNumber"); - saveResultCommand.Parameters.Add(saveResultCommand, "@DuplicatePaths"); - - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - var index = 0; - - saveResultCommand.GetParameter(index++).Value = new Guid(result.Id); - saveResultCommand.GetParameter(index++).Value = result.OriginalPath; - saveResultCommand.GetParameter(index++).Value = result.TargetPath; - saveResultCommand.GetParameter(index++).Value = result.FileSize; - saveResultCommand.GetParameter(index++).Value = result.Date; - saveResultCommand.GetParameter(index++).Value = result.Status.ToString(); - saveResultCommand.GetParameter(index++).Value = result.Type.ToString(); - saveResultCommand.GetParameter(index++).Value = result.StatusMessage; - saveResultCommand.GetParameter(index++).Value = result.ExtractedName; - saveResultCommand.GetParameter(index++).Value = result.ExtractedYear; - saveResultCommand.GetParameter(index++).Value = result.ExtractedSeasonNumber; - saveResultCommand.GetParameter(index++).Value = result.ExtractedEpisodeNumber; - saveResultCommand.GetParameter(index++).Value = result.ExtractedEndingEpisodeNumber; - saveResultCommand.GetParameter(index).Value = string.Join("|", result.DuplicatePaths.ToArray()); - - saveResultCommand.Transaction = transaction; - - saveResultCommand.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save FileOrganizationResult:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - - public async Task Delete(string id) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentNullException("id"); - } - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var deleteResultCommand = connection.CreateCommand()) - { - deleteResultCommand.CommandText = "delete from FileOrganizerResults where ResultId = @ResultId"; - - deleteResultCommand.Parameters.Add(deleteResultCommand, "@ResultId"); - - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - deleteResultCommand.GetParameter(0).Value = new Guid(id); - - deleteResultCommand.Transaction = transaction; - - deleteResultCommand.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to delete FileOrganizationResult:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - - public async Task DeleteAll() - { - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "delete from FileOrganizerResults"; - - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to delete results", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - - public QueryResult GetResults(FileOrganizationResultQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults"; - - if (query.StartIndex.HasValue && query.StartIndex.Value > 0) - { - cmd.CommandText += string.Format(" WHERE ResultId NOT IN (SELECT ResultId FROM FileOrganizerResults ORDER BY OrganizationDate desc LIMIT {0})", - query.StartIndex.Value.ToString(_usCulture)); - } - - cmd.CommandText += " ORDER BY OrganizationDate desc"; - - if (query.Limit.HasValue) - { - cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); - } - - cmd.CommandText += "; select count (ResultId) from FileOrganizerResults"; - - var list = new List(); - var count = 0; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - while (reader.Read()) - { - list.Add(GetResult(reader)); - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - } - - public FileOrganizationResult GetResult(string id) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentNullException("id"); - } - - using (var connection = CreateConnection(true).Result) - { - var guid = new Guid(id); - - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@Id"; - - cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return GetResult(reader); - } - } - } - - return null; - } - } - - public FileOrganizationResult GetResult(IDataReader reader) - { - var index = 0; - - var result = new FileOrganizationResult - { - Id = reader.GetGuid(0).ToString("N") - }; - - index++; - if (!reader.IsDBNull(index)) - { - result.OriginalPath = reader.GetString(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.TargetPath = reader.GetString(index); - } - - index++; - result.FileSize = reader.GetInt64(index); - - index++; - result.Date = reader.GetDateTime(index).ToUniversalTime(); - - index++; - result.Status = (FileSortingStatus)Enum.Parse(typeof(FileSortingStatus), reader.GetString(index), true); - - index++; - result.Type = (FileOrganizerType)Enum.Parse(typeof(FileOrganizerType), reader.GetString(index), true); - - index++; - if (!reader.IsDBNull(index)) - { - result.StatusMessage = reader.GetString(index); - } - - result.OriginalFileName = Path.GetFileName(result.OriginalPath); - - index++; - if (!reader.IsDBNull(index)) - { - result.ExtractedName = reader.GetString(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.ExtractedYear = reader.GetInt32(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.ExtractedSeasonNumber = reader.GetInt32(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.ExtractedEpisodeNumber = reader.GetInt32(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.ExtractedEndingEpisodeNumber = reader.GetInt32(index); - } - - index++; - if (!reader.IsDBNull(index)) - { - result.DuplicatePaths = reader.GetString(index).Split('|').Where(i => !string.IsNullOrEmpty(i)).ToList(); - } - - return result; - } - } -} diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs index ed03c0f676..5b8f180881 100644 --- a/Emby.Server.Core/Data/SqliteItemRepository.cs +++ b/Emby.Server.Core/Data/SqliteItemRepository.cs @@ -28,6 +28,8 @@ 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 { @@ -38,7 +40,7 @@ namespace Emby.Server.Core.Data { private IDbConnection _connection; - private readonly TypeMapper _typeMapper = new TypeMapper(); + private readonly TypeMapper _typeMapper; /// /// Gets the name of the repository @@ -95,7 +97,7 @@ namespace Emby.Server.Core.Data /// /// Initializes a new instance of the class. /// - public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector, IMemoryStreamFactory memoryStreamProvider) + public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager, IDbConnector connector, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo) : base(logManager, connector) { if (config == null) @@ -110,6 +112,7 @@ namespace Emby.Server.Core.Data _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"); @@ -3060,18 +3063,6 @@ namespace Emby.Server.Core.Data { //whereClauses.Add("(UserId is null or UserId=@UserId)"); } - if (query.IsCurrentSchema.HasValue) - { - if (query.IsCurrentSchema.Value) - { - whereClauses.Add("(SchemaVersion not null AND SchemaVersion=@SchemaVersion)"); - } - else - { - whereClauses.Add("(SchemaVersion is null or SchemaVersion<>@SchemaVersion)"); - } - cmd.Parameters.Add(cmd, "@SchemaVersion", DbType.Int32).Value = LatestSchemaVersion; - } if (query.IsHD.HasValue) { whereClauses.Add("IsHD=@IsHD"); @@ -3454,7 +3445,7 @@ namespace Emby.Server.Core.Data cmd.Parameters.Add(cmd, "@NameLessThan", DbType.String).Value = query.NameLessThan.ToLower(); } - if (query.ImageTypes.Length > 0 && _config.Configuration.SchemaVersion >= 87) + if (query.ImageTypes.Length > 0) { foreach (var requiredImage in query.ImageTypes) { @@ -3738,15 +3729,8 @@ namespace Emby.Server.Core.Data } if (query.IsVirtualItem.HasValue) { - if (_config.Configuration.SchemaVersion >= 90) - { - whereClauses.Add("IsVirtualItem=@IsVirtualItem"); - cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value; - } - else if (!query.IsVirtualItem.Value) - { - whereClauses.Add("LocationType<>'Virtual'"); - } + whereClauses.Add("IsVirtualItem=@IsVirtualItem"); + cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value; } if (query.IsSpecialSeason.HasValue) { @@ -3770,7 +3754,7 @@ namespace Emby.Server.Core.Data whereClauses.Add("PremiereDate < DATETIME('now')"); } } - if (query.IsMissing.HasValue && _config.Configuration.SchemaVersion >= 90) + if (query.IsMissing.HasValue) { if (query.IsMissing.Value) { @@ -3781,7 +3765,7 @@ namespace Emby.Server.Core.Data whereClauses.Add("(IsVirtualItem=0 OR PremiereDate >= DATETIME('now'))"); } } - if (query.IsVirtualUnaired.HasValue && _config.Configuration.SchemaVersion >= 90) + if (query.IsVirtualUnaired.HasValue) { if (query.IsVirtualUnaired.Value) { diff --git a/Emby.Server.Core/Data/SqliteUserRepository.cs b/Emby.Server.Core/Data/SqliteUserRepository.cs deleted file mode 100644 index 54851fffbf..0000000000 --- a/Emby.Server.Core/Data/SqliteUserRepository.cs +++ /dev/null @@ -1,237 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.IO; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Model.IO; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Serialization; - -namespace Emby.Server.Core.Data -{ - /// - /// Class SQLiteUserRepository - /// - public class SqliteUserRepository : BaseSqliteRepository, IUserRepository - { - private readonly IJsonSerializer _jsonSerializer; - private readonly IMemoryStreamFactory _memoryStreamProvider; - - public SqliteUserRepository(ILogManager logManager, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer, IDbConnector dbConnector, IMemoryStreamFactory memoryStreamProvider) : base(logManager, dbConnector) - { - _jsonSerializer = jsonSerializer; - _memoryStreamProvider = memoryStreamProvider; - - DbFilePath = Path.Combine(appPaths.DataPath, "users.db"); - } - - /// - /// Gets the name of the repository - /// - /// The name. - public string Name - { - get - { - return "SQLite"; - } - } - - /// - /// Opens the connection to the database - /// - /// Task. - public async Task Initialize() - { - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - string[] queries = { - - "create table if not exists users (guid GUID primary key, data BLOB)", - "create index if not exists idx_users on users(guid)", - "create table if not exists schema_version (table_name primary key, version)", - - "pragma shrink_memory" - }; - - connection.RunQueries(queries, Logger); - } - } - - /// - /// Save a user in the repo - /// - /// The user. - /// The cancellation token. - /// Task. - /// user - public async Task SaveUser(User user, CancellationToken cancellationToken) - { - if (user == null) - { - throw new ArgumentNullException("user"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - var serialized = _jsonSerializer.SerializeToBytes(user, _memoryStreamProvider); - - cancellationToken.ThrowIfCancellationRequested(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "replace into users (guid, data) values (@1, @2)"; - cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = user.Id; - cmd.Parameters.Add(cmd, "@2", DbType.Binary).Value = serialized; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save user:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - - /// - /// Retrieve all users from the database - /// - /// IEnumerable{User}. - public IEnumerable RetrieveAllUsers() - { - var list = new List(); - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "select guid,data from users"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) - { - while (reader.Read()) - { - var id = reader.GetGuid(0); - - using (var stream = reader.GetMemoryStream(1, _memoryStreamProvider)) - { - var user = _jsonSerializer.DeserializeFromStream(stream); - user.Id = id; - list.Add(user); - } - } - } - } - } - - return list; - } - - /// - /// Deletes the user. - /// - /// The user. - /// The cancellation token. - /// Task. - /// user - public async Task DeleteUser(User user, CancellationToken cancellationToken) - { - if (user == null) - { - throw new ArgumentNullException("user"); - } - - cancellationToken.ThrowIfCancellationRequested(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "delete from users where guid=@guid"; - - cmd.Parameters.Add(cmd, "@guid", DbType.Guid).Value = user.Id; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to delete user:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } -} \ No newline at end of file diff --git a/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs index c1a19a71fa..11e275940d 100644 --- a/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs +++ b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs @@ -95,7 +95,7 @@ namespace Emby.Server.Core.EntryPoints NatUtility.StartDiscovery(); - _timer = _timerFactory.Create(ClearCreatedRules, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5)); + _timer = _timerFactory.Create(ClearCreatedRules, null, TimeSpan.FromMinutes(10), TimeSpan.FromMinutes(10)); _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered; @@ -233,6 +233,7 @@ namespace Emby.Server.Core.EntryPoints await device.CreatePortMap(new Mapping(Protocol.Tcp, privatePort, publicPort) { Description = _appHost.Name + }).ConfigureAwait(false); } catch (Exception ex) diff --git a/Emby.Server.Core/HttpServerFactory.cs b/Emby.Server.Core/HttpServerFactory.cs index d6c07e2581..8ec5fb0269 100644 --- a/Emby.Server.Core/HttpServerFactory.cs +++ b/Emby.Server.Core/HttpServerFactory.cs @@ -44,7 +44,8 @@ namespace Emby.Server.Core IJsonSerializer json, IXmlSerializer xml, IEnvironmentInfo environment, - ICertificate certificate) + ICertificate certificate, + bool enableDualModeSockets) { var logger = logManager.GetLogger("HttpServer"); @@ -63,7 +64,8 @@ namespace Emby.Server.Core environment, certificate, new StreamFactory(), - GetParseFn); + GetParseFn, + enableDualModeSockets); } private static Func GetParseFn(Type propertyType) diff --git a/Emby.Server.Core/Migrations/DbMigration.cs b/Emby.Server.Core/Migrations/DbMigration.cs deleted file mode 100644 index 5d652770f8..0000000000 --- a/Emby.Server.Core/Migrations/DbMigration.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Threading.Tasks; -using Emby.Server.Implementations.Data; -using MediaBrowser.Controller.Configuration; -using MediaBrowser.Model.Tasks; -using Emby.Server.Core.Data; -using Emby.Server.Implementations.Migrations; - -namespace Emby.Server.Core.Migrations -{ - public class DbMigration : IVersionMigration - { - private readonly IServerConfigurationManager _config; - private readonly ITaskManager _taskManager; - - public DbMigration(IServerConfigurationManager config, ITaskManager taskManager) - { - _config = config; - _taskManager = taskManager; - } - - public async Task Run() - { - // If a forced migration is required, do that now - if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion) - { - if (!_config.Configuration.IsStartupWizardCompleted) - { - _config.Configuration.MigrationVersion = CleanDatabaseScheduledTask.MigrationVersion; - _config.SaveConfiguration(); - return; - } - - _taskManager.SuspendTriggers = true; - CleanDatabaseScheduledTask.EnableUnavailableMessage = true; - - Task.Run(async () => - { - await Task.Delay(1000).ConfigureAwait(false); - - _taskManager.Execute(); - }); - - return; - } - - if (_config.Configuration.SchemaVersion < SqliteItemRepository.LatestSchemaVersion) - { - if (!_config.Configuration.IsStartupWizardCompleted) - { - _config.Configuration.SchemaVersion = SqliteItemRepository.LatestSchemaVersion; - _config.SaveConfiguration(); - return; - } - - Task.Run(async () => - { - await Task.Delay(1000).ConfigureAwait(false); - - _taskManager.Execute(); - }); - } - } - } -} diff --git a/Emby.Server.Core/Sync/SyncRepository.cs b/Emby.Server.Core/Sync/SyncRepository.cs deleted file mode 100644 index bfcf76767c..0000000000 --- a/Emby.Server.Core/Sync/SyncRepository.cs +++ /dev/null @@ -1,976 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Emby.Server.Core.Data; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Sync; -using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Querying; -using MediaBrowser.Model.Serialization; -using MediaBrowser.Model.Sync; - -namespace Emby.Server.Core.Sync -{ - public class SyncRepository : BaseSqliteRepository, ISyncRepository - { - private readonly CultureInfo _usCulture = new CultureInfo("en-US"); - - private readonly IJsonSerializer _json; - - public SyncRepository(ILogManager logManager, IJsonSerializer json, IServerApplicationPaths appPaths, IDbConnector connector) - : base(logManager, connector) - { - _json = json; - DbFilePath = Path.Combine(appPaths.DataPath, "sync14.db"); - } - - private class SyncSummary - { - public Dictionary Items { get; set; } - - public SyncSummary() - { - Items = new Dictionary(); - } - } - - - public async Task Initialize() - { - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - 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)", - - "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT, ItemDateModifiedTicks BIGINT)", - - "drop index if exists idx_SyncJobItems2", - "drop index if exists idx_SyncJobItems3", - "drop index if exists idx_SyncJobs1", - "drop index if exists idx_SyncJobs", - "drop index if exists idx_SyncJobItems1", - "create index if not exists idx_SyncJobItems4 on SyncJobItems(TargetId,ItemId,Status,Progress,DateCreated)", - "create index if not exists idx_SyncJobItems5 on SyncJobItems(TargetId,Status,ItemId,Progress)", - - "create index if not exists idx_SyncJobs2 on SyncJobs(TargetId,Status,ItemIds,Progress)", - - "pragma shrink_memory" - }; - - connection.RunQueries(queries, Logger); - - connection.AddColumn(Logger, "SyncJobs", "Profile", "TEXT"); - connection.AddColumn(Logger, "SyncJobs", "Bitrate", "INT"); - connection.AddColumn(Logger, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT"); - } - } - - 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"; - - public SyncJob GetJob(string id) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentNullException("id"); - } - - CheckDisposed(); - - var guid = new Guid(id); - - if (guid == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = BaseJobSelectText + " where Id=@Id"; - - cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return GetJob(reader); - } - } - } - - return null; - } - } - - private SyncJob GetJob(IDataReader reader) - { - var info = new SyncJob - { - Id = reader.GetGuid(0).ToString("N"), - TargetId = reader.GetString(1), - Name = reader.GetString(2) - }; - - if (!reader.IsDBNull(3)) - { - info.Profile = reader.GetString(3); - } - - if (!reader.IsDBNull(4)) - { - info.Quality = reader.GetString(4); - } - - if (!reader.IsDBNull(5)) - { - info.Bitrate = reader.GetInt32(5); - } - - if (!reader.IsDBNull(6)) - { - info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(6), true); - } - - if (!reader.IsDBNull(7)) - { - info.Progress = reader.GetDouble(7); - } - - if (!reader.IsDBNull(8)) - { - info.UserId = reader.GetString(8); - } - - if (!reader.IsDBNull(9)) - { - info.RequestedItemIds = reader.GetString(9).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); - } - - if (!reader.IsDBNull(10)) - { - info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader.GetString(10), true); - } - - if (!reader.IsDBNull(11)) - { - info.ParentId = reader.GetString(11); - } - - if (!reader.IsDBNull(12)) - { - info.UnwatchedOnly = reader.GetBoolean(12); - } - - if (!reader.IsDBNull(13)) - { - info.ItemLimit = reader.GetInt32(13); - } - - info.SyncNewContent = reader.GetBoolean(14); - - info.DateCreated = reader.GetDateTime(15).ToUniversalTime(); - info.DateLastModified = reader.GetDateTime(16).ToUniversalTime(); - info.ItemCount = reader.GetInt32(17); - - return info; - } - - public Task Create(SyncJob job) - { - return InsertOrUpdate(job, true); - } - - public Task Update(SyncJob job) - { - return InsertOrUpdate(job, false); - } - - private async Task InsertOrUpdate(SyncJob job, bool insert) - { - if (job == null) - { - throw new ArgumentNullException("job"); - } - - CheckDisposed(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var cmd = connection.CreateCommand()) - { - if (insert) - { - cmd.CommandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Profile, @Quality, @Bitrate, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)"; - - cmd.Parameters.Add(cmd, "@Id"); - cmd.Parameters.Add(cmd, "@TargetId"); - cmd.Parameters.Add(cmd, "@Name"); - cmd.Parameters.Add(cmd, "@Profile"); - cmd.Parameters.Add(cmd, "@Quality"); - cmd.Parameters.Add(cmd, "@Bitrate"); - cmd.Parameters.Add(cmd, "@Status"); - cmd.Parameters.Add(cmd, "@Progress"); - cmd.Parameters.Add(cmd, "@UserId"); - cmd.Parameters.Add(cmd, "@ItemIds"); - cmd.Parameters.Add(cmd, "@Category"); - cmd.Parameters.Add(cmd, "@ParentId"); - cmd.Parameters.Add(cmd, "@UnwatchedOnly"); - cmd.Parameters.Add(cmd, "@ItemLimit"); - cmd.Parameters.Add(cmd, "@SyncNewContent"); - cmd.Parameters.Add(cmd, "@DateCreated"); - cmd.Parameters.Add(cmd, "@DateLastModified"); - cmd.Parameters.Add(cmd, "@ItemCount"); - } - else - { - cmd.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Profile=@Profile,Quality=@Quality,Bitrate=@Bitrate,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@Id"; - - cmd.Parameters.Add(cmd, "@Id"); - cmd.Parameters.Add(cmd, "@TargetId"); - cmd.Parameters.Add(cmd, "@Name"); - cmd.Parameters.Add(cmd, "@Profile"); - cmd.Parameters.Add(cmd, "@Quality"); - cmd.Parameters.Add(cmd, "@Bitrate"); - cmd.Parameters.Add(cmd, "@Status"); - cmd.Parameters.Add(cmd, "@Progress"); - cmd.Parameters.Add(cmd, "@UserId"); - cmd.Parameters.Add(cmd, "@ItemIds"); - cmd.Parameters.Add(cmd, "@Category"); - cmd.Parameters.Add(cmd, "@ParentId"); - cmd.Parameters.Add(cmd, "@UnwatchedOnly"); - cmd.Parameters.Add(cmd, "@ItemLimit"); - cmd.Parameters.Add(cmd, "@SyncNewContent"); - cmd.Parameters.Add(cmd, "@DateCreated"); - cmd.Parameters.Add(cmd, "@DateLastModified"); - cmd.Parameters.Add(cmd, "@ItemCount"); - } - - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - var index = 0; - - cmd.GetParameter(index++).Value = new Guid(job.Id); - cmd.GetParameter(index++).Value = job.TargetId; - cmd.GetParameter(index++).Value = job.Name; - cmd.GetParameter(index++).Value = job.Profile; - cmd.GetParameter(index++).Value = job.Quality; - cmd.GetParameter(index++).Value = job.Bitrate; - cmd.GetParameter(index++).Value = job.Status.ToString(); - cmd.GetParameter(index++).Value = job.Progress; - cmd.GetParameter(index++).Value = job.UserId; - cmd.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray()); - cmd.GetParameter(index++).Value = job.Category; - cmd.GetParameter(index++).Value = job.ParentId; - cmd.GetParameter(index++).Value = job.UnwatchedOnly; - cmd.GetParameter(index++).Value = job.ItemLimit; - cmd.GetParameter(index++).Value = job.SyncNewContent; - cmd.GetParameter(index++).Value = job.DateCreated; - cmd.GetParameter(index++).Value = job.DateLastModified; - cmd.GetParameter(index++).Value = job.ItemCount; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save record:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - - public async Task DeleteJob(string id) - { - if (string.IsNullOrWhiteSpace(id)) - { - throw new ArgumentNullException("id"); - } - - CheckDisposed(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var deleteJobCommand = connection.CreateCommand()) - { - using (var deleteJobItemsCommand = connection.CreateCommand()) - { - IDbTransaction transaction = null; - - try - { - // _deleteJobCommand - deleteJobCommand.CommandText = "delete from SyncJobs where Id=@Id"; - deleteJobCommand.Parameters.Add(deleteJobCommand, "@Id"); - - transaction = connection.BeginTransaction(); - - deleteJobCommand.GetParameter(0).Value = new Guid(id); - deleteJobCommand.Transaction = transaction; - deleteJobCommand.ExecuteNonQuery(); - - // _deleteJobItemsCommand - deleteJobItemsCommand.CommandText = "delete from SyncJobItems where JobId=@JobId"; - deleteJobItemsCommand.Parameters.Add(deleteJobItemsCommand, "@JobId"); - - deleteJobItemsCommand.GetParameter(0).Value = id; - deleteJobItemsCommand.Transaction = transaction; - deleteJobItemsCommand.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save record:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - } - - public QueryResult GetJobs(SyncJobQuery query) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - CheckDisposed(); - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = BaseJobSelectText; - - var whereClauses = new List(); - - if (query.Statuses.Length > 0) - { - var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); - - whereClauses.Add(string.Format("Status in ({0})", statuses)); - } - if (!string.IsNullOrWhiteSpace(query.TargetId)) - { - whereClauses.Add("TargetId=@TargetId"); - cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId; - } - if (!string.IsNullOrWhiteSpace(query.ExcludeTargetIds)) - { - var excludeIds = (query.ExcludeTargetIds ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - if (excludeIds.Length == 1) - { - whereClauses.Add("TargetId<>@ExcludeTargetId"); - cmd.Parameters.Add(cmd, "@ExcludeTargetId", DbType.String).Value = excludeIds[0]; - } - else if (excludeIds.Length > 1) - { - whereClauses.Add("TargetId<>@ExcludeTargetId"); - cmd.Parameters.Add(cmd, "@ExcludeTargetId", DbType.String).Value = excludeIds[0]; - } - } - if (!string.IsNullOrWhiteSpace(query.UserId)) - { - whereClauses.Add("UserId=@UserId"); - cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId; - } - if (query.SyncNewContent.HasValue) - { - whereClauses.Add("SyncNewContent=@SyncNewContent"); - cmd.Parameters.Add(cmd, "@SyncNewContent", DbType.Boolean).Value = query.SyncNewContent.Value; - } - - cmd.CommandText += " mainTable"; - - var whereTextWithoutPaging = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - var startIndex = query.StartIndex ?? 0; - if (startIndex > 0) - { - whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})", - startIndex.ToString(_usCulture))); - } - - if (whereClauses.Count > 0) - { - cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } - - cmd.CommandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC"; - - if (query.Limit.HasValue) - { - cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); - } - - cmd.CommandText += "; select count (Id) from SyncJobs" + whereTextWithoutPaging; - - var list = new List(); - var count = 0; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - while (reader.Read()) - { - list.Add(GetJob(reader)); - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - } - - public SyncJobItem GetJobItem(string id) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentNullException("id"); - } - - CheckDisposed(); - - var guid = new Guid(id); - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = BaseJobItemSelectText + " where Id=@Id"; - - cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) - { - if (reader.Read()) - { - return GetJobItem(reader); - } - } - } - - return null; - } - } - - private QueryResult GetJobItemReader(SyncJobItemQuery query, string baseSelectText, Func itemFactory) - { - if (query == null) - { - throw new ArgumentNullException("query"); - } - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = baseSelectText; - - var whereClauses = new List(); - - if (!string.IsNullOrWhiteSpace(query.JobId)) - { - whereClauses.Add("JobId=@JobId"); - cmd.Parameters.Add(cmd, "@JobId", DbType.String).Value = query.JobId; - } - if (!string.IsNullOrWhiteSpace(query.ItemId)) - { - whereClauses.Add("ItemId=@ItemId"); - cmd.Parameters.Add(cmd, "@ItemId", DbType.String).Value = query.ItemId; - } - if (!string.IsNullOrWhiteSpace(query.TargetId)) - { - whereClauses.Add("TargetId=@TargetId"); - cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId; - } - - if (query.Statuses.Length > 0) - { - var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); - - whereClauses.Add(string.Format("Status in ({0})", statuses)); - } - - var whereTextWithoutPaging = whereClauses.Count == 0 ? - string.Empty : - " where " + string.Join(" AND ", whereClauses.ToArray()); - - var startIndex = query.StartIndex ?? 0; - if (startIndex > 0) - { - whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})", - startIndex.ToString(_usCulture))); - } - - if (whereClauses.Count > 0) - { - cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } - - cmd.CommandText += " ORDER BY JobItemIndex, DateCreated"; - - if (query.Limit.HasValue) - { - cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); - } - - cmd.CommandText += "; select count (Id) from SyncJobItems" + whereTextWithoutPaging; - - var list = new List(); - var count = 0; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - while (reader.Read()) - { - list.Add(itemFactory(reader)); - } - - if (reader.NextResult() && reader.Read()) - { - count = reader.GetInt32(0); - } - } - - return new QueryResult() - { - Items = list.ToArray(), - TotalRecordCount = count - }; - } - } - } - - public Dictionary GetSyncedItemProgresses(SyncJobItemQuery query) - { - var result = new Dictionary(); - - var now = DateTime.UtcNow; - - using (var connection = CreateConnection(true).Result) - { - using (var cmd = connection.CreateCommand()) - { - cmd.CommandText = "select ItemId,Status,Progress from SyncJobItems"; - - var whereClauses = new List(); - - if (!string.IsNullOrWhiteSpace(query.TargetId)) - { - whereClauses.Add("TargetId=@TargetId"); - cmd.Parameters.Add(cmd, "@TargetId", DbType.String).Value = query.TargetId; - } - - if (query.Statuses.Length > 0) - { - var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); - - whereClauses.Add(string.Format("Status in ({0})", statuses)); - } - - if (whereClauses.Count > 0) - { - cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray()); - } - - cmd.CommandText += ";" + cmd.CommandText - .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs") - .Replace("'Synced'", "'Completed','CompletedWithError'"); - - //Logger.Debug(cmd.CommandText); - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess)) - { - LogQueryTime("GetSyncedItemProgresses", cmd, now); - - while (reader.Read()) - { - AddStatusResult(reader, result, false); - } - - if (reader.NextResult()) - { - while (reader.Read()) - { - AddStatusResult(reader, result, true); - } - } - } - } - } - - return result; - } - - 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); - } - } - - private void AddStatusResult(IDataReader reader, Dictionary result, bool multipleIds) - { - if (reader.IsDBNull(0)) - { - return; - } - - var itemIds = new List(); - - var ids = reader.GetString(0); - - if (multipleIds) - { - itemIds = ids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); - } - else - { - itemIds.Add(ids); - } - - if (!reader.IsDBNull(1)) - { - SyncJobItemStatus status; - var statusString = reader.GetString(1); - if (string.Equals(statusString, "Completed", StringComparison.OrdinalIgnoreCase) || - string.Equals(statusString, "CompletedWithError", StringComparison.OrdinalIgnoreCase)) - { - status = SyncJobItemStatus.Synced; - } - else - { - status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), statusString, true); - } - - if (status == SyncJobItemStatus.Synced) - { - foreach (var itemId in itemIds) - { - result[itemId] = new SyncedItemProgress - { - Status = SyncJobItemStatus.Synced - }; - } - } - else - { - double progress = reader.IsDBNull(2) ? 0.0 : reader.GetDouble(2); - - foreach (var itemId in itemIds) - { - SyncedItemProgress currentStatus; - if (!result.TryGetValue(itemId, out currentStatus) || (currentStatus.Status != SyncJobItemStatus.Synced && progress >= currentStatus.Progress)) - { - result[itemId] = new SyncedItemProgress - { - Status = status, - Progress = progress - }; - } - } - } - } - } - - public QueryResult GetJobItems(SyncJobItemQuery query) - { - return GetJobItemReader(query, BaseJobItemSelectText, GetJobItem); - } - - public Task Create(SyncJobItem jobItem) - { - return InsertOrUpdate(jobItem, true); - } - - public Task Update(SyncJobItem jobItem) - { - return InsertOrUpdate(jobItem, false); - } - - private async Task InsertOrUpdate(SyncJobItem jobItem, bool insert) - { - if (jobItem == null) - { - throw new ArgumentNullException("jobItem"); - } - - CheckDisposed(); - - using (var connection = await CreateConnection().ConfigureAwait(false)) - { - using (var cmd = connection.CreateCommand()) - { - if (insert) - { - cmd.CommandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (@Id, @ItemId, @ItemName, @MediaSourceId, @JobId, @TemporaryPath, @OutputPath, @Status, @TargetId, @DateCreated, @Progress, @AdditionalFiles, @MediaSource, @IsMarkedForRemoval, @JobItemIndex, @ItemDateModifiedTicks)"; - - cmd.Parameters.Add(cmd, "@Id"); - cmd.Parameters.Add(cmd, "@ItemId"); - cmd.Parameters.Add(cmd, "@ItemName"); - cmd.Parameters.Add(cmd, "@MediaSourceId"); - cmd.Parameters.Add(cmd, "@JobId"); - cmd.Parameters.Add(cmd, "@TemporaryPath"); - cmd.Parameters.Add(cmd, "@OutputPath"); - cmd.Parameters.Add(cmd, "@Status"); - cmd.Parameters.Add(cmd, "@TargetId"); - cmd.Parameters.Add(cmd, "@DateCreated"); - cmd.Parameters.Add(cmd, "@Progress"); - cmd.Parameters.Add(cmd, "@AdditionalFiles"); - cmd.Parameters.Add(cmd, "@MediaSource"); - cmd.Parameters.Add(cmd, "@IsMarkedForRemoval"); - cmd.Parameters.Add(cmd, "@JobItemIndex"); - cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks"); - } - else - { - // cmd - cmd.CommandText = "update SyncJobItems set ItemId=@ItemId,ItemName=@ItemName,MediaSourceId=@MediaSourceId,JobId=@JobId,TemporaryPath=@TemporaryPath,OutputPath=@OutputPath,Status=@Status,TargetId=@TargetId,DateCreated=@DateCreated,Progress=@Progress,AdditionalFiles=@AdditionalFiles,MediaSource=@MediaSource,IsMarkedForRemoval=@IsMarkedForRemoval,JobItemIndex=@JobItemIndex,ItemDateModifiedTicks=@ItemDateModifiedTicks where Id=@Id"; - - cmd.Parameters.Add(cmd, "@Id"); - cmd.Parameters.Add(cmd, "@ItemId"); - cmd.Parameters.Add(cmd, "@ItemName"); - cmd.Parameters.Add(cmd, "@MediaSourceId"); - cmd.Parameters.Add(cmd, "@JobId"); - cmd.Parameters.Add(cmd, "@TemporaryPath"); - cmd.Parameters.Add(cmd, "@OutputPath"); - cmd.Parameters.Add(cmd, "@Status"); - cmd.Parameters.Add(cmd, "@TargetId"); - cmd.Parameters.Add(cmd, "@DateCreated"); - cmd.Parameters.Add(cmd, "@Progress"); - cmd.Parameters.Add(cmd, "@AdditionalFiles"); - cmd.Parameters.Add(cmd, "@MediaSource"); - cmd.Parameters.Add(cmd, "@IsMarkedForRemoval"); - cmd.Parameters.Add(cmd, "@JobItemIndex"); - cmd.Parameters.Add(cmd, "@ItemDateModifiedTicks"); - } - - IDbTransaction transaction = null; - - try - { - transaction = connection.BeginTransaction(); - - var index = 0; - - cmd.GetParameter(index++).Value = new Guid(jobItem.Id); - cmd.GetParameter(index++).Value = jobItem.ItemId; - cmd.GetParameter(index++).Value = jobItem.ItemName; - cmd.GetParameter(index++).Value = jobItem.MediaSourceId; - cmd.GetParameter(index++).Value = jobItem.JobId; - cmd.GetParameter(index++).Value = jobItem.TemporaryPath; - cmd.GetParameter(index++).Value = jobItem.OutputPath; - cmd.GetParameter(index++).Value = jobItem.Status.ToString(); - cmd.GetParameter(index++).Value = jobItem.TargetId; - cmd.GetParameter(index++).Value = jobItem.DateCreated; - cmd.GetParameter(index++).Value = jobItem.Progress; - cmd.GetParameter(index++).Value = _json.SerializeToString(jobItem.AdditionalFiles); - cmd.GetParameter(index++).Value = jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource); - cmd.GetParameter(index++).Value = jobItem.IsMarkedForRemoval; - cmd.GetParameter(index++).Value = jobItem.JobItemIndex; - cmd.GetParameter(index++).Value = jobItem.ItemDateModifiedTicks; - - cmd.Transaction = transaction; - - cmd.ExecuteNonQuery(); - - transaction.Commit(); - } - catch (OperationCanceledException) - { - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - catch (Exception e) - { - Logger.ErrorException("Failed to save record:", e); - - if (transaction != null) - { - transaction.Rollback(); - } - - throw; - } - finally - { - if (transaction != null) - { - transaction.Dispose(); - } - } - } - } - } - - private SyncJobItem GetJobItem(IDataReader reader) - { - var info = new SyncJobItem - { - Id = reader.GetGuid(0).ToString("N"), - ItemId = reader.GetString(1) - }; - - if (!reader.IsDBNull(2)) - { - info.ItemName = reader.GetString(2); - } - - if (!reader.IsDBNull(3)) - { - info.MediaSourceId = reader.GetString(3); - } - - info.JobId = reader.GetString(4); - - if (!reader.IsDBNull(5)) - { - info.TemporaryPath = reader.GetString(5); - } - if (!reader.IsDBNull(6)) - { - info.OutputPath = reader.GetString(6); - } - - if (!reader.IsDBNull(7)) - { - info.Status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), reader.GetString(7), true); - } - - info.TargetId = reader.GetString(8); - - info.DateCreated = reader.GetDateTime(9).ToUniversalTime(); - - if (!reader.IsDBNull(10)) - { - info.Progress = reader.GetDouble(10); - } - - if (!reader.IsDBNull(11)) - { - var json = reader.GetString(11); - - if (!string.IsNullOrWhiteSpace(json)) - { - info.AdditionalFiles = _json.DeserializeFromString>(json); - } - } - - if (!reader.IsDBNull(12)) - { - var json = reader.GetString(12); - - if (!string.IsNullOrWhiteSpace(json)) - { - info.MediaSource = _json.DeserializeFromString(json); - } - } - - info.IsMarkedForRemoval = reader.GetBoolean(13); - info.JobItemIndex = reader.GetInt32(14); - - if (!reader.IsDBNull(15)) - { - info.ItemDateModifiedTicks = reader.GetInt64(15); - } - - return info; - } - } -} diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs index ea9e537c93..8f64f04dbf 100644 --- a/Emby.Server.Implementations/Activity/ActivityRepository.cs +++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs @@ -51,7 +51,7 @@ namespace Emby.Server.Implementations.Activity throw new ArgumentNullException("entry"); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -76,7 +76,7 @@ namespace Emby.Server.Implementations.Activity public QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit) { - lock (WriteLock) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -87,7 +87,7 @@ namespace Emby.Server.Implementations.Activity if (minDate.HasValue) { - whereClauses.Add("DateCreated>=@DateCreated"); + whereClauses.Add("DateCreated>=?"); paramList.Add(minDate.Value.ToDateTimeParamValue()); } diff --git a/Emby.Server.Core/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs similarity index 91% rename from Emby.Server.Core/Browser/BrowserLauncher.cs rename to Emby.Server.Implementations/Browser/BrowserLauncher.cs index 4ccc41c30b..05cde91e22 100644 --- a/Emby.Server.Core/Browser/BrowserLauncher.cs +++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs @@ -1,7 +1,7 @@ using MediaBrowser.Controller; using System; -namespace Emby.Server.Core.Browser +namespace Emby.Server.Implementations.Browser { /// /// Class BrowserLauncher @@ -65,10 +65,8 @@ namespace Emby.Server.Core.Browser { } - catch (Exception ex) + catch (Exception) { - Console.WriteLine("Error launching url: " + url); - Console.WriteLine(ex.Message); } } } diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs index 8febe83b2e..6c1a968137 100644 --- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs +++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs @@ -4,13 +4,15 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Model.Logging; using SQLitePCL.pretty; +using System.Linq; +using SQLitePCL; namespace Emby.Server.Implementations.Data { public abstract class BaseSqliteRepository : IDisposable { protected string DbFilePath { get; set; } - protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1); + protected ReaderWriterLockSlim WriteLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); protected ILogger Logger { get; private set; } protected BaseSqliteRepository(ILogger logger) @@ -23,12 +25,20 @@ namespace Emby.Server.Implementations.Data get { return true; } } - protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false) + static BaseSqliteRepository() { SQLite3.EnableSharedCache = false; + int rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MEMSTATUS, 0); + //CheckOk(rc); + } + + protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false) + { ConnectionFlags connectionFlags; + //isReadOnly = false; + if (isReadOnly) { connectionFlags = ConnectionFlags.ReadOnly; @@ -54,25 +64,67 @@ namespace Emby.Server.Implementations.Data var db = SQLite3.Open(DbFilePath, connectionFlags, null); - var queries = new[] + var queries = new List { + "pragma default_temp_store = memory", "PRAGMA page_size=4096", "PRAGMA journal_mode=WAL", "PRAGMA temp_store=memory", "PRAGMA synchronous=Normal", //"PRAGMA cache size=-10000" - }; + }; + + var cacheSize = CacheSize; + if (cacheSize.HasValue) + { + + } + + if (EnableExclusiveMode) + { + queries.Add("PRAGMA locking_mode=EXCLUSIVE"); + } //foreach (var query in queries) //{ // db.Execute(query); //} - db.ExecuteAll(string.Join(";", queries)); - + db.ExecuteAll(string.Join(";", queries.ToArray())); + return db; } + protected virtual int? CacheSize + { + get + { + return null; + } + } + + protected virtual bool EnableExclusiveMode + { + get { return false; } + } + + internal static void CheckOk(int rc) + { + string msg = ""; + + if (raw.SQLITE_OK != rc) + { + throw CreateException((ErrorCode)rc, msg); + } + } + + internal static Exception CreateException(ErrorCode rc, string msg) + { + var exp = new Exception(msg); + + return exp; + } + private bool _disposed; protected void CheckDisposed() { @@ -103,9 +155,10 @@ namespace Emby.Server.Implementations.Data { lock (_disposeLock) { - WriteLock.Wait(); - - CloseConnection(); + using (WriteLock.Write()) + { + CloseConnection(); + } } } catch (Exception ex) @@ -120,21 +173,30 @@ namespace Emby.Server.Implementations.Data } - protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type) + protected List GetColumnNames(IDatabaseConnection connection, string table) { + var list = new List(); + foreach (var row in connection.Query("PRAGMA table_info(" + table + ")")) { if (row[1].SQLiteType != SQLiteType.Null) { var name = row[1].ToString(); - if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase)) - { - return; - } + list.Add(name); } } + return list; + } + + protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type, List existingColumnNames) + { + if (existingColumnNames.Contains(columnName, StringComparer.OrdinalIgnoreCase)) + { + return; + } + connection.ExecuteAll(string.Join(";", new string[] { "alter table " + table, @@ -142,4 +204,51 @@ namespace Emby.Server.Implementations.Data })); } } + + public static class ReaderWriterLockSlimExtensions + { + private sealed class ReadLockToken : IDisposable + { + private ReaderWriterLockSlim _sync; + public ReadLockToken(ReaderWriterLockSlim sync) + { + _sync = sync; + sync.EnterReadLock(); + } + public void Dispose() + { + if (_sync != null) + { + _sync.ExitReadLock(); + _sync = null; + } + } + } + private sealed class WriteLockToken : IDisposable + { + private ReaderWriterLockSlim _sync; + public WriteLockToken(ReaderWriterLockSlim sync) + { + _sync = sync; + sync.EnterWriteLock(); + } + public void Dispose() + { + if (_sync != null) + { + _sync.ExitWriteLock(); + _sync = null; + } + } + } + + public static IDisposable Read(this ReaderWriterLockSlim obj) + { + return new ReadLockToken(obj); + } + public static IDisposable Write(this ReaderWriterLockSlim obj) + { + return new WriteLockToken(obj); + } + } } diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs index dd32e2cbd9..3f11b6eb07 100644 --- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs +++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Progress; -using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; @@ -7,20 +6,13 @@ using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Common.IO; using MediaBrowser.Model.IO; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.IO; -using MediaBrowser.Controller.LiveTv; -using MediaBrowser.Controller.Net; -using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Tasks; -using Emby.Server.Implementations.ScheduledTasks; namespace Emby.Server.Implementations.Data { @@ -29,26 +21,14 @@ namespace Emby.Server.Implementations.Data private readonly ILibraryManager _libraryManager; private readonly IItemRepository _itemRepo; private readonly ILogger _logger; - private readonly IServerConfigurationManager _config; private readonly IFileSystem _fileSystem; - private readonly IHttpServer _httpServer; - private readonly ILocalizationManager _localization; - private readonly ITaskManager _taskManager; - public const int MigrationVersion = 23; - public static bool EnableUnavailableMessage = false; - const int LatestSchemaVersion = 109; - - public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IHttpServer httpServer, ILocalizationManager localization, ITaskManager taskManager) + public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IFileSystem fileSystem) { _libraryManager = libraryManager; _itemRepo = itemRepo; _logger = logger; - _config = config; _fileSystem = fileSystem; - _httpServer = httpServer; - _localization = localization; - _taskManager = taskManager; } public string Name @@ -68,8 +48,6 @@ namespace Emby.Server.Implementations.Data public async Task Execute(CancellationToken cancellationToken, IProgress progress) { - OnProgress(0); - // Ensure these objects are lazy loaded. // Without this there is a deadlock that will need to be investigated var rootChildren = _libraryManager.RootFolder.Children.ToList(); @@ -78,19 +56,7 @@ namespace Emby.Server.Implementations.Data var innerProgress = new ActionableProgress(); innerProgress.RegisterAction(p => { - double newPercentCommplete = .4 * p; - OnProgress(newPercentCommplete); - - progress.Report(newPercentCommplete); - }); - - await UpdateToLatestSchema(cancellationToken, innerProgress).ConfigureAwait(false); - - innerProgress = new ActionableProgress(); - innerProgress.RegisterAction(p => - { - double newPercentCommplete = 40 + .05 * p; - OnProgress(newPercentCommplete); + double newPercentCommplete = .45 * p; progress.Report(newPercentCommplete); }); await CleanDeadItems(cancellationToken, innerProgress).ConfigureAwait(false); @@ -100,122 +66,12 @@ namespace Emby.Server.Implementations.Data innerProgress.RegisterAction(p => { double newPercentCommplete = 45 + .55 * p; - OnProgress(newPercentCommplete); progress.Report(newPercentCommplete); }); await CleanDeletedItems(cancellationToken, innerProgress).ConfigureAwait(false); progress.Report(100); await _itemRepo.UpdateInheritedValues(cancellationToken).ConfigureAwait(false); - - if (_config.Configuration.MigrationVersion < MigrationVersion) - { - _config.Configuration.MigrationVersion = MigrationVersion; - _config.SaveConfiguration(); - } - - if (_config.Configuration.SchemaVersion < LatestSchemaVersion) - { - _config.Configuration.SchemaVersion = LatestSchemaVersion; - _config.SaveConfiguration(); - } - - if (EnableUnavailableMessage) - { - EnableUnavailableMessage = false; - _httpServer.GlobalResponse = null; - _taskManager.QueueScheduledTask(); - } - - _taskManager.SuspendTriggers = false; - } - - private void OnProgress(double newPercentCommplete) - { - if (EnableUnavailableMessage) - { - var html = "Emby"; - var text = _localization.GetLocalizedString("DbUpgradeMessage"); - html += string.Format(text, newPercentCommplete.ToString("N2", CultureInfo.InvariantCulture)); - - html += ""; - html += ""; - - _httpServer.GlobalResponse = html; - } - } - - private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress progress) - { - var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery - { - IsCurrentSchema = false, - ExcludeItemTypes = new[] { typeof(LiveTvProgram).Name } - }); - - var numComplete = 0; - var numItems = itemIds.Count; - - _logger.Debug("Upgrading schema for {0} items", numItems); - - var list = new List(); - - foreach (var itemId in itemIds) - { - cancellationToken.ThrowIfCancellationRequested(); - - if (itemId != Guid.Empty) - { - // Somehow some invalid data got into the db. It probably predates the boundary checking - var item = _libraryManager.GetItemById(itemId); - - if (item != null) - { - list.Add(item); - } - } - - if (list.Count >= 1000) - { - try - { - await _itemRepo.SaveItems(list, cancellationToken).ConfigureAwait(false); - } - catch (OperationCanceledException) - { - throw; - } - catch (Exception ex) - { - _logger.ErrorException("Error saving item", ex); - } - - list.Clear(); - } - - numComplete++; - double percent = numComplete; - percent /= numItems; - progress.Report(percent * 100); - } - - if (list.Count > 0) - { - try - { - await _itemRepo.SaveItems(list, cancellationToken).ConfigureAwait(false); - } - catch (OperationCanceledException) - { - throw; - } - catch (Exception ex) - { - _logger.ErrorException("Error saving item", ex); - } - } - - progress.Report(100); } private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress progress) diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs index 79fc893f4c..1fbf9b0a97 100644 --- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs @@ -86,7 +86,7 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -127,7 +127,7 @@ namespace Emby.Server.Implementations.Data cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -159,24 +159,27 @@ namespace Emby.Server.Implementations.Data var guidId = displayPreferencesId.GetMD5(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - var commandText = "select data from userdisplaypreferences where id = ? and userId=? and client=?"; - - var paramList = new List(); - paramList.Add(guidId.ToGuidParamValue()); - paramList.Add(userId.ToGuidParamValue()); - paramList.Add(client); - - foreach (var row in connection.Query(commandText, paramList.ToArray())) + using (var connection = CreateConnection(true)) { - return Get(row); + var commandText = "select data from userdisplaypreferences where id = ? and userId=? and client=?"; + + var paramList = new List(); + paramList.Add(guidId.ToGuidParamValue()); + paramList.Add(userId.ToGuidParamValue()); + paramList.Add(client); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + return Get(row); + } + + return new DisplayPreferences + { + Id = guidId.ToString("N") + }; } - - return new DisplayPreferences - { - Id = guidId.ToString("N") - }; } } @@ -190,16 +193,19 @@ namespace Emby.Server.Implementations.Data { var list = new List(); - using (var connection = CreateConnection(true)) + using (WriteLock.Read()) { - var commandText = "select data from userdisplaypreferences where userId=?"; - - var paramList = new List(); - paramList.Add(userId.ToGuidParamValue()); - - foreach (var row in connection.Query(commandText, paramList.ToArray())) + using (var connection = CreateConnection(true)) { - list.Add(Get(row)); + var commandText = "select data from userdisplaypreferences where userId=?"; + + var paramList = new List(); + paramList.Add(userId.ToGuidParamValue()); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + list.Add(Get(row)); + } } } diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs new file mode 100644 index 0000000000..96edc5d0df --- /dev/null +++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs @@ -0,0 +1,256 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.FileOrganization; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Querying; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Data +{ + public class SqliteFileOrganizationRepository : BaseSqliteRepository, IFileOrganizationRepository, IDisposable + { + private readonly CultureInfo _usCulture = new CultureInfo("en-US"); + + public SqliteFileOrganizationRepository(ILogger logger, IServerApplicationPaths appPaths) : base(logger) + { + DbFilePath = Path.Combine(appPaths.DataPath, "fileorganization.db"); + } + + /// + /// Opens the connection to the database + /// + /// Task. + public void Initialize() + { + using (var connection = CreateConnection()) + { + string[] queries = { + + "create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)", + "create index if not exists idx_FileOrganizerResults on FileOrganizerResults(ResultId)" + }; + + connection.RunQueries(queries); + } + } + + public async Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken) + { + if (result == null) + { + throw new ArgumentNullException("result"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + using (var connection = CreateConnection()) + { + connection.RunInTransaction(db => + { + 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()); + }); + } + } + + public async Task Delete(string id) + { + if (string.IsNullOrEmpty(id)) + { + throw new ArgumentNullException("id"); + } + + using (var connection = CreateConnection()) + { + connection.RunInTransaction(db => + { + var paramList = new List(); + var commandText = "delete from FileOrganizerResults where ResultId = ?"; + + paramList.Add(id.ToGuidParamValue()); + + db.Execute(commandText, paramList.ToArray()); + }); + } + } + + public async Task DeleteAll() + { + using (var connection = CreateConnection()) + { + connection.RunInTransaction(db => + { + var commandText = "delete from FileOrganizerResults"; + + db.Execute(commandText); + }); + } + } + + public QueryResult GetResults(FileOrganizationResultQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + 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) + { + commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + } + + 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 + }; + } + } + + public FileOrganizationResult GetResult(string id) + { + if (string.IsNullOrEmpty(id)) + { + throw new ArgumentNullException("id"); + } + + 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())) + { + return GetResult(row); + } + + return null; + } + } + + public FileOrganizationResult GetResult(IReadOnlyList reader) + { + var index = 0; + + var result = new FileOrganizationResult + { + Id = reader[0].ReadGuid().ToString("N") + }; + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.OriginalPath = reader[index].ToString(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.TargetPath = reader[index].ToString(); + } + + index++; + result.FileSize = reader[index].ToInt64(); + + index++; + result.Date = reader[index].ReadDateTime(); + + index++; + result.Status = (FileSortingStatus)Enum.Parse(typeof(FileSortingStatus), reader[index].ToString(), true); + + index++; + result.Type = (FileOrganizerType)Enum.Parse(typeof(FileOrganizerType), reader[index].ToString(), true); + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.StatusMessage = reader[index].ToString(); + } + + result.OriginalFileName = Path.GetFileName(result.OriginalPath); + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.ExtractedName = reader[index].ToString(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.ExtractedYear = reader[index].ToInt(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.ExtractedSeasonNumber = reader[index].ToInt(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.ExtractedEpisodeNumber = reader[index].ToInt(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.ExtractedEndingEpisodeNumber = reader[index].ToInt(); + } + + index++; + if (reader[index].SQLiteType != SQLiteType.Null) + { + result.DuplicatePaths = reader[index].ToString().Split('|').Where(i => !string.IsNullOrEmpty(i)).ToList(); + } + + return result; + } + } +} diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs new file mode 100644 index 0000000000..c88bffe045 --- /dev/null +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -0,0 +1,5279 @@ +//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 = 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[] { 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); + +// 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.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs new file mode 100644 index 0000000000..d1355ce8f0 --- /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 diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs new file mode 100644 index 0000000000..f0e38f8c07 --- /dev/null +++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs @@ -0,0 +1,163 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.IO; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Serialization; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Data +{ + /// + /// Class SQLiteUserRepository + /// + public class SqliteUserRepository : BaseSqliteRepository, IUserRepository + { + private readonly IJsonSerializer _jsonSerializer; + private readonly IMemoryStreamFactory _memoryStreamProvider; + + public SqliteUserRepository(ILogger logger, IServerApplicationPaths appPaths, IJsonSerializer jsonSerializer, IMemoryStreamFactory memoryStreamProvider) + : base(logger) + { + _jsonSerializer = jsonSerializer; + _memoryStreamProvider = memoryStreamProvider; + + DbFilePath = Path.Combine(appPaths.DataPath, "users.db"); + } + + /// + /// Gets the name of the repository + /// + /// The name. + public string Name + { + get + { + return "SQLite"; + } + } + + /// + /// Opens the connection to the database + /// + /// Task. + public void Initialize() + { + using (var connection = CreateConnection()) + { + string[] queries = { + + "create table if not exists users (guid GUID primary key, data BLOB)", + "create index if not exists idx_users on users(guid)", + "create table if not exists schema_version (table_name primary key, version)", + + "pragma shrink_memory" + }; + + connection.RunQueries(queries); + } + } + + /// + /// Save a user in the repo + /// + /// The user. + /// The cancellation token. + /// Task. + /// user + public async Task SaveUser(User user, CancellationToken cancellationToken) + { + if (user == null) + { + throw new ArgumentNullException("user"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + var serialized = _jsonSerializer.SerializeToBytes(user, _memoryStreamProvider); + + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + connection.RunInTransaction(db => + { + var commandText = "replace into users (guid, data) values (?, ?)"; + + db.Execute(commandText, + user.Id.ToGuidParamValue(), + serialized); + }); + } + } + } + + /// + /// Retrieve all users from the database + /// + /// IEnumerable{User}. + public IEnumerable RetrieveAllUsers() + { + var list = new List(); + + using (WriteLock.Read()) + { + using (var connection = CreateConnection(true)) + { + foreach (var row in connection.Query("select guid,data from users")) + { + var id = row[0].ReadGuid(); + + using (var stream = _memoryStreamProvider.CreateNew(row[1].ToBlob())) + { + stream.Position = 0; + var user = _jsonSerializer.DeserializeFromStream(stream); + user.Id = id; + list.Add(user); + } + } + } + } + + return list; + } + + /// + /// Deletes the user. + /// + /// The user. + /// The cancellation token. + /// Task. + /// user + public async Task DeleteUser(User user, CancellationToken cancellationToken) + { + if (user == null) + { + throw new ArgumentNullException("user"); + } + + cancellationToken.ThrowIfCancellationRequested(); + + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + connection.RunInTransaction(db => + { + var commandText = "delete from users where guid=?"; + + db.Execute(commandText, + user.Id.ToGuidParamValue()); + }); + } + } + } + } +} \ No newline at end of file diff --git a/Emby.Server.Core/Data/TypeMapper.cs b/Emby.Server.Implementations/Data/TypeMapper.cs similarity index 70% rename from Emby.Server.Core/Data/TypeMapper.cs rename to Emby.Server.Implementations/Data/TypeMapper.cs index f8eb5dd2d8..f4b37749e7 100644 --- a/Emby.Server.Core/Data/TypeMapper.cs +++ b/Emby.Server.Implementations/Data/TypeMapper.cs @@ -1,19 +1,27 @@ using System; using System.Collections.Concurrent; +using MediaBrowser.Model.Reflection; using System.Linq; -namespace Emby.Server.Core.Data +namespace Emby.Server.Implementations.Data { /// /// Class TypeMapper /// public class TypeMapper { + private readonly IAssemblyInfo _assemblyInfo; + /// /// This holds all the types in the running assemblies so that we can de-serialize properly when we don't have strong types /// private readonly ConcurrentDictionary _typeMap = new ConcurrentDictionary(); + public TypeMapper(IAssemblyInfo assemblyInfo) + { + _assemblyInfo = assemblyInfo; + } + /// /// Gets the type. /// @@ -24,7 +32,7 @@ namespace Emby.Server.Core.Data { if (string.IsNullOrEmpty(typeName)) { - throw new ArgumentNullException(); + throw new ArgumentNullException("typeName"); } return _typeMap.GetOrAdd(typeName, LookupType); @@ -37,11 +45,10 @@ namespace Emby.Server.Core.Data /// Type. private Type LookupType(string typeName) { - return AppDomain - .CurrentDomain - .GetAssemblies() - .Select(a => a.GetType(typeName, false)) - .FirstOrDefault(t => t != null); + return _assemblyInfo + .GetCurrentAssemblies() + .Select(a => a.GetType(typeName)) + .FirstOrDefault(t => t != null); } } } diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index a4f26bc601..ff6fe20183 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -36,6 +36,7 @@ + @@ -51,6 +52,11 @@ + + + + + @@ -62,11 +68,15 @@ + + + + @@ -169,6 +179,7 @@ + @@ -237,6 +248,7 @@ + @@ -252,6 +264,7 @@ + @@ -305,7 +318,7 @@ True - ..\packages\SQLitePCLRaw.core.1.1.0\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll + ..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll True diff --git a/Emby.Server.Core/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs similarity index 92% rename from Emby.Server.Core/EntryPoints/StartupWizard.cs rename to Emby.Server.Implementations/EntryPoints/StartupWizard.cs index 30ceca073d..424153f220 100644 --- a/Emby.Server.Core/EntryPoints/StartupWizard.cs +++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs @@ -1,9 +1,9 @@ -using MediaBrowser.Controller; +using Emby.Server.Implementations.Browser; +using MediaBrowser.Controller; using MediaBrowser.Controller.Plugins; using MediaBrowser.Model.Logging; -using Emby.Server.Core.Browser; -namespace Emby.Server.Core.EntryPoints +namespace Emby.Server.Implementations.EntryPoints { /// /// Class StartupWizard diff --git a/Emby.Server.Core/FFMpeg/FFMpegInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs similarity index 92% rename from Emby.Server.Core/FFMpeg/FFMpegInfo.cs rename to Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs index fc197cba32..e725d22f51 100644 --- a/Emby.Server.Core/FFMpeg/FFMpegInfo.cs +++ b/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs @@ -1,4 +1,4 @@ -namespace Emby.Server.Core.FFMpeg +namespace Emby.Server.Implementations.FFMpeg { /// /// Class FFMpegInfo diff --git a/Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs similarity index 91% rename from Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs rename to Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs index f1eaeb8894..1d769acec1 100644 --- a/Emby.Server.Core/FFMpeg/FFMpegInstallInfo.cs +++ b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs @@ -1,5 +1,5 @@  -namespace Emby.Server.Core.FFMpeg +namespace Emby.Server.Implementations.FFMpeg { public class FFMpegInstallInfo { diff --git a/Emby.Server.Core/FFMpeg/FFMpegLoader.cs b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs similarity index 95% rename from Emby.Server.Core/FFMpeg/FFMpegLoader.cs rename to Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs index 6b090102ab..2becebb3d3 100644 --- a/Emby.Server.Core/FFMpeg/FFMpegLoader.cs +++ b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs @@ -8,10 +8,10 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Emby.Server.Core; -using Emby.Server.Core.FFMpeg; +using Emby.Server.Implementations; +using Emby.Server.Implementations.FFMpeg; -namespace Emby.Server.Core.FFMpeg +namespace Emby.Server.Implementations.FFMpeg { public class FFMpegLoader { @@ -119,11 +119,11 @@ namespace Emby.Server.Core.FFMpeg { var encoderFilename = Path.GetFileName(info.EncoderPath); var probeFilename = Path.GetFileName(info.ProbePath); - - foreach (var directory in Directory.EnumerateDirectories(rootEncoderPath, "*", SearchOption.TopDirectoryOnly) + + foreach (var directory in _fileSystem.GetDirectoryPaths(rootEncoderPath) .ToList()) { - var allFiles = Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories).ToList(); + var allFiles = _fileSystem.GetFilePaths(directory, true).ToList(); var encoder = allFiles.FirstOrDefault(i => string.Equals(Path.GetFileName(i), encoderFilename, StringComparison.OrdinalIgnoreCase)); var probe = allFiles.FirstOrDefault(i => string.Equals(Path.GetFileName(i), probeFilename, StringComparison.OrdinalIgnoreCase)); @@ -182,7 +182,7 @@ namespace Emby.Server.Core.FFMpeg { ExtractArchive(downloadinfo, tempFile, tempFolder); - var files = Directory.EnumerateFiles(tempFolder, "*", SearchOption.AllDirectories) + var files = _fileSystem.GetFilePaths(tempFolder, true) .ToList(); foreach (var file in files.Where(i => diff --git a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs index 5be7ba7ada..48a85e0e0e 100644 --- a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs +++ b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs @@ -74,7 +74,7 @@ namespace Emby.Server.Implementations.FileOrganization return new[] { // Every so often - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(5).Ticks} + new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(15).Ticks} }; } diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index 876d140ecb..c1758127a5 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -59,12 +59,13 @@ namespace Emby.Server.Implementations.HttpServer private readonly IEnvironmentInfo _environment; private readonly IStreamFactory _streamFactory; private readonly Func> _funcParseFn; + private readonly bool _enableDualModeSockets; public HttpListenerHost(IServerApplicationHost applicationHost, ILogger logger, IServerConfigurationManager config, string serviceName, - string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func> funcParseFn) + string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func> funcParseFn, bool enableDualModeSockets) : base(serviceName) { _appHost = applicationHost; @@ -80,6 +81,7 @@ namespace Emby.Server.Implementations.HttpServer _certificate = certificate; _streamFactory = streamFactory; _funcParseFn = funcParseFn; + _enableDualModeSockets = enableDualModeSockets; _config = config; _logger = logger; @@ -179,8 +181,6 @@ namespace Emby.Server.Implementations.HttpServer private IHttpListener GetListener() { - var enableDualMode = _environment.OperatingSystem == OperatingSystem.Windows; - return new WebSocketSharpListener(_logger, _certificate, _memoryStreamProvider, @@ -189,7 +189,7 @@ namespace Emby.Server.Implementations.HttpServer _socketFactory, _cryptoProvider, _streamFactory, - enableDualMode, + _enableDualModeSockets, GetRequest); } diff --git a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs similarity index 97% rename from Emby.Server.Core/Migrations/UpdateLevelMigration.cs rename to Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs index c79dbabea5..c532ea08d1 100644 --- a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs +++ b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs @@ -2,16 +2,15 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Emby.Common.Implementations.Updates; using MediaBrowser.Common.Net; +using MediaBrowser.Common.Updates; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Updates; -using Emby.Server.Implementations.Migrations; -namespace Emby.Server.Core.Migrations +namespace Emby.Server.Implementations.Migrations { public class UpdateLevelMigration : IVersionMigration { diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs index fcf45b0ad6..ee900ef33a 100644 --- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs +++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs @@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationResult(); - lock (WriteLock) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -103,7 +103,7 @@ namespace Emby.Server.Implementations.Notifications { var result = new NotificationsSummary(); - lock (WriteLock) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { @@ -214,7 +214,7 @@ namespace Emby.Server.Implementations.Notifications cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -273,7 +273,7 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -289,7 +289,7 @@ namespace Emby.Server.Implementations.Notifications { cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs index 5179bd2581..f6163b80ac 100644 --- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs +++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs @@ -40,7 +40,9 @@ namespace Emby.Server.Implementations.Security connection.RunInTransaction(db => { - AddColumn(db, "AccessTokens", "AppVersion", "TEXT"); + var existingColumnNames = GetColumnNames(db, "AccessTokens"); + + AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames); }); } } @@ -61,7 +63,7 @@ namespace Emby.Server.Implementations.Security cancellationToken.ThrowIfCancellationRequested(); - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -193,7 +195,7 @@ namespace Emby.Server.Implementations.Security throw new ArgumentNullException("id"); } - lock (WriteLock) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs index e09b7f5b99..9065ee1088 100644 --- a/Emby.Server.Implementations/Social/SharingRepository.cs +++ b/Emby.Server.Implementations/Social/SharingRepository.cs @@ -50,7 +50,7 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("info.Id"); } - lock (WriteLock) + using (WriteLock.Write()) { using (var connection = CreateConnection()) { @@ -75,7 +75,7 @@ namespace Emby.Server.Implementations.Social throw new ArgumentNullException("id"); } - lock (WriteLock) + using (WriteLock.Read()) { using (var connection = CreateConnection(true)) { diff --git a/Emby.Server.Core/StartupOptions.cs b/Emby.Server.Implementations/StartupOptions.cs similarity index 71% rename from Emby.Server.Core/StartupOptions.cs rename to Emby.Server.Implementations/StartupOptions.cs index 5da42394d5..159c36248c 100644 --- a/Emby.Server.Core/StartupOptions.cs +++ b/Emby.Server.Implementations/StartupOptions.cs @@ -2,11 +2,16 @@ using System.Collections.Generic; using System.Linq; -namespace Emby.Server.Core +namespace Emby.Server.Implementations { public class StartupOptions { - private readonly List _options = Environment.GetCommandLineArgs().ToList(); + private readonly List _options; + + public StartupOptions(string[] commandLineArgs) + { + _options = commandLineArgs.ToList(); + } public bool ContainsOption(string option) { diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs new file mode 100644 index 0000000000..2877a8ffdc --- /dev/null +++ b/Emby.Server.Implementations/Sync/SyncRepository.cs @@ -0,0 +1,770 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Emby.Server.Implementations.Data; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Sync; +using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Querying; +using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Sync; +using SQLitePCL.pretty; + +namespace Emby.Server.Implementations.Sync +{ + public class SyncRepository : BaseSqliteRepository, ISyncRepository + { + private readonly CultureInfo _usCulture = new CultureInfo("en-US"); + + private readonly IJsonSerializer _json; + + public SyncRepository(ILogger logger, IJsonSerializer json, IServerApplicationPaths appPaths) + : base(logger) + { + _json = json; + DbFilePath = Path.Combine(appPaths.DataPath, "sync14.db"); + } + + private class SyncSummary + { + public Dictionary Items { get; set; } + + public SyncSummary() + { + Items = new Dictionary(); + } + } + + public void Initialize() + { + using (var connection = CreateConnection()) + { + 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)", + + "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT, ItemDateModifiedTicks BIGINT)", + + "drop index if exists idx_SyncJobItems2", + "drop index if exists idx_SyncJobItems3", + "drop index if exists idx_SyncJobs1", + "drop index if exists idx_SyncJobs", + "drop index if exists idx_SyncJobItems1", + "create index if not exists idx_SyncJobItems4 on SyncJobItems(TargetId,ItemId,Status,Progress,DateCreated)", + "create index if not exists idx_SyncJobItems5 on SyncJobItems(TargetId,Status,ItemId,Progress)", + + "create index if not exists idx_SyncJobs2 on SyncJobs(TargetId,Status,ItemIds,Progress)", + + "pragma shrink_memory" + }; + + connection.RunQueries(queries); + + connection.RunInTransaction(db => + { + var existingColumnNames = GetColumnNames(db, "SyncJobs"); + AddColumn(db, "SyncJobs", "Profile", "TEXT", existingColumnNames); + AddColumn(db, "SyncJobs", "Bitrate", "INT", existingColumnNames); + + existingColumnNames = GetColumnNames(db, "SyncJobItems"); + AddColumn(db, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT", existingColumnNames); + }); + } + } + + 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"; + + public SyncJob GetJob(string id) + { + if (string.IsNullOrEmpty(id)) + { + throw new ArgumentNullException("id"); + } + + CheckDisposed(); + + var guid = new Guid(id); + + if (guid == Guid.Empty) + { + throw new ArgumentNullException("id"); + } + + using (WriteLock.Read()) + { + using (var connection = CreateConnection(true)) + { + var commandText = BaseJobSelectText + " where Id=?"; + var paramList = new List(); + + paramList.Add(guid.ToGuidParamValue()); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + return GetJob(row); + } + + return null; + } + } + } + + private SyncJob GetJob(IReadOnlyList reader) + { + var info = new SyncJob + { + Id = reader[0].ReadGuid().ToString("N"), + TargetId = reader[1].ToString(), + Name = reader[2].ToString() + }; + + if (reader[3].SQLiteType != SQLiteType.Null) + { + info.Profile = reader[3].ToString(); + } + + if (reader[4].SQLiteType != SQLiteType.Null) + { + info.Quality = reader[4].ToString(); + } + + if (reader[5].SQLiteType != SQLiteType.Null) + { + info.Bitrate = reader[5].ToInt(); + } + + if (reader[6].SQLiteType != SQLiteType.Null) + { + info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader[6].ToString(), true); + } + + if (reader[7].SQLiteType != SQLiteType.Null) + { + info.Progress = reader[7].ToDouble(); + } + + if (reader[8].SQLiteType != SQLiteType.Null) + { + info.UserId = reader[8].ToString(); + } + + if (reader[9].SQLiteType != SQLiteType.Null) + { + info.RequestedItemIds = reader[9].ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); + } + + if (reader[10].SQLiteType != SQLiteType.Null) + { + info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader[10].ToString(), true); + } + + if (reader[11].SQLiteType != SQLiteType.Null) + { + info.ParentId = reader[11].ToString(); + } + + if (reader[12].SQLiteType != SQLiteType.Null) + { + info.UnwatchedOnly = reader[12].ToBool(); + } + + if (reader[13].SQLiteType != SQLiteType.Null) + { + info.ItemLimit = reader[13].ToInt(); + } + + info.SyncNewContent = reader[14].ToBool(); + + info.DateCreated = reader[15].ReadDateTime(); + info.DateLastModified = reader[16].ReadDateTime(); + info.ItemCount = reader[17].ToInt(); + + return info; + } + + public Task Create(SyncJob job) + { + return InsertOrUpdate(job, true); + } + + public Task Update(SyncJob job) + { + return InsertOrUpdate(job, false); + } + + private async Task InsertOrUpdate(SyncJob job, bool insert) + { + if (job == null) + { + throw new ArgumentNullException("job"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + string commandText; + var paramList = new List(); + + if (insert) + { + commandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + } + else + { + commandText = "update SyncJobs set TargetId=?,Name=?,Profile=?,Quality=?,Bitrate=?,Status=?,Progress=?,UserId=?,ItemIds=?,Category=?,ParentId=?,UnwatchedOnly=?,ItemLimit=?,SyncNewContent=?,DateCreated=?,DateLastModified=?,ItemCount=? where Id=?"; + } + + paramList.Add(job.Id.ToGuidParamValue()); + paramList.Add(job.TargetId); + paramList.Add(job.Name); + paramList.Add(job.Profile); + paramList.Add(job.Quality); + paramList.Add(job.Bitrate); + paramList.Add(job.Status.ToString()); + paramList.Add(job.Progress); + paramList.Add(job.UserId); + + paramList.Add(string.Join(",", job.RequestedItemIds.ToArray())); + paramList.Add(job.Category); + paramList.Add(job.ParentId); + paramList.Add(job.UnwatchedOnly); + paramList.Add(job.ItemLimit); + paramList.Add(job.SyncNewContent); + paramList.Add(job.DateCreated.ToDateTimeParamValue()); + paramList.Add(job.DateLastModified.ToDateTimeParamValue()); + paramList.Add(job.ItemCount); + + connection.RunInTransaction(conn => + { + conn.Execute(commandText, paramList.ToArray()); + }); + } + } + } + + public async Task DeleteJob(string id) + { + if (string.IsNullOrWhiteSpace(id)) + { + throw new ArgumentNullException("id"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + connection.RunInTransaction(conn => + { + conn.Execute("delete from SyncJobs where Id=?", id.ToGuidParamValue()); + conn.Execute("delete from SyncJobItems where JobId=?", id); + }); + } + } + } + + public QueryResult GetJobs(SyncJobQuery query) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + CheckDisposed(); + + using (WriteLock.Read()) + { + using (var connection = CreateConnection(true)) + { + var commandText = BaseJobSelectText; + var paramList = new List(); + + var whereClauses = new List(); + + if (query.Statuses.Length > 0) + { + var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); + + whereClauses.Add(string.Format("Status in ({0})", statuses)); + } + if (!string.IsNullOrWhiteSpace(query.TargetId)) + { + whereClauses.Add("TargetId=?"); + paramList.Add(query.TargetId); + } + if (!string.IsNullOrWhiteSpace(query.ExcludeTargetIds)) + { + var excludeIds = (query.ExcludeTargetIds ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + if (excludeIds.Length == 1) + { + whereClauses.Add("TargetId<>?"); + paramList.Add(excludeIds[0]); + } + else if (excludeIds.Length > 1) + { + whereClauses.Add("TargetId<>?"); + paramList.Add(excludeIds[0]); + } + } + if (!string.IsNullOrWhiteSpace(query.UserId)) + { + whereClauses.Add("UserId=?"); + paramList.Add(query.UserId); + } + if (query.SyncNewContent.HasValue) + { + whereClauses.Add("SyncNewContent=?"); + paramList.Add(query.SyncNewContent.Value); + } + + commandText += " mainTable"; + + var whereTextWithoutPaging = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + var startIndex = query.StartIndex ?? 0; + if (startIndex > 0) + { + whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC LIMIT {0})", + startIndex.ToString(_usCulture))); + } + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + + commandText += " ORDER BY (Select Max(DateLastModified) from SyncJobs where TargetId=mainTable.TargetId) DESC, DateLastModified DESC"; + + if (query.Limit.HasValue) + { + commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + } + + var list = new List(); + var count = connection.Query("select count (Id) from SyncJobs" + whereTextWithoutPaging, paramList.ToArray()) + .SelectScalarInt() + .First(); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + list.Add(GetJob(row)); + } + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = count + }; + } + } + } + + public SyncJobItem GetJobItem(string id) + { + if (string.IsNullOrEmpty(id)) + { + throw new ArgumentNullException("id"); + } + + CheckDisposed(); + + using (WriteLock.Read()) + { + var guid = new Guid(id); + + using (var connection = CreateConnection(true)) + { + var commandText = BaseJobItemSelectText + " where Id=?"; + var paramList = new List(); + + paramList.Add(guid.ToGuidParamValue()); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + return GetJobItem(row); + } + + return null; + } + } + } + + private QueryResult GetJobItemReader(SyncJobItemQuery query, string baseSelectText, Func, T> itemFactory) + { + if (query == null) + { + throw new ArgumentNullException("query"); + } + + using (WriteLock.Read()) + { + using (var connection = CreateConnection(true)) + { + var commandText = baseSelectText; + var paramList = new List(); + + var whereClauses = new List(); + + if (!string.IsNullOrWhiteSpace(query.JobId)) + { + whereClauses.Add("JobId=?"); + paramList.Add(query.JobId); + } + if (!string.IsNullOrWhiteSpace(query.ItemId)) + { + whereClauses.Add("ItemId=?"); + paramList.Add(query.ItemId); + } + if (!string.IsNullOrWhiteSpace(query.TargetId)) + { + whereClauses.Add("TargetId=?"); + paramList.Add(query.TargetId); + } + + if (query.Statuses.Length > 0) + { + var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); + + whereClauses.Add(string.Format("Status in ({0})", statuses)); + } + + var whereTextWithoutPaging = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + var startIndex = query.StartIndex ?? 0; + if (startIndex > 0) + { + whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobItems ORDER BY JobItemIndex, DateCreated LIMIT {0})", + startIndex.ToString(_usCulture))); + } + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + + commandText += " ORDER BY JobItemIndex, DateCreated"; + + if (query.Limit.HasValue) + { + commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture); + } + + var list = new List(); + var count = connection.Query("select count (Id) from SyncJobItems" + whereTextWithoutPaging, paramList.ToArray()) + .SelectScalarInt() + .First(); + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + list.Add(itemFactory(row)); + } + + return new QueryResult() + { + Items = list.ToArray(), + TotalRecordCount = count + }; + } + } + } + + public Dictionary GetSyncedItemProgresses(SyncJobItemQuery query) + { + var result = new Dictionary(); + + var now = DateTime.UtcNow; + + using (WriteLock.Read()) + { + using (var connection = CreateConnection(true)) + { + var commandText = "select ItemId,Status,Progress from SyncJobItems"; + + var whereClauses = new List(); + var paramList = new List(); + + if (!string.IsNullOrWhiteSpace(query.TargetId)) + { + whereClauses.Add("TargetId=?"); + paramList.Add(query.TargetId); + } + + if (query.Statuses.Length > 0) + { + var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray()); + + whereClauses.Add(string.Format("Status in ({0})", statuses)); + } + + if (whereClauses.Count > 0) + { + commandText += " where " + string.Join(" AND ", whereClauses.ToArray()); + } + + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + AddStatusResult(row, result, false); + } + LogQueryTime("GetSyncedItemProgresses", commandText, now); + + commandText = commandText + .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs") + .Replace("'Synced'", "'Completed','CompletedWithError'"); + + now = DateTime.UtcNow; + foreach (var row in connection.Query(commandText, paramList.ToArray())) + { + AddStatusResult(row, result, true); + } + LogQueryTime("GetSyncedItemProgresses", commandText, now); + } + } + + return result; + } + + 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); + } + } + + private void AddStatusResult(IReadOnlyList reader, Dictionary result, bool multipleIds) + { + if (reader[0].SQLiteType == SQLiteType.Null) + { + return; + } + + var itemIds = new List(); + + var ids = reader[0].ToString(); + + if (multipleIds) + { + itemIds = ids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); + } + else + { + itemIds.Add(ids); + } + + if (reader[1].SQLiteType != SQLiteType.Null) + { + SyncJobItemStatus status; + var statusString = reader[1].ToString(); + if (string.Equals(statusString, "Completed", StringComparison.OrdinalIgnoreCase) || + string.Equals(statusString, "CompletedWithError", StringComparison.OrdinalIgnoreCase)) + { + status = SyncJobItemStatus.Synced; + } + else + { + status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), statusString, true); + } + + if (status == SyncJobItemStatus.Synced) + { + foreach (var itemId in itemIds) + { + result[itemId] = new SyncedItemProgress + { + Status = SyncJobItemStatus.Synced + }; + } + } + else + { + double progress = reader[2].SQLiteType == SQLiteType.Null ? 0.0 : reader[2].ToDouble(); + + foreach (var itemId in itemIds) + { + SyncedItemProgress currentStatus; + if (!result.TryGetValue(itemId, out currentStatus) || (currentStatus.Status != SyncJobItemStatus.Synced && progress >= currentStatus.Progress)) + { + result[itemId] = new SyncedItemProgress + { + Status = status, + Progress = progress + }; + } + } + } + } + } + + public QueryResult GetJobItems(SyncJobItemQuery query) + { + return GetJobItemReader(query, BaseJobItemSelectText, GetJobItem); + } + + public Task Create(SyncJobItem jobItem) + { + return InsertOrUpdate(jobItem, true); + } + + public Task Update(SyncJobItem jobItem) + { + return InsertOrUpdate(jobItem, false); + } + + private async Task InsertOrUpdate(SyncJobItem jobItem, bool insert) + { + if (jobItem == null) + { + throw new ArgumentNullException("jobItem"); + } + + CheckDisposed(); + + using (WriteLock.Write()) + { + using (var connection = CreateConnection()) + { + string commandText; + + if (insert) + { + commandText = "insert into SyncJobItems (Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + } + else + { + // cmd + commandText = "update SyncJobItems set ItemId=?,ItemName=?,MediaSourceId=?,JobId=?,TemporaryPath=?,OutputPath=?,Status=?,TargetId=?,DateCreated=?,Progress=?,AdditionalFiles=?,MediaSource=?,IsMarkedForRemoval=?,JobItemIndex=?,ItemDateModifiedTicks=? where Id=?"; + } + + var paramList = new List(); + paramList.Add(jobItem.Id.ToGuidParamValue()); + paramList.Add(jobItem.ItemId); + paramList.Add(jobItem.ItemName); + paramList.Add(jobItem.MediaSourceId); + paramList.Add(jobItem.JobId); + paramList.Add(jobItem.TemporaryPath); + paramList.Add(jobItem.OutputPath); + paramList.Add(jobItem.Status.ToString()); + + paramList.Add(jobItem.TargetId); + paramList.Add(jobItem.DateCreated.ToDateTimeParamValue()); + paramList.Add(jobItem.Progress); + paramList.Add(_json.SerializeToString(jobItem.AdditionalFiles)); + paramList.Add(jobItem.MediaSource == null ? null : _json.SerializeToString(jobItem.MediaSource)); + paramList.Add(jobItem.IsMarkedForRemoval); + paramList.Add(jobItem.JobItemIndex); + paramList.Add(jobItem.ItemDateModifiedTicks); + + connection.RunInTransaction(conn => + { + conn.Execute(commandText, paramList.ToArray()); + }); + } + } + } + + private SyncJobItem GetJobItem(IReadOnlyList reader) + { + var info = new SyncJobItem + { + Id = reader[0].ReadGuid().ToString("N"), + ItemId = reader[1].ToString() + }; + + if (reader[2].SQLiteType != SQLiteType.Null) + { + info.ItemName = reader[2].ToString(); + } + + if (reader[3].SQLiteType != SQLiteType.Null) + { + info.MediaSourceId = reader[3].ToString(); + } + + info.JobId = reader[4].ToString(); + + if (reader[5].SQLiteType != SQLiteType.Null) + { + info.TemporaryPath = reader[5].ToString(); + } + if (reader[6].SQLiteType != SQLiteType.Null) + { + info.OutputPath = reader[6].ToString(); + } + + if (reader[7].SQLiteType != SQLiteType.Null) + { + info.Status = (SyncJobItemStatus)Enum.Parse(typeof(SyncJobItemStatus), reader[7].ToString(), true); + } + + info.TargetId = reader[8].ToString(); + + info.DateCreated = reader[9].ReadDateTime(); + + if (reader[10].SQLiteType != SQLiteType.Null) + { + info.Progress = reader[10].ToDouble(); + } + + if (reader[11].SQLiteType != SQLiteType.Null) + { + var json = reader[11].ToString(); + + if (!string.IsNullOrWhiteSpace(json)) + { + info.AdditionalFiles = _json.DeserializeFromString>(json); + } + } + + if (reader[12].SQLiteType != SQLiteType.Null) + { + var json = reader[12].ToString(); + + if (!string.IsNullOrWhiteSpace(json)) + { + info.MediaSource = _json.DeserializeFromString(json); + } + } + + info.IsMarkedForRemoval = reader[13].ToBool(); + info.JobItemIndex = reader[14].ToInt(); + + if (reader[15].SQLiteType != SQLiteType.Null) + { + info.ItemDateModifiedTicks = reader[15].ToInt64(); + } + + return info; + } + } +} diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs index f3bab78834..a47aaa3055 100644 --- a/Emby.Server.Implementations/TV/TVSeriesManager.cs +++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs @@ -148,10 +148,6 @@ namespace Emby.Server.Implementations.TV private string GetUniqueSeriesKey(BaseItem series) { - if (_config.Configuration.SchemaVersion < 97) - { - return series.Id.ToString("N"); - } return series.GetPresentationUniqueKey(); } diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config index 519e4a0ad9..5d75af7a21 100644 --- a/Emby.Server.Implementations/packages.config +++ b/Emby.Server.Implementations/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs index 49fdcece18..4e5047f78b 100644 --- a/MediaBrowser.Api/StartupWizardService.cs +++ b/MediaBrowser.Api/StartupWizardService.cs @@ -115,7 +115,6 @@ namespace MediaBrowser.Api config.EnableStandaloneMusicKeys = true; config.EnableCaseSensitiveItemIds = true; config.EnableFolderView = true; - config.SchemaVersion = 109; config.EnableSimpleArtistDetection = true; config.SkipDeserializationForBasicTypes = true; config.SkipDeserializationForPrograms = true; diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 9e212219db..eb082f707a 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -70,6 +70,7 @@ + diff --git a/Emby.Common.Implementations/Updates/GithubUpdater.cs b/MediaBrowser.Common/Updates/GithubUpdater.cs similarity index 99% rename from Emby.Common.Implementations/Updates/GithubUpdater.cs rename to MediaBrowser.Common/Updates/GithubUpdater.cs index 42bc29ed5d..c5000391d8 100644 --- a/Emby.Common.Implementations/Updates/GithubUpdater.cs +++ b/MediaBrowser.Common/Updates/GithubUpdater.cs @@ -8,7 +8,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Updates; -namespace Emby.Common.Implementations.Updates +namespace MediaBrowser.Common.Updates { public class GithubUpdater { diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index 3fb118a9cf..94baacf133 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -123,7 +123,6 @@ namespace MediaBrowser.Controller.Entities public int? MinParentalRating { get; set; } public int? MaxParentalRating { get; set; } - public bool? IsCurrentSchema { get; set; } public bool? HasDeadParentId { get; set; } public bool? IsOffline { get; set; } public bool? IsVirtualItem { get; set; } diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index cca8e3c193..a997d34766 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -126,10 +126,6 @@ namespace MediaBrowser.Controller.Entities.TV private static string GetUniqueSeriesKey(BaseItem series) { - if (ConfigurationManager.Configuration.SchemaVersion < 97) - { - return series.Id.ToString("N"); - } return series.GetPresentationUniqueKey(); } diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 1b8b3feec6..b37e783b86 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -81,8 +81,9 @@ namespace MediaBrowser.MediaEncoding.Encoder { output = GetProcessOutput(encoderAppPath, "-decoders"); } - catch + catch (Exception ) { + //_logger.ErrorException("Error detecting available decoders", ex); } var found = new List(); diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index ba1f23dfea..719083e732 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -932,7 +932,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = FFMpegPath, Arguments = args, IsHidden = true, @@ -1035,7 +1035,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = FFMpegPath, Arguments = args, IsHidden = true, diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 6a1583094c..09996e1d3d 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -996,7 +996,7 @@ namespace MediaBrowser.MediaEncoding.Probing { _splitWhiteList = new List { - "AC/DV" + "AC/DC" }; } diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 0bbc2d9162..30955c22c6 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -451,7 +451,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = _mediaEncoder.EncoderPath, Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath), @@ -582,7 +582,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = _mediaEncoder.EncoderPath, Arguments = processArgs, diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 9715a624fb..cdda858b72 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -192,9 +192,6 @@ namespace MediaBrowser.Model.Configuration public int SharingExpirationDays { get; set; } - public string[] Migrations { get; set; } - - public int MigrationVersion { get; set; } public int SchemaVersion { get; set; } public int SqliteCacheSize { get; set; } @@ -218,7 +215,6 @@ namespace MediaBrowser.Model.Configuration public ServerConfiguration() { LocalNetworkAddresses = new string[] { }; - Migrations = new string[] { }; CodecsUsed = new string[] { }; SqliteCacheSize = 0; ImageExtractionTimeoutMs = 0; diff --git a/MediaBrowser.Model/Reflection/IAssemblyInfo.cs b/MediaBrowser.Model/Reflection/IAssemblyInfo.cs index 634fadc1b4..e8e9c414cf 100644 --- a/MediaBrowser.Model/Reflection/IAssemblyInfo.cs +++ b/MediaBrowser.Model/Reflection/IAssemblyInfo.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Reflection; namespace MediaBrowser.Model.Reflection { @@ -7,5 +8,7 @@ namespace MediaBrowser.Model.Reflection { Stream GetManifestResourceStream(Type type, string resource); string[] GetManifestResourceNames(Type type); + + Assembly[] GetCurrentAssemblies(); } } diff --git a/MediaBrowser.Model/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs index b6f847febb..fa3da97b3e 100644 --- a/MediaBrowser.Model/Tasks/ITaskManager.cs +++ b/MediaBrowser.Model/Tasks/ITaskManager.cs @@ -74,7 +74,5 @@ namespace MediaBrowser.Model.Tasks event EventHandler> TaskExecuting; event EventHandler TaskCompleted; - - bool SuspendTriggers { get; set; } } } \ No newline at end of file diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index e8d964f1c5..f49716eadb 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -87,9 +87,34 @@ - + + False ..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll + + ..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll + True + + + ..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll + True + + + ..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll + True + + + ..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll + True + + + ..\packages\SQLitePCLRaw.core.1.1.0\lib\net45\SQLitePCLRaw.core.dll + True + + + ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.0\lib\net45\SQLitePCLRaw.provider.sqlite3.dll + True + ..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll @@ -1508,6 +1533,15 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\multiselect\multiselect.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\native-promise-only\README.md + + + Resources\dashboard-ui\bower_components\emby-webcomponents\native-promise-only\test_adapter.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\native-promise-only\lib\npo.src.js + Resources\dashboard-ui\bower_components\emby-webcomponents\notifications\badge.png @@ -2393,30 +2427,6 @@ Resources\dashboard-ui\bower_components\libjass\package.json - - Resources\dashboard-ui\bower_components\native-promise-only\.bower.json - - - Resources\dashboard-ui\bower_components\native-promise-only\.gitignore - - - Resources\dashboard-ui\bower_components\native-promise-only\.npmignore - - - Resources\dashboard-ui\bower_components\native-promise-only\README.md - - - Resources\dashboard-ui\bower_components\native-promise-only\build.js - - - Resources\dashboard-ui\bower_components\native-promise-only\package.json - - - Resources\dashboard-ui\bower_components\native-promise-only\test_adapter.js - - - Resources\dashboard-ui\bower_components\native-promise-only\lib\npo.src.js - Resources\dashboard-ui\bower_components\query-string\.bower.json diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index a3023b82cf..fa9f8ae1f6 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -39,7 +39,9 @@ namespace MediaBrowser.Server.Mac static void Main (string[] args) { - var applicationPath = Assembly.GetEntryAssembly().Location; + SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); + + var applicationPath = Assembly.GetEntryAssembly().Location; var options = new StartupOptions(); diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index b6d3c5ce63..bd21db6cc8 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -85,11 +85,11 @@ True - ..\packages\SQLitePCLRaw.core.1.1.0\lib\net45\SQLitePCLRaw.core.dll + ..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll True - ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.0\lib\net45\SQLitePCLRaw.provider.sqlite3.dll + ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll True diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs index fd3c9f506d..d864c47d65 100644 --- a/MediaBrowser.Server.Mono/MonoAppHost.cs +++ b/MediaBrowser.Server.Mono/MonoAppHost.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Reflection; using Emby.Server.Core; using Emby.Server.Core.Data; -using Emby.Server.Core.FFMpeg; +using Emby.Server.Implementations; +using Emby.Server.Implementations.FFMpeg; using MediaBrowser.IsoMounter; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; @@ -91,6 +92,32 @@ namespace MediaBrowser.Server.Mono MainClass.Shutdown(); } + protected override bool SupportsDualModeSockets + { + get + { + return GetMonoVersion() >= new Version(4, 6); + } + } + + private static Version GetMonoVersion() + { + Type type = Type.GetType("Mono.Runtime"); + if (type != null) + { + MethodInfo displayName = type.GetTypeInfo().GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static); + var displayNameValue = displayName.Invoke(null, null).ToString().Trim().Split(' ')[0]; + + Version version; + if (Version.TryParse(displayNameValue, out version)) + { + return version; + } + } + + return new Version(1, 0); + } + protected override void AuthorizeServer() { throw new NotImplementedException(); diff --git a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs index 748b946046..3d6a3e35dc 100644 --- a/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs +++ b/MediaBrowser.Server.Mono/Native/MonoFileSystem.cs @@ -6,7 +6,8 @@ namespace MediaBrowser.Server.Mono.Native { public class MonoFileSystem : ManagedFileSystem { - public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars) : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, false) + public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars) + : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, true) { } diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index 9cc13a59e4..39a537e1e3 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/MediaBrowser.Server.Mono/Program.cs @@ -16,6 +16,7 @@ using Emby.Common.Implementations.Logging; using Emby.Common.Implementations.Networking; using Emby.Common.Implementations.Security; using Emby.Server.Core; +using Emby.Server.Implementations; using Emby.Server.Implementations.IO; using MediaBrowser.Model.System; using MediaBrowser.Server.Startup.Common.IO; @@ -38,7 +39,7 @@ namespace MediaBrowser.Server.Mono var applicationPath = Assembly.GetEntryAssembly().Location; - var options = new StartupOptions(); + var options = new StartupOptions(Environment.GetCommandLineArgs()); // Allow this to be specified on the command line. var customProgramDataPath = options.GetOption("-programdata"); diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index 028ee1e458..e82ef0ed04 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -5,6 +5,6 @@ - - + + \ No newline at end of file diff --git a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs index 0a1470f932..ddbde2f666 100644 --- a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs +++ b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs @@ -3,6 +3,7 @@ using Emby.Drawing; using Emby.Drawing.Net; using Emby.Drawing.ImageMagick; using Emby.Server.Core; +using Emby.Server.Implementations; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Drawing; diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 328041bc3d..7eafc1721e 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -23,7 +23,8 @@ using Emby.Common.Implementations.Logging; using Emby.Common.Implementations.Networking; using Emby.Common.Implementations.Security; using Emby.Server.Core; -using Emby.Server.Core.Browser; +using Emby.Server.Implementations; +using Emby.Server.Implementations.Browser; using Emby.Server.Implementations.IO; using ImageMagickSharp; using MediaBrowser.Common.Net; @@ -73,7 +74,7 @@ namespace MediaBrowser.ServerApplication /// public static void Main() { - var options = new StartupOptions(); + var options = new StartupOptions(Environment.GetCommandLineArgs()); IsRunningAsService = options.ContainsOption("-service"); if (IsRunningAsService) diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index e5a632d69b..0826dc2250 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -91,11 +91,11 @@ True - ..\packages\SQLitePCLRaw.core.1.1.0\lib\net45\SQLitePCLRaw.core.dll + ..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll True - ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.0\lib\net45\SQLitePCLRaw.provider.sqlite3.dll + ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll True diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs index 139961e6f3..c421dd9ebd 100644 --- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs +++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs @@ -4,7 +4,7 @@ using MediaBrowser.Model.Logging; using System; using System.ComponentModel; using System.Windows.Forms; -using Emby.Server.Core.Browser; +using Emby.Server.Implementations.Browser; using MediaBrowser.Model.Globalization; namespace MediaBrowser.ServerApplication diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs index fa18b52295..937762ed00 100644 --- a/MediaBrowser.ServerApplication/WindowsAppHost.cs +++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs @@ -5,8 +5,9 @@ using System.IO; using System.Reflection; using Emby.Server.Core; using Emby.Server.Core.Data; -using Emby.Server.Core.FFMpeg; +using Emby.Server.Implementations; using Emby.Server.Implementations.EntryPoints; +using Emby.Server.Implementations.FFMpeg; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; @@ -116,6 +117,14 @@ namespace MediaBrowser.ServerApplication } } + protected override bool SupportsDualModeSockets + { + get + { + return true; + } + } + public override void LaunchUrl(string url) { var process = new Process @@ -136,6 +145,7 @@ namespace MediaBrowser.ServerApplication } catch (Exception ex) { + Console.WriteLine("Error launching url: {0}", url); Logger.ErrorException("Error launching url: {0}", ex, url); throw; diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index d1958db4d5..7385ba3745 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -5,6 +5,6 @@ - - + + \ No newline at end of file