From fa714425dd91fed2ca691cd45f73f7ea5a579dff Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 18 Nov 2016 03:39:20 -0500
Subject: begin to rework repositories

---
 .../Data/BaseSqliteRepository.cs                   | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 Emby.Server.Implementations/Data/BaseSqliteRepository.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
new file mode 100644
index 000000000..c7ac630a0
--- /dev/null
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
+using SQLitePCL.pretty;
+
+namespace Emby.Server.Implementations.Data
+{
+    public abstract class BaseSqliteRepository : IDisposable
+    {
+        protected string DbFilePath { get; set; }
+        protected SemaphoreSlim WriteLock = new SemaphoreSlim(1, 1);
+        protected ILogger Logger { get; private set; }
+
+        protected BaseSqliteRepository(ILogger logger)
+        {
+            Logger = logger;
+        }
+
+        protected virtual bool EnableConnectionPooling
+        {
+            get { return true; }
+        }
+
+        protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
+        {
+            SQLite3.EnableSharedCache = false;
+
+            ConnectionFlags connectionFlags;
+
+            if (isReadOnly)
+            {
+                connectionFlags = ConnectionFlags.ReadOnly;
+                //connectionFlags = ConnectionFlags.Create;
+                //connectionFlags |= ConnectionFlags.ReadWrite;
+            }
+            else
+            {
+                connectionFlags = ConnectionFlags.Create;
+                connectionFlags |= ConnectionFlags.ReadWrite;
+            }
+
+            if (EnableConnectionPooling)
+            {
+                connectionFlags |= ConnectionFlags.SharedCached;
+            }
+            else
+            {
+                connectionFlags |= ConnectionFlags.PrivateCache;
+            }
+
+            connectionFlags |= ConnectionFlags.NoMutex;
+
+            var db = SQLite3.Open(DbFilePath, connectionFlags, null);
+
+            var queries = new[]
+            {
+                "PRAGMA page_size=4096",
+                "PRAGMA journal_mode=WAL",
+                "PRAGMA temp_store=memory",
+                "PRAGMA synchronous=Normal",
+                //"PRAGMA cache size=-10000"
+                };
+
+            //foreach (var query in queries)
+            //{
+            //    db.Execute(query);
+            //}
+
+            db.ExecuteAll(string.Join(";", queries));
+
+            return db;
+        }
+
+        private bool _disposed;
+        protected void CheckDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(GetType().Name + " has been disposed and cannot be accessed.");
+            }
+        }
+
+        public void Dispose()
+        {
+            _disposed = true;
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private readonly object _disposeLock = new object();
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                try
+                {
+                    lock (_disposeLock)
+                    {
+                        WriteLock.Wait();
+
+                        CloseConnection();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error disposing database", ex);
+                }
+            }
+        }
+
+        protected virtual void CloseConnection()
+        {
+
+        }
+    }
+}
-- 
cgit v1.2.3


From 9f40c1982bf2b63d2779a8971361364772e33298 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 18 Nov 2016 04:28:39 -0500
Subject: rework additional repositories

---
 Emby.Server.Core/ApplicationHost.cs                |  10 +-
 .../Data/SqliteDisplayPreferencesRepository.cs     | 312 --------------------
 .../Security/AuthenticationRepository.cs           | 315 ---------------------
 .../Data/BaseSqliteRepository.cs                   |  24 +-
 .../Data/SqliteDisplayPreferencesRepository.cs     | 228 +++++++++++++++
 .../Data/SqliteExtensions.cs                       |  28 +-
 .../Emby.Server.Implementations.csproj             |   2 +
 .../Security/AuthenticationRepository.cs           | 258 +++++++++++++++++
 8 files changed, 543 insertions(+), 634 deletions(-)
 delete mode 100644 Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
 delete mode 100644 Emby.Server.Core/Security/AuthenticationRepository.cs
 create mode 100644 Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
 create mode 100644 Emby.Server.Implementations/Security/AuthenticationRepository.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 7e67c8a08..8a62a9b27 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -91,7 +91,7 @@ using Emby.Server.Core.FFMpeg;
 using Emby.Server.Core.IO;
 using Emby.Server.Core.Localization;
 using Emby.Server.Core.Migrations;
-using Emby.Server.Core.Security;
+using Emby.Server.Implementations.Security;
 using Emby.Server.Implementations.Social;
 using Emby.Server.Core.Sync;
 using Emby.Server.Implementations.Channels;
@@ -554,7 +554,7 @@ namespace Emby.Server.Core
 
             UserRepository = await GetUserRepository().ConfigureAwait(false);
 
-            var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LogManager, JsonSerializer, ApplicationPaths, GetDbConnector(), MemoryStreamFactory);
+            var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LogManager.GetLogger("SqliteDisplayPreferencesRepository"), JsonSerializer, ApplicationPaths, MemoryStreamFactory);
             DisplayPreferencesRepository = displayPreferencesRepo;
             RegisterSingleInstance(DisplayPreferencesRepository);
 
@@ -699,7 +699,7 @@ namespace Emby.Server.Core
             SubtitleEncoder = new SubtitleEncoder(LibraryManager, LogManager.GetLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer, HttpClient, MediaSourceManager, MemoryStreamFactory, ProcessFactory, textEncoding);
             RegisterSingleInstance(SubtitleEncoder);
 
-            await displayPreferencesRepo.Initialize().ConfigureAwait(false);
+            displayPreferencesRepo.Initialize();
 
             var userDataRepo = new SqliteUserDataRepository(LogManager, ApplicationPaths, GetDbConnector());
 
@@ -828,9 +828,9 @@ namespace Emby.Server.Core
 
         private async Task<IAuthenticationRepository> GetAuthenticationRepository()
         {
-            var repo = new AuthenticationRepository(LogManager, ServerConfigurationManager.ApplicationPaths, GetDbConnector());
+            var repo = new AuthenticationRepository(LogManager.GetLogger("AuthenticationRepository"), ServerConfigurationManager.ApplicationPaths);
 
-            await repo.Initialize().ConfigureAwait(false);
+            repo.Initialize();
 
             return repo;
         }
diff --git a/Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
deleted file mode 100644
index a9e63a11d..000000000
--- a/Emby.Server.Core/Data/SqliteDisplayPreferencesRepository.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-
-namespace Emby.Server.Core.Data
-{
-    /// <summary>
-    /// Class SQLiteDisplayPreferencesRepository
-    /// </summary>
-    public class SqliteDisplayPreferencesRepository : BaseSqliteRepository, IDisplayPreferencesRepository
-    {
-        private readonly IMemoryStreamFactory _memoryStreamProvider;
-
-        public SqliteDisplayPreferencesRepository(ILogManager logManager, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IDbConnector dbConnector, IMemoryStreamFactory memoryStreamProvider)
-            : base(logManager, dbConnector)
-        {
-            _jsonSerializer = jsonSerializer;
-            _memoryStreamProvider = memoryStreamProvider;
-            DbFilePath = Path.Combine(appPaths.DataPath, "displaypreferences.db");
-        }
-
-        /// <summary>
-        /// Gets the name of the repository
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get
-            {
-                return "SQLite";
-            }
-        }
-
-        /// <summary>
-        /// The _json serializer
-        /// </summary>
-        private readonly IJsonSerializer _jsonSerializer;
-
-        /// <summary>
-        /// Opens the connection to the database
-        /// </summary>
-        /// <returns>Task.</returns>
-        public async Task Initialize()
-        {
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                string[] queries = {
-
-                                "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
-                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
-                               };
-
-                connection.RunQueries(queries, Logger);
-            }
-        }
-
-        /// <summary>
-        /// Save the display preferences associated with an item in the repo
-        /// </summary>
-        /// <param name="displayPreferences">The display preferences.</param>
-        /// <param name="userId">The user id.</param>
-        /// <param name="client">The client.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public async Task SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, CancellationToken cancellationToken)
-        {
-            if (displayPreferences == null)
-            {
-                throw new ArgumentNullException("displayPreferences");
-            }
-            if (string.IsNullOrWhiteSpace(displayPreferences.Id))
-            {
-                throw new ArgumentNullException("displayPreferences.Id");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                IDbTransaction transaction = null;
-
-                try
-                {
-                    transaction = connection.BeginTransaction();
-
-                    using (var cmd = connection.CreateCommand())
-                    {
-                        cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
-
-                        cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreferences.Id);
-                        cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
-                        cmd.Parameters.Add(cmd, "@3", DbType.String).Value = client;
-                        cmd.Parameters.Add(cmd, "@4", 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 display preferences:", e);
-
-                    if (transaction != null)
-                    {
-                        transaction.Rollback();
-                    }
-
-                    throw;
-                }
-                finally
-                {
-                    if (transaction != null)
-                    {
-                        transaction.Dispose();
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Save all display preferences associated with a user in the repo
-        /// </summary>
-        /// <param name="displayPreferences">The display preferences.</param>
-        /// <param name="userId">The user id.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public async Task SaveAllDisplayPreferences(IEnumerable<DisplayPreferences> displayPreferences, Guid userId, CancellationToken cancellationToken)
-        {
-            if (displayPreferences == null)
-            {
-                throw new ArgumentNullException("displayPreferences");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                IDbTransaction transaction = null;
-
-                try
-                {
-                    transaction = connection.BeginTransaction();
-
-                    foreach (var displayPreference in displayPreferences)
-                    {
-
-                        var serialized = _jsonSerializer.SerializeToBytes(displayPreference, _memoryStreamProvider);
-
-                        using (var cmd = connection.CreateCommand())
-                        {
-                            cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
-
-                            cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreference.Id);
-                            cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
-                            cmd.Parameters.Add(cmd, "@3", DbType.String).Value = displayPreference.Client;
-                            cmd.Parameters.Add(cmd, "@4", 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 display preferences:", e);
-
-                    if (transaction != null)
-                    {
-                        transaction.Rollback();
-                    }
-
-                    throw;
-                }
-                finally
-                {
-                    if (transaction != null)
-                    {
-                        transaction.Dispose();
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the display preferences.
-        /// </summary>
-        /// <param name="displayPreferencesId">The display preferences id.</param>
-        /// <param name="userId">The user id.</param>
-        /// <param name="client">The client.</param>
-        /// <returns>Task{DisplayPreferences}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client)
-        {
-            if (string.IsNullOrWhiteSpace(displayPreferencesId))
-            {
-                throw new ArgumentNullException("displayPreferencesId");
-            }
-
-            var guidId = displayPreferencesId.GetMD5();
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "select data from userdisplaypreferences where id = @id and userId=@userId and client=@client";
-
-                    cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = guidId;
-                    cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
-                    cmd.Parameters.Add(cmd, "@client", DbType.String).Value = client;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                    {
-                        if (reader.Read())
-                        {
-                            using (var stream = reader.GetMemoryStream(0, _memoryStreamProvider))
-                            {
-                                return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
-                            }
-                        }
-                    }
-
-                    return new DisplayPreferences
-                    {
-                        Id = guidId.ToString("N")
-                    };
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets all display preferences for the given user.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <returns>Task{DisplayPreferences}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
-        public IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId)
-        {
-            var list = new List<DisplayPreferences>();
-
-            using (var connection = CreateConnection(true).Result)
-            {
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "select data from userdisplaypreferences where userId=@userId";
-
-                    cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
-                    {
-                        while (reader.Read())
-                        {
-                            using (var stream = reader.GetMemoryStream(0, _memoryStreamProvider))
-                            {
-                                list.Add(_jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream));
-                            }
-                        }
-                    }
-                }
-            }
-
-            return list;
-        }
-
-        public Task SaveDisplayPreferences(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken)
-        {
-            return SaveDisplayPreferences(displayPreferences, new Guid(userId), client, cancellationToken);
-        }
-
-        public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, string userId, string client)
-        {
-            return GetDisplayPreferences(displayPreferencesId, new Guid(userId), client);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Emby.Server.Core/Security/AuthenticationRepository.cs b/Emby.Server.Core/Security/AuthenticationRepository.cs
deleted file mode 100644
index 548585375..000000000
--- a/Emby.Server.Core/Security/AuthenticationRepository.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Server.Core.Data;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-
-namespace Emby.Server.Core.Security
-{
-    public class AuthenticationRepository : BaseSqliteRepository, IAuthenticationRepository
-    {
-        private readonly IServerApplicationPaths _appPaths;
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
-
-        public AuthenticationRepository(ILogManager logManager, IServerApplicationPaths appPaths, IDbConnector connector)
-            : base(logManager, connector)
-        {
-            _appPaths = appPaths;
-            DbFilePath = Path.Combine(appPaths.DataPath, "authentication.db");
-        }
-
-        public async Task Initialize()
-        {
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                string[] queries = {
-
-                                "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)",
-                                "create index if not exists idx_AccessTokens on AccessTokens(Id)"
-                               };
-
-                connection.RunQueries(queries, Logger);
-
-                connection.AddColumn(Logger, "AccessTokens", "AppVersion", "TEXT");
-            }
-        }
-
-        public Task Create(AuthenticationInfo info, CancellationToken cancellationToken)
-        {
-            info.Id = Guid.NewGuid().ToString("N");
-
-            return Update(info, cancellationToken);
-        }
-
-        public async Task Update(AuthenticationInfo info, CancellationToken cancellationToken)
-        {
-            if (info == null)
-            {
-                throw new ArgumentNullException("info");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using (var connection = await CreateConnection().ConfigureAwait(false))
-            {
-                using (var saveInfoCommand = connection.CreateCommand())
-                {
-                    saveInfoCommand.CommandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)";
-
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@Id");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AccessToken");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DeviceId");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AppName");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@AppVersion");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DeviceName");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@UserId");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@IsActive");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DateCreated");
-                    saveInfoCommand.Parameters.Add(saveInfoCommand, "@DateRevoked");
-
-                    IDbTransaction transaction = null;
-
-                    try
-                    {
-                        transaction = connection.BeginTransaction();
-
-                        saveInfoCommand.GetParameter("@Id").Value = new Guid(info.Id);
-                        saveInfoCommand.GetParameter("@AccessToken").Value = info.AccessToken;
-                        saveInfoCommand.GetParameter("@DeviceId").Value = info.DeviceId;
-                        saveInfoCommand.GetParameter("@AppName").Value = info.AppName;
-                        saveInfoCommand.GetParameter("@AppVersion").Value = info.AppVersion;
-                        saveInfoCommand.GetParameter("@DeviceName").Value = info.DeviceName;
-                        saveInfoCommand.GetParameter("@UserId").Value = info.UserId;
-                        saveInfoCommand.GetParameter("@IsActive").Value = info.IsActive;
-                        saveInfoCommand.GetParameter("@DateCreated").Value = info.DateCreated;
-                        saveInfoCommand.GetParameter("@DateRevoked").Value = info.DateRevoked;
-
-                        saveInfoCommand.Transaction = transaction;
-
-                        saveInfoCommand.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 const string BaseSelectText = "select Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked from AccessTokens";
-
-        public QueryResult<AuthenticationInfo> Get(AuthenticationInfoQuery query)
-        {
-            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<string>();
-
-                    var startIndex = query.StartIndex ?? 0;
-
-                    if (!string.IsNullOrWhiteSpace(query.AccessToken))
-                    {
-                        whereClauses.Add("AccessToken=@AccessToken");
-                        cmd.Parameters.Add(cmd, "@AccessToken", DbType.String).Value = query.AccessToken;
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(query.UserId))
-                    {
-                        whereClauses.Add("UserId=@UserId");
-                        cmd.Parameters.Add(cmd, "@UserId", DbType.String).Value = query.UserId;
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(query.DeviceId))
-                    {
-                        whereClauses.Add("DeviceId=@DeviceId");
-                        cmd.Parameters.Add(cmd, "@DeviceId", DbType.String).Value = query.DeviceId;
-                    }
-
-                    if (query.IsActive.HasValue)
-                    {
-                        whereClauses.Add("IsActive=@IsActive");
-                        cmd.Parameters.Add(cmd, "@IsActive", DbType.Boolean).Value = query.IsActive.Value;
-                    }
-
-                    if (query.HasUser.HasValue)
-                    {
-                        if (query.HasUser.Value)
-                        {
-                            whereClauses.Add("UserId not null");
-                        }
-                        else
-                        {
-                            whereClauses.Add("UserId is null");
-                        }
-                    }
-
-                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    if (startIndex > 0)
-                    {
-                        var pagingWhereText = whereClauses.Count == 0 ?
-                            string.Empty :
-                            " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
-                            pagingWhereText,
-                            startIndex.ToString(_usCulture)));
-                    }
-
-                    var whereText = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    cmd.CommandText += whereText;
-
-                    cmd.CommandText += " ORDER BY DateCreated";
-
-                    if (query.Limit.HasValue)
-                    {
-                        cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                    }
-
-                    cmd.CommandText += "; select count (Id) from AccessTokens" + whereTextWithoutPaging;
-
-                    var list = new List<AuthenticationInfo>();
-                    var count = 0;
-
-                    using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
-                    {
-                        while (reader.Read())
-                        {
-                            list.Add(Get(reader));
-                        }
-
-                        if (reader.NextResult() && reader.Read())
-                        {
-                            count = reader.GetInt32(0);
-                        }
-                    }
-
-                    return new QueryResult<AuthenticationInfo>()
-                    {
-                        Items = list.ToArray(),
-                        TotalRecordCount = count
-                    };
-                }
-            }
-        }
-
-        public AuthenticationInfo Get(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 = BaseSelectText + " 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 Get(reader);
-                        }
-                    }
-                }
-
-                return null;
-            }
-        }
-
-        private AuthenticationInfo Get(IDataReader reader)
-        {
-            var info = new AuthenticationInfo
-            {
-                Id = reader.GetGuid(0).ToString("N"),
-                AccessToken = reader.GetString(1)
-            };
-
-            if (!reader.IsDBNull(2))
-            {
-                info.DeviceId = reader.GetString(2);
-            }
-
-            if (!reader.IsDBNull(3))
-            {
-                info.AppName = reader.GetString(3);
-            }
-
-            if (!reader.IsDBNull(4))
-            {
-                info.AppVersion = reader.GetString(4);
-            }
-
-            if (!reader.IsDBNull(5))
-            {
-                info.DeviceName = reader.GetString(5);
-            }
-
-            if (!reader.IsDBNull(6))
-            {
-                info.UserId = reader.GetString(6);
-            }
-
-            info.IsActive = reader.GetBoolean(7);
-            info.DateCreated = reader.GetDateTime(8).ToUniversalTime();
-
-            if (!reader.IsDBNull(9))
-            {
-                info.DateRevoked = reader.GetDateTime(9).ToUniversalTime();
-            }
-
-            return info;
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index c7ac630a0..8febe83b2 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -69,7 +69,7 @@ namespace Emby.Server.Implementations.Data
             //}
 
             db.ExecuteAll(string.Join(";", queries));
-
+            
             return db;
         }
 
@@ -119,5 +119,27 @@ namespace Emby.Server.Implementations.Data
         {
 
         }
+
+        protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type)
+        {
+            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;
+                    }
+                }
+            }
+
+            connection.ExecuteAll(string.Join(";", new string[]
+            {
+                "alter table " + table,
+                "add column " + columnName + " " + type + " NULL"
+            }));
+        }
     }
 }
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
new file mode 100644
index 000000000..79fc893f4
--- /dev/null
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -0,0 +1,228 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using SQLitePCL.pretty;
+
+namespace Emby.Server.Implementations.Data
+{
+    /// <summary>
+    /// Class SQLiteDisplayPreferencesRepository
+    /// </summary>
+    public class SqliteDisplayPreferencesRepository : BaseSqliteRepository, IDisplayPreferencesRepository
+    {
+        private readonly IMemoryStreamFactory _memoryStreamProvider;
+
+        public SqliteDisplayPreferencesRepository(ILogger logger, IJsonSerializer jsonSerializer, IApplicationPaths appPaths, IMemoryStreamFactory memoryStreamProvider)
+            : base(logger)
+        {
+            _jsonSerializer = jsonSerializer;
+            _memoryStreamProvider = memoryStreamProvider;
+            DbFilePath = Path.Combine(appPaths.DataPath, "displaypreferences.db");
+        }
+
+        /// <summary>
+        /// Gets the name of the repository
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get
+            {
+                return "SQLite";
+            }
+        }
+
+        /// <summary>
+        /// The _json serializer
+        /// </summary>
+        private readonly IJsonSerializer _jsonSerializer;
+
+        /// <summary>
+        /// Opens the connection to the database
+        /// </summary>
+        /// <returns>Task.</returns>
+        public void Initialize()
+        {
+            using (var connection = CreateConnection())
+            {
+                string[] queries = {
+
+                                "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
+                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
+                               };
+
+                connection.RunQueries(queries);
+            }
+        }
+
+        /// <summary>
+        /// Save the display preferences associated with an item in the repo
+        /// </summary>
+        /// <param name="displayPreferences">The display preferences.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="client">The client.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public async Task SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, CancellationToken cancellationToken)
+        {
+            if (displayPreferences == null)
+            {
+                throw new ArgumentNullException("displayPreferences");
+            }
+            if (string.IsNullOrWhiteSpace(displayPreferences.Id))
+            {
+                throw new ArgumentNullException("displayPreferences.Id");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    connection.RunInTransaction(db =>
+                    {
+                        SaveDisplayPreferences(displayPreferences, userId, client, db);
+                    });
+                }
+            }
+        }
+
+        private void SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, IDatabaseConnection connection)
+        {
+            var commandText = "replace into userdisplaypreferences (id, userid, client, data) values (?, ?, ?, ?)";
+            var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
+
+            connection.Execute(commandText,
+                displayPreferences.Id.ToGuidParamValue(),
+                userId.ToGuidParamValue(),
+                client,
+                serialized);
+        }
+
+        /// <summary>
+        /// Save all display preferences associated with a user in the repo
+        /// </summary>
+        /// <param name="displayPreferences">The display preferences.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public async Task SaveAllDisplayPreferences(IEnumerable<DisplayPreferences> displayPreferences, Guid userId, CancellationToken cancellationToken)
+        {
+            if (displayPreferences == null)
+            {
+                throw new ArgumentNullException("displayPreferences");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    connection.RunInTransaction(db =>
+                    {
+                        foreach (var displayPreference in displayPreferences)
+                        {
+                            SaveDisplayPreferences(displayPreference, userId, displayPreference.Client, db);
+                        }
+                    });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the display preferences.
+        /// </summary>
+        /// <param name="displayPreferencesId">The display preferences id.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="client">The client.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client)
+        {
+            if (string.IsNullOrWhiteSpace(displayPreferencesId))
+            {
+                throw new ArgumentNullException("displayPreferencesId");
+            }
+
+            var guidId = displayPreferencesId.GetMD5();
+
+            using (var connection = CreateConnection(true))
+            {
+                var commandText = "select data from userdisplaypreferences where id = ? and userId=? and client=?";
+
+                var paramList = new List<object>();
+                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")
+                };
+            }
+        }
+
+        /// <summary>
+        /// Gets all display preferences for the given user.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId)
+        {
+            var list = new List<DisplayPreferences>();
+
+            using (var connection = CreateConnection(true))
+            {
+                var commandText = "select data from userdisplaypreferences where userId=?";
+
+                var paramList = new List<object>();
+                paramList.Add(userId.ToGuidParamValue());
+
+                foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                {
+                    list.Add(Get(row));
+                }
+            }
+
+            return list;
+        }
+
+        private DisplayPreferences Get(IReadOnlyList<IResultSetValue> row)
+        {
+            using (var stream = _memoryStreamProvider.CreateNew(row[0].ToBlob()))
+            {
+                stream.Position = 0;
+                return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
+            }
+        }
+
+        public Task SaveDisplayPreferences(DisplayPreferences displayPreferences, string userId, string client, CancellationToken cancellationToken)
+        {
+            return SaveDisplayPreferences(displayPreferences, new Guid(userId), client, cancellationToken);
+        }
+
+        public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, string userId, string client)
+        {
+            return GetDisplayPreferences(displayPreferencesId, new Guid(userId), client);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 62615c669..d9536ae9c 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Globalization;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Serialization;
 using SQLitePCL.pretty;
 
 namespace Emby.Server.Implementations.Data
@@ -25,7 +27,12 @@ namespace Emby.Server.Implementations.Data
 
         public static byte[] ToGuidParamValue(this string str)
         {
-            return new Guid(str).ToByteArray();
+            return ToGuidParamValue(new Guid(str));
+        }
+
+        public static byte[] ToGuidParamValue(this Guid guid)
+        {
+            return guid.ToByteArray();
         }
 
         public static Guid ReadGuid(this IResultSetValue result)
@@ -101,5 +108,24 @@ namespace Emby.Server.Implementations.Data
                 DateTimeFormatInfo.InvariantInfo,
                 DateTimeStyles.None).ToUniversalTime();
         }
+
+        /// <summary>
+        /// Serializes to bytes.
+        /// </summary>
+        /// <returns>System.Byte[][].</returns>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj, IMemoryStreamFactory streamProvider)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            using (var stream = streamProvider.CreateNew())
+            {
+                json.SerializeToStream(obj, stream);
+                return stream.ToArray();
+            }
+        }
     }
 }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 6843ad9d7..a4f26bc60 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Connect\ConnectManager.cs" />
     <Compile Include="Connect\Responses.cs" />
     <Compile Include="Connect\Validator.cs" />
+    <Compile Include="Data\SqliteDisplayPreferencesRepository.cs" />
     <Compile Include="Devices\CameraUploadsDynamicFolder.cs" />
     <Compile Include="Devices\DeviceManager.cs" />
     <Compile Include="Devices\DeviceRepository.cs" />
@@ -192,6 +193,7 @@
     <Compile Include="ScheduledTasks\RefreshIntrosTask.cs" />
     <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
     <Compile Include="ScheduledTasks\SystemUpdateTask.cs" />
+    <Compile Include="Security\AuthenticationRepository.cs" />
     <Compile Include="Security\EncryptionManager.cs" />
     <Compile Include="Security\MBLicenseFile.cs" />
     <Compile Include="Security\PluginSecurityManager.cs" />
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
new file mode 100644
index 000000000..5179bd258
--- /dev/null
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.Data;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using SQLitePCL.pretty;
+
+namespace Emby.Server.Implementations.Security
+{
+    public class AuthenticationRepository : BaseSqliteRepository, IAuthenticationRepository
+    {
+        private readonly IServerApplicationPaths _appPaths;
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        public AuthenticationRepository(ILogger logger, IServerApplicationPaths appPaths)
+            : base(logger)
+        {
+            _appPaths = appPaths;
+            DbFilePath = Path.Combine(appPaths.DataPath, "authentication.db");
+        }
+
+        public void Initialize()
+        {
+            using (var connection = CreateConnection())
+            {
+                string[] queries = {
+
+                                "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)",
+                                "create index if not exists idx_AccessTokens on AccessTokens(Id)"
+                               };
+
+                connection.RunQueries(queries);
+
+                connection.RunInTransaction(db =>
+                {
+                    AddColumn(db, "AccessTokens", "AppVersion", "TEXT");
+                });
+            }
+        }
+
+        public Task Create(AuthenticationInfo info, CancellationToken cancellationToken)
+        {
+            info.Id = Guid.NewGuid().ToString("N");
+
+            return Update(info, cancellationToken);
+        }
+
+        public async Task Update(AuthenticationInfo info, CancellationToken cancellationToken)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    connection.RunInTransaction(db =>
+                    {
+                        var commandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+                        db.Execute(commandText,
+                            info.Id.ToGuidParamValue(),
+                            info.AccessToken,
+                            info.DeviceId,
+                            info.AppName,
+                            info.AppVersion,
+                            info.DeviceName,
+                            info.UserId,
+                            info.IsActive,
+                            info.DateCreated.ToDateTimeParamValue(),
+                            info.DateRevoked.HasValue ? info.DateRevoked.Value.ToDateTimeParamValue() : null);
+                    });
+                }
+            }
+        }
+
+        private const string BaseSelectText = "select Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked from AccessTokens";
+
+        public QueryResult<AuthenticationInfo> Get(AuthenticationInfoQuery query)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            using (var connection = CreateConnection(true))
+            {
+                var commandText = BaseSelectText;
+                var paramList = new List<object>();
+
+                var whereClauses = new List<string>();
+
+                var startIndex = query.StartIndex ?? 0;
+
+                if (!string.IsNullOrWhiteSpace(query.AccessToken))
+                {
+                    whereClauses.Add("AccessToken=?");
+                    paramList.Add(query.AccessToken);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.UserId))
+                {
+                    whereClauses.Add("UserId=?");
+                    paramList.Add(query.UserId);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.DeviceId))
+                {
+                    whereClauses.Add("DeviceId=?");
+                    paramList.Add(query.DeviceId);
+                }
+
+                if (query.IsActive.HasValue)
+                {
+                    whereClauses.Add("IsActive=?");
+                    paramList.Add(query.IsActive.Value);
+                }
+
+                if (query.HasUser.HasValue)
+                {
+                    if (query.HasUser.Value)
+                    {
+                        whereClauses.Add("UserId not null");
+                    }
+                    else
+                    {
+                        whereClauses.Add("UserId is null");
+                    }
+                }
+
+                var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                if (startIndex > 0)
+                {
+                    var pagingWhereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.ToString(_usCulture)));
+                }
+
+                var whereText = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                commandText += whereText;
+
+                commandText += " ORDER BY DateCreated";
+
+                if (query.Limit.HasValue)
+                {
+                    commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                }
+
+                var list = new List<AuthenticationInfo>();
+
+                foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                {
+                    list.Add(Get(row));
+                }
+
+                var count = connection.Query("select count (Id) from AccessTokens" + whereTextWithoutPaging, paramList.ToArray())
+                    .SelectScalarInt()
+                    .First();
+
+                return new QueryResult<AuthenticationInfo>()
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = count
+                };
+            }
+        }
+
+        public AuthenticationInfo Get(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseSelectText + " where Id=?";
+                    var paramList = new List<object>();
+
+                    paramList.Add(id.ToGuidParamValue());
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        return Get(row);
+                    }
+                    return null;
+                }
+            }
+        }
+
+        private AuthenticationInfo Get(IReadOnlyList<IResultSetValue> reader)
+        {
+            var info = new AuthenticationInfo
+            {
+                Id = reader[0].ReadGuid().ToString("N"),
+                AccessToken = reader[1].ToString()
+            };
+
+            if (reader[2].SQLiteType != SQLiteType.Null)
+            {
+                info.DeviceId = reader[2].ToString();
+            }
+
+            if (reader[3].SQLiteType != SQLiteType.Null)
+            {
+                info.AppName = reader[3].ToString();
+            }
+
+            if (reader[4].SQLiteType != SQLiteType.Null)
+            {
+                info.AppVersion = reader[4].ToString();
+            }
+
+            if (reader[5].SQLiteType != SQLiteType.Null)
+            {
+                info.DeviceName = reader[5].ToString();
+            }
+
+            if (reader[6].SQLiteType != SQLiteType.Null)
+            {
+                info.UserId = reader[6].ToString();
+            }
+
+            info.IsActive = reader[7].ToBool();
+            info.DateCreated = reader[8].ReadDateTime();
+
+            if (reader[9].SQLiteType != SQLiteType.Null)
+            {
+                info.DateRevoked = reader[9].ReadDateTime();
+            }
+
+            return info;
+        }
+    }
+}
-- 
cgit v1.2.3


From 65a1ef020b205b1676bd7dd70e7261a1fa29b7a2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Nov 2016 00:52:49 -0500
Subject: move sync repository to portable project

---
 Emby.Common.Implementations/BaseApplicationHost.cs |   1 -
 .../ScheduledTasks/TaskManager.cs                  |  26 +-
 .../Updates/GithubUpdater.cs                       | 269 ------
 Emby.Server.Core/ApplicationHost.cs                |  24 +-
 Emby.Server.Core/Browser/BrowserLauncher.cs        |  75 --
 Emby.Server.Core/Data/SqliteItemRepository.cs      |  29 +-
 .../EntryPoints/ExternalPortForwarding.cs          |   3 +-
 Emby.Server.Core/EntryPoints/StartupWizard.cs      |  59 --
 Emby.Server.Core/HttpServerFactory.cs              |   6 +-
 Emby.Server.Core/Migrations/DbMigration.cs         |  64 --
 .../Migrations/UpdateLevelMigration.cs             | 131 ---
 Emby.Server.Core/Sync/SyncRepository.cs            | 976 ---------------------
 .../Activity/ActivityRepository.cs                 |   2 +-
 .../Browser/BrowserLauncher.cs                     |  73 ++
 .../Data/BaseSqliteRepository.cs                   |  20 +-
 .../Data/CleanDatabaseScheduledTask.cs             | 148 +---
 .../Emby.Server.Implementations.csproj             |   4 +
 .../EntryPoints/StartupWizard.cs                   |  59 ++
 .../FileOrganization/OrganizerScheduledTask.cs     |   2 +-
 .../HttpServer/HttpListenerHost.cs                 |   8 +-
 .../Migrations/UpdateLevelMigration.cs             | 130 +++
 .../Security/AuthenticationRepository.cs           |   4 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs | 770 ++++++++++++++++
 Emby.Server.Implementations/TV/TVSeriesManager.cs  |   4 -
 MediaBrowser.Api/StartupWizardService.cs           |   1 -
 MediaBrowser.Common/MediaBrowser.Common.csproj     |   1 +
 MediaBrowser.Common/Updates/GithubUpdater.cs       | 269 ++++++
 .../Entities/InternalItemsQuery.cs                 |   1 -
 MediaBrowser.Controller/Entities/TV/Series.cs      |   4 -
 .../Configuration/ServerConfiguration.cs           |   4 -
 MediaBrowser.Model/Tasks/ITaskManager.cs           |   2 -
 MediaBrowser.Server.Mono/MonoAppHost.cs            |  26 +
 MediaBrowser.Server.Mono/Native/MonoFileSystem.cs  |   3 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |   2 +-
 MediaBrowser.ServerApplication/ServerNotifyIcon.cs |   2 +-
 MediaBrowser.ServerApplication/WindowsAppHost.cs   |   9 +
 36 files changed, 1392 insertions(+), 1819 deletions(-)
 delete mode 100644 Emby.Common.Implementations/Updates/GithubUpdater.cs
 delete mode 100644 Emby.Server.Core/Browser/BrowserLauncher.cs
 delete mode 100644 Emby.Server.Core/EntryPoints/StartupWizard.cs
 delete mode 100644 Emby.Server.Core/Migrations/DbMigration.cs
 delete mode 100644 Emby.Server.Core/Migrations/UpdateLevelMigration.cs
 delete mode 100644 Emby.Server.Core/Sync/SyncRepository.cs
 create mode 100644 Emby.Server.Implementations/Browser/BrowserLauncher.cs
 create mode 100644 Emby.Server.Implementations/EntryPoints/StartupWizard.cs
 create mode 100644 Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
 create mode 100644 Emby.Server.Implementations/Sync/SyncRepository.cs
 create mode 100644 MediaBrowser.Common/Updates/GithubUpdater.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index 1f194968c..02d7cb31f 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/ScheduledTasks/TaskManager.cs b/Emby.Common.Implementations/ScheduledTasks/TaskManager.cs
index 218af7ed5..b0153c588 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();
-                }
-            }
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="TaskManager" /> class.
         /// </summary>
@@ -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
         /// </summary>
         private void ExecuteQueuedTasks()
         {
-            if (SuspendTriggers)
-            {
-                return;
-            }
-
             Logger.Info("ExecuteQueuedTasks");
 
             // Execute queued tasks
diff --git a/Emby.Common.Implementations/Updates/GithubUpdater.cs b/Emby.Common.Implementations/Updates/GithubUpdater.cs
deleted file mode 100644
index 42bc29ed5..000000000
--- a/Emby.Common.Implementations/Updates/GithubUpdater.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Updates;
-
-namespace Emby.Common.Implementations.Updates
-{
-    public class GithubUpdater
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        public GithubUpdater(IHttpClient httpClient, IJsonSerializer jsonSerializer)
-        {
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-        }
-
-        public async Task<CheckForUpdateResult> CheckForUpdateResult(string organzation, string repository, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename, TimeSpan cacheLength, CancellationToken cancellationToken)
-        {
-            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
-
-            var options = new HttpRequestOptions
-            {
-                Url = url,
-                EnableKeepAlive = false,
-                CancellationToken = cancellationToken,
-                UserAgent = "Emby/3.0",
-                BufferContent = false
-            };
-
-            if (cacheLength.Ticks > 0)
-            {
-                options.CacheMode = CacheMode.Unconditional;
-                options.CacheLength = cacheLength;
-            }
-
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
-            {
-                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
-
-                return CheckForUpdateResult(obj, minVersion, updateLevel, assetFilename, packageName, targetFilename);
-            }
-        }
-
-        private CheckForUpdateResult CheckForUpdateResult(RootObject[] obj, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename)
-        {
-            if (updateLevel == PackageVersionClass.Release)
-            {
-                // Technically all we need to do is check that it's not pre-release
-                // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
-                obj = obj.Where(i => !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) && !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-            else if (updateLevel == PackageVersionClass.Beta)
-            {
-                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-            else if (updateLevel == PackageVersionClass.Dev)
-            {
-                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) || i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
-            }
-
-            var availableUpdate = obj
-                .Select(i => CheckForUpdateResult(i, minVersion, assetFilename, packageName, targetFilename))
-                .Where(i => i != null)
-                .OrderByDescending(i => Version.Parse(i.AvailableVersion))
-                .FirstOrDefault();
-
-            return availableUpdate ?? new CheckForUpdateResult
-            {
-                IsUpdateAvailable = false
-            };
-        }
-
-        private bool MatchesUpdateLevel(RootObject i, PackageVersionClass updateLevel)
-        {
-            if (updateLevel == PackageVersionClass.Beta)
-            {
-                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase);
-            }
-            if (updateLevel == PackageVersionClass.Dev)
-            {
-                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) ||
-                       i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
-            }
-
-            // Technically all we need to do is check that it's not pre-release
-            // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
-            return !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) &&
-                   !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
-        }
-
-        public async Task<List<RootObject>> GetLatestReleases(string organzation, string repository, string assetFilename, CancellationToken cancellationToken)
-        {
-            var list = new List<RootObject>();
-
-            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
-
-            var options = new HttpRequestOptions
-            {
-                Url = url,
-                EnableKeepAlive = false,
-                CancellationToken = cancellationToken,
-                UserAgent = "Emby/3.0",
-                BufferContent = false
-            };
-
-            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
-            {
-                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
-
-                obj = obj.Where(i => (i.assets ?? new List<Asset>()).Any(a => IsAsset(a, assetFilename))).ToArray();
-
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Release)).OrderByDescending(GetVersion).Take(1));
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Beta)).OrderByDescending(GetVersion).Take(1));
-                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Dev)).OrderByDescending(GetVersion).Take(1));
-
-                return list;
-            }
-        }
-
-        public Version GetVersion(RootObject obj)
-        {
-            Version version;
-            if (!Version.TryParse(obj.tag_name, out version))
-            {
-                return new Version(1, 0);
-            }
-
-            return version;
-        }
-
-        private CheckForUpdateResult CheckForUpdateResult(RootObject obj, Version minVersion, string assetFilename, string packageName, string targetFilename)
-        {
-            Version version;
-            if (!Version.TryParse(obj.tag_name, out version))
-            {
-                return null;
-            }
-
-            if (version < minVersion)
-            {
-                return null;
-            }
-
-            var asset = (obj.assets ?? new List<Asset>()).FirstOrDefault(i => IsAsset(i, assetFilename));
-
-            if (asset == null)
-            {
-                return null;
-            }
-
-            return new CheckForUpdateResult
-            {
-                AvailableVersion = version.ToString(),
-                IsUpdateAvailable = version > minVersion,
-                Package = new PackageVersionInfo
-                {
-                    classification = obj.prerelease ?
-                        (obj.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase) ? PackageVersionClass.Dev : PackageVersionClass.Beta) :
-                        PackageVersionClass.Release,
-                    name = packageName,
-                    sourceUrl = asset.browser_download_url,
-                    targetFilename = targetFilename,
-                    versionStr = version.ToString(),
-                    requiredVersionStr = "1.0.0",
-                    description = obj.body,
-                    infoUrl = obj.html_url
-                }
-            };
-        }
-
-        private bool IsAsset(Asset asset, string assetFilename)
-        {
-            var downloadFilename = Path.GetFileName(asset.browser_download_url) ?? string.Empty;
-
-            if (downloadFilename.IndexOf(assetFilename, StringComparison.OrdinalIgnoreCase) != -1)
-            {
-                return true;
-            }
-
-            return string.Equals(assetFilename, downloadFilename, StringComparison.OrdinalIgnoreCase);
-        }
-
-        public class Uploader
-        {
-            public string login { get; set; }
-            public int id { get; set; }
-            public string avatar_url { get; set; }
-            public string gravatar_id { get; set; }
-            public string url { get; set; }
-            public string html_url { get; set; }
-            public string followers_url { get; set; }
-            public string following_url { get; set; }
-            public string gists_url { get; set; }
-            public string starred_url { get; set; }
-            public string subscriptions_url { get; set; }
-            public string organizations_url { get; set; }
-            public string repos_url { get; set; }
-            public string events_url { get; set; }
-            public string received_events_url { get; set; }
-            public string type { get; set; }
-            public bool site_admin { get; set; }
-        }
-
-        public class Asset
-        {
-            public string url { get; set; }
-            public int id { get; set; }
-            public string name { get; set; }
-            public object label { get; set; }
-            public Uploader uploader { get; set; }
-            public string content_type { get; set; }
-            public string state { get; set; }
-            public int size { get; set; }
-            public int download_count { get; set; }
-            public string created_at { get; set; }
-            public string updated_at { get; set; }
-            public string browser_download_url { get; set; }
-        }
-
-        public class Author
-        {
-            public string login { get; set; }
-            public int id { get; set; }
-            public string avatar_url { get; set; }
-            public string gravatar_id { get; set; }
-            public string url { get; set; }
-            public string html_url { get; set; }
-            public string followers_url { get; set; }
-            public string following_url { get; set; }
-            public string gists_url { get; set; }
-            public string starred_url { get; set; }
-            public string subscriptions_url { get; set; }
-            public string organizations_url { get; set; }
-            public string repos_url { get; set; }
-            public string events_url { get; set; }
-            public string received_events_url { get; set; }
-            public string type { get; set; }
-            public bool site_admin { get; set; }
-        }
-
-        public class RootObject
-        {
-            public string url { get; set; }
-            public string assets_url { get; set; }
-            public string upload_url { get; set; }
-            public string html_url { get; set; }
-            public int id { get; set; }
-            public string tag_name { get; set; }
-            public string target_commitish { get; set; }
-            public string name { get; set; }
-            public bool draft { get; set; }
-            public Author author { get; set; }
-            public bool prerelease { get; set; }
-            public string created_at { get; set; }
-            public string published_at { get; set; }
-            public List<Asset> assets { get; set; }
-            public string tarball_url { get; set; }
-            public string zipball_url { get; set; }
-            public string body { get; set; }
-        }
-    }
-}
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 6073991b1..00b9b99e6 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;
@@ -90,10 +89,10 @@ using Emby.Server.Implementations.Devices;
 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;
@@ -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<IVersionMigration>
             {
-                new DbMigration(ServerConfigurationManager, TaskManager)
             };
 
             foreach (var task in migrations)
@@ -568,7 +560,7 @@ namespace Emby.Server.Core
             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))
@@ -844,11 +838,11 @@ namespace Emby.Server.Core
             return repo;
         }
 
-        private async Task<ISyncRepository> 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/Browser/BrowserLauncher.cs b/Emby.Server.Core/Browser/BrowserLauncher.cs
deleted file mode 100644
index 4ccc41c30..000000000
--- a/Emby.Server.Core/Browser/BrowserLauncher.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using MediaBrowser.Controller;
-using System;
-
-namespace Emby.Server.Core.Browser
-{
-    /// <summary>
-    /// Class BrowserLauncher
-    /// </summary>
-    public static class BrowserLauncher
-    {
-        /// <summary>
-        /// Opens the dashboard page.
-        /// </summary>
-        /// <param name="page">The page.</param>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
-        {
-            var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
-
-            OpenUrl(appHost, url);
-        }
-
-        /// <summary>
-        /// Opens the community.
-        /// </summary>
-        public static void OpenCommunity(IServerApplicationHost appHost)
-        {
-            OpenUrl(appHost, "http://emby.media/community");
-        }
-
-        public static void OpenEmbyPremiere(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("supporterkey.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the web client.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenWebClient(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("index.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the dashboard.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public static void OpenDashboard(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("dashboard.html", appHost);
-        }
-
-        /// <summary>
-        /// Opens the URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        private static void OpenUrl(IServerApplicationHost appHost, string url)
-        {
-            try
-            {
-                appHost.LaunchUrl(url);
-            }
-            catch (NotImplementedException)
-            {
-                
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Error launching url: " + url);
-                Console.WriteLine(ex.Message);
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Core/Data/SqliteItemRepository.cs b/Emby.Server.Core/Data/SqliteItemRepository.cs
index ed03c0f67..2f08081f6 100644
--- a/Emby.Server.Core/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Core/Data/SqliteItemRepository.cs
@@ -3060,18 +3060,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 +3442,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 +3726,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 +3751,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 +3762,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/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
index c1a19a71f..11e275940 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/EntryPoints/StartupWizard.cs b/Emby.Server.Core/EntryPoints/StartupWizard.cs
deleted file mode 100644
index 30ceca073..000000000
--- a/Emby.Server.Core/EntryPoints/StartupWizard.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Model.Logging;
-using Emby.Server.Core.Browser;
-
-namespace Emby.Server.Core.EntryPoints
-{
-    /// <summary>
-    /// Class StartupWizard
-    /// </summary>
-    public class StartupWizard : IServerEntryPoint
-    {
-        /// <summary>
-        /// The _app host
-        /// </summary>
-        private readonly IServerApplicationHost _appHost;
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartupWizard" /> class.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public StartupWizard(IServerApplicationHost appHost, ILogger logger)
-        {
-            _appHost = appHost;
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Runs this instance.
-        /// </summary>
-        public void Run()
-        {
-            if (_appHost.IsFirstRun)
-            {
-                LaunchStartupWizard();
-            }
-        }
-
-        /// <summary>
-        /// Launches the startup wizard.
-        /// </summary>
-        private void LaunchStartupWizard()
-        {
-            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Emby.Server.Core/HttpServerFactory.cs b/Emby.Server.Core/HttpServerFactory.cs
index d6c07e258..8ec5fb026 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<string, object> GetParseFn(Type propertyType)
diff --git a/Emby.Server.Core/Migrations/DbMigration.cs b/Emby.Server.Core/Migrations/DbMigration.cs
deleted file mode 100644
index 5d652770f..000000000
--- 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<CleanDatabaseScheduledTask>();
-                });
-
-                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<CleanDatabaseScheduledTask>();
-                });
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs b/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
deleted file mode 100644
index c79dbabea..000000000
--- a/Emby.Server.Core/Migrations/UpdateLevelMigration.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Common.Implementations.Updates;
-using MediaBrowser.Common.Net;
-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
-{
-    public class UpdateLevelMigration : IVersionMigration
-    {
-        private readonly IServerConfigurationManager _config;
-        private readonly IServerApplicationHost _appHost;
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly string _releaseAssetFilename;
-        private readonly ILogger _logger;
-
-        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
-        {
-            _config = config;
-            _appHost = appHost;
-            _httpClient = httpClient;
-            _jsonSerializer = jsonSerializer;
-            _releaseAssetFilename = releaseAssetFilename;
-            _logger = logger;
-        }
-
-        public async Task Run()
-        {
-            var lastVersion = _config.Configuration.LastVersion;
-            var currentVersion = _appHost.ApplicationVersion;
-
-            if (string.Equals(lastVersion, currentVersion.ToString(), StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            try
-            {
-                var updateLevel = _config.Configuration.SystemUpdateLevel;
-
-                await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error in update migration", ex);
-            }
-        }
-
-        private async Task CheckVersion(Version currentVersion, PackageVersionClass currentUpdateLevel, CancellationToken cancellationToken)
-        {
-            var releases = await new GithubUpdater(_httpClient, _jsonSerializer)
-                .GetLatestReleases("MediaBrowser", "Emby", _releaseAssetFilename, cancellationToken).ConfigureAwait(false);
-
-            var newUpdateLevel = GetNewUpdateLevel(currentVersion, currentUpdateLevel, releases);
-
-            if (newUpdateLevel != currentUpdateLevel)
-            {
-                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
-                _config.SaveConfiguration();
-            }
-        }
-
-        private PackageVersionClass GetNewUpdateLevel(Version currentVersion, PackageVersionClass currentUpdateLevel, List<GithubUpdater.RootObject> releases)
-        {
-            var newUpdateLevel = currentUpdateLevel;
-
-            // If the current version is later than current stable, set the update level to beta
-            if (releases.Count >= 1)
-            {
-                var release = releases[0];
-                var version = ParseVersion(release.tag_name);
-                if (version != null)
-                {
-                    if (currentVersion > version)
-                    {
-                        newUpdateLevel = PackageVersionClass.Beta;
-                    }
-                    else
-                    {
-                        return PackageVersionClass.Release;
-                    }
-                }
-            }
-
-            // If the current version is later than current beta, set the update level to dev
-            if (releases.Count >= 2)
-            {
-                var release = releases[1];
-                var version = ParseVersion(release.tag_name);
-                if (version != null)
-                {
-                    if (currentVersion > version)
-                    {
-                        newUpdateLevel = PackageVersionClass.Dev;
-                    }
-                    else
-                    {
-                        return PackageVersionClass.Beta;
-                    }
-                }
-            }
-
-            return newUpdateLevel;
-        }
-
-        private Version ParseVersion(string versionString)
-        {
-            if (!string.IsNullOrWhiteSpace(versionString))
-            {
-                var parts = versionString.Split('.');
-                if (parts.Length == 3)
-                {
-                    versionString += ".0";
-                }
-            }
-
-            Version version;
-            Version.TryParse(versionString, out version);
-
-            return version;
-        }
-    }
-}
diff --git a/Emby.Server.Core/Sync/SyncRepository.cs b/Emby.Server.Core/Sync/SyncRepository.cs
deleted file mode 100644
index bfcf76767..000000000
--- 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<string, int> Items { get; set; }
-
-            public SyncSummary()
-            {
-                Items = new Dictionary<string, int>();
-            }
-        }
-
-
-        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<SyncJob> 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<string>();
-
-                    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<SyncJob>();
-                    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<SyncJob>()
-                    {
-                        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<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IDataReader, T> 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<string>();
-
-                    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<T>();
-                    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<T>()
-                    {
-                        Items = list.ToArray(),
-                        TotalRecordCount = count
-                    };
-                }
-            }
-        }
-
-        public Dictionary<string, SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery query)
-        {
-            var result = new Dictionary<string, SyncedItemProgress>();
-
-            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<string>();
-
-                    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<string, SyncedItemProgress> result, bool multipleIds)
-        {
-            if (reader.IsDBNull(0))
-            {
-                return;
-            }
-
-            var itemIds = new List<string>();
-
-            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<SyncJobItem> 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<List<ItemFileInfo>>(json);
-                }
-            }
-
-            if (!reader.IsDBNull(12))
-            {
-                var json = reader.GetString(12);
-
-                if (!string.IsNullOrWhiteSpace(json))
-                {
-                    info.MediaSource = _json.DeserializeFromString<MediaSourceInfo>(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 ea9e537c9..7bc77402e 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -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.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
new file mode 100644
index 000000000..05cde91e2
--- /dev/null
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -0,0 +1,73 @@
+using MediaBrowser.Controller;
+using System;
+
+namespace Emby.Server.Implementations.Browser
+{
+    /// <summary>
+    /// Class BrowserLauncher
+    /// </summary>
+    public static class BrowserLauncher
+    {
+        /// <summary>
+        /// Opens the dashboard page.
+        /// </summary>
+        /// <param name="page">The page.</param>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
+        {
+            var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
+
+            OpenUrl(appHost, url);
+        }
+
+        /// <summary>
+        /// Opens the community.
+        /// </summary>
+        public static void OpenCommunity(IServerApplicationHost appHost)
+        {
+            OpenUrl(appHost, "http://emby.media/community");
+        }
+
+        public static void OpenEmbyPremiere(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("supporterkey.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the web client.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenWebClient(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("index.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the dashboard.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public static void OpenDashboard(IServerApplicationHost appHost)
+        {
+            OpenDashboardPage("dashboard.html", appHost);
+        }
+
+        /// <summary>
+        /// Opens the URL.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        private static void OpenUrl(IServerApplicationHost appHost, string url)
+        {
+            try
+            {
+                appHost.LaunchUrl(url);
+            }
+            catch (NotImplementedException)
+            {
+                
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 8febe83b2..c47a534d1 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
 using SQLitePCL.pretty;
+using System.Linq;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -120,21 +121,30 @@ namespace Emby.Server.Implementations.Data
 
         }
 
-        protected void AddColumn(IDatabaseConnection connection, string table, string columnName, string type)
+        protected List<string> GetColumnNames(IDatabaseConnection connection, string table)
         {
+            var list = new List<string>();
+
             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<string> existingColumnNames)
+        {
+            if (existingColumnNames.Contains(columnName, StringComparer.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
             connection.ExecuteAll(string.Join(";", new string[]
             {
                 "alter table " + table,
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index dd32e2cbd..3f11b6eb0 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<double> 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<double>();
             innerProgress.RegisterAction(p =>
             {
-                double newPercentCommplete = .4 * p;
-                OnProgress(newPercentCommplete);
-
-                progress.Report(newPercentCommplete);
-            });
-
-            await UpdateToLatestSchema(cancellationToken, innerProgress).ConfigureAwait(false);
-
-            innerProgress = new ActionableProgress<double>();
-            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<RefreshMediaLibraryTask>();
-            }
-
-            _taskManager.SuspendTriggers = false;
-        }
-
-        private void OnProgress(double newPercentCommplete)
-        {
-            if (EnableUnavailableMessage)
-            {
-                var html = "<!doctype html><html><head><title>Emby</title></head><body>";
-                var text = _localization.GetLocalizedString("DbUpgradeMessage");
-                html += string.Format(text, newPercentCommplete.ToString("N2", CultureInfo.InvariantCulture));
-
-                html += "<script>setTimeout(function(){window.location.reload(true);}, 5000);</script>";
-                html += "</body></html>";
-
-                _httpServer.GlobalResponse = html;
-            }
-        }
-
-        private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> 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<BaseItem>();
-
-            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<double> progress)
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 653a6a9c1..973576a0d 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -36,6 +36,7 @@
     <Compile Include="Activity\ActivityManager.cs" />
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Branding\BrandingConfigurationFactory.cs" />
+    <Compile Include="Browser\BrowserLauncher.cs" />
     <Compile Include="Channels\ChannelConfigurations.cs" />
     <Compile Include="Channels\ChannelDynamicMediaSourceProvider.cs" />
     <Compile Include="Channels\ChannelImageProvider.cs" />
@@ -64,6 +65,7 @@
     <Compile Include="EntryPoints\RecordingNotifier.cs" />
     <Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
     <Compile Include="EntryPoints\ServerEventNotifier.cs" />
+    <Compile Include="EntryPoints\StartupWizard.cs" />
     <Compile Include="EntryPoints\SystemEvents.cs" />
     <Compile Include="EntryPoints\UdpServerEntryPoint.cs" />
     <Compile Include="EntryPoints\UsageEntryPoint.cs" />
@@ -174,6 +176,7 @@
     <Compile Include="Localization\LocalizationManager.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="Migrations\IVersionMigration.cs" />
+    <Compile Include="Migrations\UpdateLevelMigration.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
     <Compile Include="Notifications\CoreNotificationTypes.cs" />
@@ -258,6 +261,7 @@
     <Compile Include="Sync\SyncManager.cs" />
     <Compile Include="Sync\SyncNotificationEntryPoint.cs" />
     <Compile Include="Sync\SyncRegistrationInfo.cs" />
+    <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="Sync\TargetDataProvider.cs" />
     <Compile Include="TV\SeriesPostScanTask.cs" />
     <Compile Include="TV\TVSeriesManager.cs" />
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
new file mode 100644
index 000000000..424153f22
--- /dev/null
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -0,0 +1,59 @@
+using Emby.Server.Implementations.Browser;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.Logging;
+
+namespace Emby.Server.Implementations.EntryPoints
+{
+    /// <summary>
+    /// Class StartupWizard
+    /// </summary>
+    public class StartupWizard : IServerEntryPoint
+    {
+        /// <summary>
+        /// The _app host
+        /// </summary>
+        private readonly IServerApplicationHost _appHost;
+        /// <summary>
+        /// The _user manager
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartupWizard" /> class.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        /// <param name="logger">The logger.</param>
+        public StartupWizard(IServerApplicationHost appHost, ILogger logger)
+        {
+            _appHost = appHost;
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Runs this instance.
+        /// </summary>
+        public void Run()
+        {
+            if (_appHost.IsFirstRun)
+            {
+                LaunchStartupWizard();
+            }
+        }
+
+        /// <summary>
+        /// Launches the startup wizard.
+        /// </summary>
+        private void LaunchStartupWizard()
+        {
+            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 5be7ba7ad..48a85e0e0 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 876d140ec..c1758127a 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<Type, Func<string, object>> _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<Type, Func<string, object>> funcParseFn)
+            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> 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.Implementations/Migrations/UpdateLevelMigration.cs b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
new file mode 100644
index 000000000..c532ea08d
--- /dev/null
+++ b/Emby.Server.Implementations/Migrations/UpdateLevelMigration.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+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;
+
+namespace Emby.Server.Implementations.Migrations
+{
+    public class UpdateLevelMigration : IVersionMigration
+    {
+        private readonly IServerConfigurationManager _config;
+        private readonly IServerApplicationHost _appHost;
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly string _releaseAssetFilename;
+        private readonly ILogger _logger;
+
+        public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
+        {
+            _config = config;
+            _appHost = appHost;
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+            _releaseAssetFilename = releaseAssetFilename;
+            _logger = logger;
+        }
+
+        public async Task Run()
+        {
+            var lastVersion = _config.Configuration.LastVersion;
+            var currentVersion = _appHost.ApplicationVersion;
+
+            if (string.Equals(lastVersion, currentVersion.ToString(), StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            try
+            {
+                var updateLevel = _config.Configuration.SystemUpdateLevel;
+
+                await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error in update migration", ex);
+            }
+        }
+
+        private async Task CheckVersion(Version currentVersion, PackageVersionClass currentUpdateLevel, CancellationToken cancellationToken)
+        {
+            var releases = await new GithubUpdater(_httpClient, _jsonSerializer)
+                .GetLatestReleases("MediaBrowser", "Emby", _releaseAssetFilename, cancellationToken).ConfigureAwait(false);
+
+            var newUpdateLevel = GetNewUpdateLevel(currentVersion, currentUpdateLevel, releases);
+
+            if (newUpdateLevel != currentUpdateLevel)
+            {
+                _config.Configuration.SystemUpdateLevel = newUpdateLevel;
+                _config.SaveConfiguration();
+            }
+        }
+
+        private PackageVersionClass GetNewUpdateLevel(Version currentVersion, PackageVersionClass currentUpdateLevel, List<GithubUpdater.RootObject> releases)
+        {
+            var newUpdateLevel = currentUpdateLevel;
+
+            // If the current version is later than current stable, set the update level to beta
+            if (releases.Count >= 1)
+            {
+                var release = releases[0];
+                var version = ParseVersion(release.tag_name);
+                if (version != null)
+                {
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Beta;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Release;
+                    }
+                }
+            }
+
+            // If the current version is later than current beta, set the update level to dev
+            if (releases.Count >= 2)
+            {
+                var release = releases[1];
+                var version = ParseVersion(release.tag_name);
+                if (version != null)
+                {
+                    if (currentVersion > version)
+                    {
+                        newUpdateLevel = PackageVersionClass.Dev;
+                    }
+                    else
+                    {
+                        return PackageVersionClass.Beta;
+                    }
+                }
+            }
+
+            return newUpdateLevel;
+        }
+
+        private Version ParseVersion(string versionString)
+        {
+            if (!string.IsNullOrWhiteSpace(versionString))
+            {
+                var parts = versionString.Split('.');
+                if (parts.Length == 3)
+                {
+                    versionString += ".0";
+                }
+            }
+
+            Version version;
+            Version.TryParse(versionString, out version);
+
+            return version;
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 5179bd258..f4cb42d29 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);
                 });
             }
         }
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
new file mode 100644
index 000000000..fbc5772f3
--- /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<string, int> Items { get; set; }
+
+            public SyncSummary()
+            {
+                Items = new Dictionary<string, int>();
+            }
+        }
+
+        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");
+            }
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobSelectText + " where Id=?";
+                    var paramList = new List<object>();
+
+                    paramList.Add(guid.ToGuidParamValue());
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        return GetJob(row);
+                    }
+
+                    return null;
+                }
+            }
+        }
+
+        private SyncJob GetJob(IReadOnlyList<IResultSetValue> 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();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection())
+                {
+                    string commandText;
+                    var paramList = new List<object>();
+
+                    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();
+
+            lock (WriteLock)
+            {
+                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<SyncJob> GetJobs(SyncJobQuery query)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobSelectText;
+                    var paramList = new List<object>();
+
+                    var whereClauses = new List<string>();
+
+                    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<SyncJob>();
+                    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<SyncJob>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
+                }
+            }
+        }
+
+        public SyncJobItem GetJobItem(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            CheckDisposed();
+
+            lock (WriteLock)
+            {
+                var guid = new Guid(id);
+
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = BaseJobItemSelectText + " where Id=?";
+                    var paramList = new List<object>();
+
+                    paramList.Add(guid.ToGuidParamValue());
+
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        return GetJobItem(row);
+                    }
+
+                    return null;
+                }
+            }
+        }
+
+        private QueryResult<T> GetJobItemReader<T>(SyncJobItemQuery query, string baseSelectText, Func<IReadOnlyList<IResultSetValue>, T> itemFactory)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = baseSelectText;
+                    var paramList = new List<object>();
+
+                    var whereClauses = new List<string>();
+
+                    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<T>();
+                    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<T>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = count
+                    };
+                }
+            }
+        }
+
+        public Dictionary<string, SyncedItemProgress> GetSyncedItemProgresses(SyncJobItemQuery query)
+        {
+            var result = new Dictionary<string, SyncedItemProgress>();
+
+            var now = DateTime.UtcNow;
+
+            lock (WriteLock)
+            {
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = "select ItemId,Status,Progress from SyncJobItems";
+
+                    var whereClauses = new List<string>();
+                    var paramList = new List<object>();
+
+                    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<IResultSetValue> reader, Dictionary<string, SyncedItemProgress> result, bool multipleIds)
+        {
+            if (reader[0].SQLiteType == SQLiteType.Null)
+            {
+                return;
+            }
+
+            var itemIds = new List<string>();
+
+            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<SyncJobItem> 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();
+
+            lock (WriteLock)
+            {
+                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<object>();
+                    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<IResultSetValue> 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<List<ItemFileInfo>>(json);
+                }
+            }
+
+            if (reader[12].SQLiteType != SQLiteType.Null)
+            {
+                var json = reader[12].ToString();
+
+                if (!string.IsNullOrWhiteSpace(json))
+                {
+                    info.MediaSource = _json.DeserializeFromString<MediaSourceInfo>(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 f3bab7883..a47aaa305 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/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index 49fdcece1..4e5047f78 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 9e212219d..eb082f707 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Security\IRequiresRegistration.cs" />
     <Compile Include="Security\ISecurityManager.cs" />
     <Compile Include="Security\PaymentRequiredException.cs" />
+    <Compile Include="Updates\GithubUpdater.cs" />
     <Compile Include="Updates\IInstallationManager.cs" />
     <Compile Include="Updates\InstallationEventArgs.cs" />
     <Compile Include="Updates\InstallationFailedEventArgs.cs" />
diff --git a/MediaBrowser.Common/Updates/GithubUpdater.cs b/MediaBrowser.Common/Updates/GithubUpdater.cs
new file mode 100644
index 000000000..c5000391d
--- /dev/null
+++ b/MediaBrowser.Common/Updates/GithubUpdater.cs
@@ -0,0 +1,269 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Updates;
+
+namespace MediaBrowser.Common.Updates
+{
+    public class GithubUpdater
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public GithubUpdater(IHttpClient httpClient, IJsonSerializer jsonSerializer)
+        {
+            _httpClient = httpClient;
+            _jsonSerializer = jsonSerializer;
+        }
+
+        public async Task<CheckForUpdateResult> CheckForUpdateResult(string organzation, string repository, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename, TimeSpan cacheLength, CancellationToken cancellationToken)
+        {
+            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
+
+            var options = new HttpRequestOptions
+            {
+                Url = url,
+                EnableKeepAlive = false,
+                CancellationToken = cancellationToken,
+                UserAgent = "Emby/3.0",
+                BufferContent = false
+            };
+
+            if (cacheLength.Ticks > 0)
+            {
+                options.CacheMode = CacheMode.Unconditional;
+                options.CacheLength = cacheLength;
+            }
+
+            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            {
+                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
+
+                return CheckForUpdateResult(obj, minVersion, updateLevel, assetFilename, packageName, targetFilename);
+            }
+        }
+
+        private CheckForUpdateResult CheckForUpdateResult(RootObject[] obj, Version minVersion, PackageVersionClass updateLevel, string assetFilename, string packageName, string targetFilename)
+        {
+            if (updateLevel == PackageVersionClass.Release)
+            {
+                // Technically all we need to do is check that it's not pre-release
+                // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
+                obj = obj.Where(i => !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) && !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else if (updateLevel == PackageVersionClass.Beta)
+            {
+                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+            else if (updateLevel == PackageVersionClass.Dev)
+            {
+                obj = obj.Where(i => !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) || i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase)).ToArray();
+            }
+
+            var availableUpdate = obj
+                .Select(i => CheckForUpdateResult(i, minVersion, assetFilename, packageName, targetFilename))
+                .Where(i => i != null)
+                .OrderByDescending(i => Version.Parse(i.AvailableVersion))
+                .FirstOrDefault();
+
+            return availableUpdate ?? new CheckForUpdateResult
+            {
+                IsUpdateAvailable = false
+            };
+        }
+
+        private bool MatchesUpdateLevel(RootObject i, PackageVersionClass updateLevel)
+        {
+            if (updateLevel == PackageVersionClass.Beta)
+            {
+                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase);
+            }
+            if (updateLevel == PackageVersionClass.Dev)
+            {
+                return !i.prerelease || i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) ||
+                       i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
+            }
+
+            // Technically all we need to do is check that it's not pre-release
+            // But let's addititional checks for -beta and -dev to handle builds that might be temporarily tagged incorrectly.
+            return !i.prerelease && !i.name.EndsWith("-beta", StringComparison.OrdinalIgnoreCase) &&
+                   !i.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public async Task<List<RootObject>> GetLatestReleases(string organzation, string repository, string assetFilename, CancellationToken cancellationToken)
+        {
+            var list = new List<RootObject>();
+
+            var url = string.Format("https://api.github.com/repos/{0}/{1}/releases", organzation, repository);
+
+            var options = new HttpRequestOptions
+            {
+                Url = url,
+                EnableKeepAlive = false,
+                CancellationToken = cancellationToken,
+                UserAgent = "Emby/3.0",
+                BufferContent = false
+            };
+
+            using (var stream = await _httpClient.Get(options).ConfigureAwait(false))
+            {
+                var obj = _jsonSerializer.DeserializeFromStream<RootObject[]>(stream);
+
+                obj = obj.Where(i => (i.assets ?? new List<Asset>()).Any(a => IsAsset(a, assetFilename))).ToArray();
+
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Release)).OrderByDescending(GetVersion).Take(1));
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Beta)).OrderByDescending(GetVersion).Take(1));
+                list.AddRange(obj.Where(i => MatchesUpdateLevel(i, PackageVersionClass.Dev)).OrderByDescending(GetVersion).Take(1));
+
+                return list;
+            }
+        }
+
+        public Version GetVersion(RootObject obj)
+        {
+            Version version;
+            if (!Version.TryParse(obj.tag_name, out version))
+            {
+                return new Version(1, 0);
+            }
+
+            return version;
+        }
+
+        private CheckForUpdateResult CheckForUpdateResult(RootObject obj, Version minVersion, string assetFilename, string packageName, string targetFilename)
+        {
+            Version version;
+            if (!Version.TryParse(obj.tag_name, out version))
+            {
+                return null;
+            }
+
+            if (version < minVersion)
+            {
+                return null;
+            }
+
+            var asset = (obj.assets ?? new List<Asset>()).FirstOrDefault(i => IsAsset(i, assetFilename));
+
+            if (asset == null)
+            {
+                return null;
+            }
+
+            return new CheckForUpdateResult
+            {
+                AvailableVersion = version.ToString(),
+                IsUpdateAvailable = version > minVersion,
+                Package = new PackageVersionInfo
+                {
+                    classification = obj.prerelease ?
+                        (obj.name.EndsWith("-dev", StringComparison.OrdinalIgnoreCase) ? PackageVersionClass.Dev : PackageVersionClass.Beta) :
+                        PackageVersionClass.Release,
+                    name = packageName,
+                    sourceUrl = asset.browser_download_url,
+                    targetFilename = targetFilename,
+                    versionStr = version.ToString(),
+                    requiredVersionStr = "1.0.0",
+                    description = obj.body,
+                    infoUrl = obj.html_url
+                }
+            };
+        }
+
+        private bool IsAsset(Asset asset, string assetFilename)
+        {
+            var downloadFilename = Path.GetFileName(asset.browser_download_url) ?? string.Empty;
+
+            if (downloadFilename.IndexOf(assetFilename, StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return true;
+            }
+
+            return string.Equals(assetFilename, downloadFilename, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public class Uploader
+        {
+            public string login { get; set; }
+            public int id { get; set; }
+            public string avatar_url { get; set; }
+            public string gravatar_id { get; set; }
+            public string url { get; set; }
+            public string html_url { get; set; }
+            public string followers_url { get; set; }
+            public string following_url { get; set; }
+            public string gists_url { get; set; }
+            public string starred_url { get; set; }
+            public string subscriptions_url { get; set; }
+            public string organizations_url { get; set; }
+            public string repos_url { get; set; }
+            public string events_url { get; set; }
+            public string received_events_url { get; set; }
+            public string type { get; set; }
+            public bool site_admin { get; set; }
+        }
+
+        public class Asset
+        {
+            public string url { get; set; }
+            public int id { get; set; }
+            public string name { get; set; }
+            public object label { get; set; }
+            public Uploader uploader { get; set; }
+            public string content_type { get; set; }
+            public string state { get; set; }
+            public int size { get; set; }
+            public int download_count { get; set; }
+            public string created_at { get; set; }
+            public string updated_at { get; set; }
+            public string browser_download_url { get; set; }
+        }
+
+        public class Author
+        {
+            public string login { get; set; }
+            public int id { get; set; }
+            public string avatar_url { get; set; }
+            public string gravatar_id { get; set; }
+            public string url { get; set; }
+            public string html_url { get; set; }
+            public string followers_url { get; set; }
+            public string following_url { get; set; }
+            public string gists_url { get; set; }
+            public string starred_url { get; set; }
+            public string subscriptions_url { get; set; }
+            public string organizations_url { get; set; }
+            public string repos_url { get; set; }
+            public string events_url { get; set; }
+            public string received_events_url { get; set; }
+            public string type { get; set; }
+            public bool site_admin { get; set; }
+        }
+
+        public class RootObject
+        {
+            public string url { get; set; }
+            public string assets_url { get; set; }
+            public string upload_url { get; set; }
+            public string html_url { get; set; }
+            public int id { get; set; }
+            public string tag_name { get; set; }
+            public string target_commitish { get; set; }
+            public string name { get; set; }
+            public bool draft { get; set; }
+            public Author author { get; set; }
+            public bool prerelease { get; set; }
+            public string created_at { get; set; }
+            public string published_at { get; set; }
+            public List<Asset> assets { get; set; }
+            public string tarball_url { get; set; }
+            public string zipball_url { get; set; }
+            public string body { get; set; }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 3fb118a9c..94baacf13 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 cca8e3c19..a997d3476 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.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 9715a624f..cdda858b7 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/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs
index b6f847feb..fa3da97b3 100644
--- a/MediaBrowser.Model/Tasks/ITaskManager.cs
+++ b/MediaBrowser.Model/Tasks/ITaskManager.cs
@@ -74,7 +74,5 @@ namespace MediaBrowser.Model.Tasks
         
         event EventHandler<GenericEventArgs<IScheduledTaskWorker>> TaskExecuting;
         event EventHandler<TaskCompletionEventArgs> TaskCompleted;
-
-        bool SuspendTriggers { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index bb7db6a7c..d864c47d6 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -92,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 748b94604..3d6a3e35d 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.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 9b634d12b..7eafc1721 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -23,8 +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;
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 139961e6f..c421dd9eb 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 b950de118..937762ed0 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -117,6 +117,14 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
+        protected override bool SupportsDualModeSockets
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public override void LaunchUrl(string url)
         {
             var process = new Process
@@ -137,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;
-- 
cgit v1.2.3


From ffb1ec76a785cdd2aef8ccbe8125a1f765559b15 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Nov 2016 02:51:07 -0500
Subject: update components

---
 .../Data/BaseSqliteRepository.cs                   | 30 ++++++++++++++++++++--
 .../Emby.Server.Implementations.csproj             |  2 +-
 Emby.Server.Implementations/packages.config        |  2 +-
 .../Encoder/EncoderValidator.cs                    |  3 ++-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  4 +--
 .../Subtitles/SubtitleEncoder.cs                   |  4 +--
 .../MediaBrowser.Server.Mono.csproj                |  4 +--
 MediaBrowser.Server.Mono/packages.config           |  4 +--
 .../MediaBrowser.ServerApplication.csproj          |  4 +--
 MediaBrowser.ServerApplication/packages.config     |  4 +--
 10 files changed, 44 insertions(+), 17 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index c47a534d1..5a4846ccf 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
 using SQLitePCL.pretty;
 using System.Linq;
+using SQLitePCL;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -24,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;
@@ -70,10 +79,27 @@ namespace Emby.Server.Implementations.Data
             //}
 
             db.ExecuteAll(string.Join(";", queries));
-            
+
             return db;
         }
 
+        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()
         {
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 973576a0d..48b598732 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -315,7 +315,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.0\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config
index 519e4a0ad..5d75af7a2 100644
--- a/Emby.Server.Implementations/packages.config
+++ b/Emby.Server.Implementations/packages.config
@@ -3,6 +3,6 @@
   <package id="Emby.XmlTv" version="1.0.1" targetFramework="portable45-net45+win8" />
   <package id="MediaBrowser.Naming" version="1.0.2" targetFramework="portable45-net45+win8" />
   <package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
-  <package id="SQLitePCLRaw.core" version="1.1.0" targetFramework="portable45-net45+win8" />
+  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="portable45-net45+win8" />
   <package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 1b8b3feec..b37e783b8 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<string>();
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index ba1f23dfe..719083e73 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/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 0bbc2d916..30955c22c 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.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index b6d3c5ce6..bd21db6cc 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -85,11 +85,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.0\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.0\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config
index 028ee1e45..e82ef0ed0 100644
--- a/MediaBrowser.Server.Mono/packages.config
+++ b/MediaBrowser.Server.Mono/packages.config
@@ -5,6 +5,6 @@
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net46" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
-  <package id="SQLitePCLRaw.core" version="1.1.0" targetFramework="net46" />
-  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.0" targetFramework="net46" />
+  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net46" />
+  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index e5a632d69..0826dc225 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -91,11 +91,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.0\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.0\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
index d1958db4d..7385ba374 100644
--- a/MediaBrowser.ServerApplication/packages.config
+++ b/MediaBrowser.ServerApplication/packages.config
@@ -5,6 +5,6 @@
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net462" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net462" />
-  <package id="SQLitePCLRaw.core" version="1.1.0" targetFramework="net462" />
-  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.0" targetFramework="net462" />
+  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net462" />
+  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net462" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From 52227ce00d9602e4356c0b1f91a42ab8c61b19a6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Nov 2016 03:40:13 -0500
Subject: update save methods

---
 .../Activity/ActivityRepository.cs                 |  4 +-
 .../Data/BaseSqliteRepository.cs                   | 56 ++++++++++++++++++++--
 .../Data/SqliteDisplayPreferencesRepository.cs     | 52 +++++++++++---------
 .../Data/SqliteUserRepository.cs                   | 25 +++++-----
 .../Notifications/SqliteNotificationsRepository.cs | 10 ++--
 .../Security/AuthenticationRepository.cs           |  4 +-
 .../Social/SharingRepository.cs                    |  4 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs | 16 +++----
 .../Probing/ProbeResultNormalizer.cs               |  2 +-
 9 files changed, 115 insertions(+), 58 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 7bc77402e..8f64f04db 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<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 5a4846ccf..dc5d00985 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -12,7 +12,7 @@ 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)
@@ -130,9 +130,10 @@ namespace Emby.Server.Implementations.Data
                 {
                     lock (_disposeLock)
                     {
-                        WriteLock.Wait();
-
-                        CloseConnection();
+                        using (WriteLock.Write())
+                        {
+                            CloseConnection();
+                        }
                     }
                 }
                 catch (Exception ex)
@@ -178,4 +179,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/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 79fc893f4..1fbf9b0a9 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=?";
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = "select data from userdisplaypreferences where id = ? and userId=? and client=?";
 
-                var paramList = new List<object>();
-                paramList.Add(guidId.ToGuidParamValue());
-                paramList.Add(userId.ToGuidParamValue());
-                paramList.Add(client);
+                    var paramList = new List<object>();
+                    paramList.Add(guidId.ToGuidParamValue());
+                    paramList.Add(userId.ToGuidParamValue());
+                    paramList.Add(client);
 
-                foreach (var row in connection.Query(commandText, paramList.ToArray()))
-                {
-                    return Get(row);
-                }
+                    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<DisplayPreferences>();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                var commandText = "select data from userdisplaypreferences where userId=?";
+                using (var connection = CreateConnection(true))
+                {
+                    var commandText = "select data from userdisplaypreferences where userId=?";
 
-                var paramList = new List<object>();
-                paramList.Add(userId.ToGuidParamValue());
+                    var paramList = new List<object>();
+                    paramList.Add(userId.ToGuidParamValue());
 
-                foreach (var row in connection.Query(commandText, paramList.ToArray()))
-                {
-                    list.Add(Get(row));
+                    foreach (var row in connection.Query(commandText, paramList.ToArray()))
+                    {
+                        list.Add(Get(row));
+                    }
                 }
             }
 
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 5e4b1c7b8..f0e38f8c0 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -107,18 +107,21 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                foreach (var row in connection.Query("select guid,data from users"))
+                using (var connection = CreateConnection(true))
                 {
-                    var id = row[0].ReadGuid();
-
-                    using (var stream = _memoryStreamProvider.CreateNew(row[1].ToBlob()))
+                    foreach (var row in connection.Query("select guid,data from users"))
                     {
-                        stream.Position = 0;
-                        var user = _jsonSerializer.DeserializeFromStream<User>(stream);
-                        user.Id = id;
-                        list.Add(user);
+                        var id = row[0].ReadGuid();
+
+                        using (var stream = _memoryStreamProvider.CreateNew(row[1].ToBlob()))
+                        {
+                            stream.Position = 0;
+                            var user = _jsonSerializer.DeserializeFromStream<User>(stream);
+                            user.Id = id;
+                            list.Add(user);
+                        }
                     }
                 }
             }
@@ -142,7 +145,7 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index fcf45b0ad..ee900ef33 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 f4cb42d29..f6163b80a 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -195,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 e09b7f5b9..9065ee108 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.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index fbc5772f3..2877a8ffd 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("id");
             }
 
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -206,7 +206,7 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -259,7 +259,7 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -281,7 +281,7 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -379,7 +379,7 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 var guid = new Guid(id);
 
@@ -407,7 +407,7 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("query");
             }
 
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -487,7 +487,7 @@ namespace Emby.Server.Implementations.Sync
 
             var now = DateTime.UtcNow;
 
-            lock (WriteLock)
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -650,7 +650,7 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 6a1583094..09996e1d3 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -996,7 +996,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             {
                 _splitWhiteList = new List<string>
                         {
-                            "AC/DV"
+                            "AC/DC"
                         };
             }
 
-- 
cgit v1.2.3


From 5209ce9b2f7d2c56bca2c65966a5e2e7cc982133 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Nov 2016 13:09:15 -0500
Subject: stub out portable item repository

---
 .../Data/BaseSqliteRepository.cs                   |   31 +-
 .../Data/SqliteItemRepository.cs                   | 5279 ++++++++++++++++++++
 .../Data/SqliteUserDataRepository.cs               |  446 ++
 .../Emby.Server.Implementations.csproj             |    2 +
 4 files changed, 5755 insertions(+), 3 deletions(-)
 create mode 100644 Emby.Server.Implementations/Data/SqliteItemRepository.cs
 create mode 100644 Emby.Server.Implementations/Data/SqliteUserDataRepository.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index dc5d00985..6c1a96813 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -64,25 +64,50 @@ namespace Emby.Server.Implementations.Data
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
-            var queries = new[]
+            var queries = new List<string>
             {
+                "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 = "";
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
new file mode 100644
index 000000000..c88bffe04
--- /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
+//{
+//    /// <summary>
+//    /// Class SQLiteItemRepository
+//    /// </summary>
+//    public class SqliteItemRepository : BaseSqliteRepository, IItemRepository
+//    {
+//        private SQLiteDatabaseConnection _connection;
+
+//        private readonly TypeMapper _typeMapper;
+
+//        /// <summary>
+//        /// Gets the name of the repository
+//        /// </summary>
+//        /// <value>The name.</value>
+//        public string Name
+//        {
+//            get
+//            {
+//                return "SQLite";
+//            }
+//        }
+
+//        /// <summary>
+//        /// Gets the json serializer.
+//        /// </summary>
+//        /// <value>The json serializer.</value>
+//        private readonly IJsonSerializer _jsonSerializer;
+
+//        /// <summary>
+//        /// The _app paths
+//        /// </summary>
+//        private readonly IServerConfigurationManager _config;
+
+//        /// <summary>
+//        /// The _save item command
+//        /// </summary>
+//        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;
+
+//        /// <summary>
+//        /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
+//        /// </summary>
+//        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;
+//            }
+//        }
+
+//        /// <summary>
+//        /// Opens the connection to the database
+//        /// </summary>
+//        /// <returns>Task.</returns>
+//        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"
+//        };
+
+//        /// <summary>
+//        /// Prepares the statements.
+//        /// </summary>
+//        private void PrepareStatements()
+//        {
+//            var saveColumns = new List<string>
+//            {
+//                "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");
+//        }
+
+//        /// <summary>
+//        /// Save a standard item in the repo
+//        /// </summary>
+//        /// <param name="item">The item.</param>
+//        /// <param name="cancellationToken">The cancellation token.</param>
+//        /// <returns>Task.</returns>
+//        /// <exception cref="System.ArgumentNullException">item</exception>
+//        public Task SaveItem(BaseItem item, CancellationToken cancellationToken)
+//        {
+//            if (item == null)
+//            {
+//                throw new ArgumentNullException("item");
+//            }
+
+//            return SaveItems(new[] { item }, cancellationToken);
+//        }
+
+//        /// <summary>
+//        /// Saves the items.
+//        /// </summary>
+//        /// <param name="items">The items.</param>
+//        /// <param name="cancellationToken">The cancellation token.</param>
+//        /// <returns>Task.</returns>
+//        /// <exception cref="System.ArgumentNullException">
+//        /// items
+//        /// or
+//        /// cancellationToken
+//        /// </exception>
+//        public async Task SaveItems(IEnumerable<BaseItem> 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;
+//        }
+
+//        /// <summary>
+//        /// Internal retrieve from items or users table
+//        /// </summary>
+//        /// <param name="id">The id.</param>
+//        /// <returns>BaseItem.</returns>
+//        /// <exception cref="System.ArgumentNullException">id</exception>
+//        /// <exception cref="System.ArgumentException"></exception>
+//        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<string> { person.PlaceOfBirth };
+//                }
+//            }
+
+//            return item;
+//        }
+
+//        /// <summary>
+//        /// Gets the critic reviews.
+//        /// </summary>
+//        /// <param name="itemId">The item id.</param>
+//        /// <returns>Task{IEnumerable{ItemReview}}.</returns>
+//        public IEnumerable<ItemReview> GetCriticReviews(Guid itemId)
+//        {
+//            try
+//            {
+//                var path = Path.Combine(_criticReviewsPath, itemId + ".json");
+
+//                return _jsonSerializer.DeserializeFromFile<List<ItemReview>>(path);
+//            }
+//            catch (DirectoryNotFoundException)
+//            {
+//                return new List<ItemReview>();
+//            }
+//            catch (FileNotFoundException)
+//            {
+//                return new List<ItemReview>();
+//            }
+//        }
+
+//        private readonly Task _cachedTask = Task.FromResult(true);
+//        /// <summary>
+//        /// Saves the critic reviews.
+//        /// </summary>
+//        /// <param name="itemId">The item id.</param>
+//        /// <param name="criticReviews">The critic reviews.</param>
+//        /// <returns>Task.</returns>
+//        public Task SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews)
+//        {
+//            Directory.CreateDirectory(_criticReviewsPath);
+
+//            var path = Path.Combine(_criticReviewsPath, itemId + ".json");
+
+//            _jsonSerializer.SerializeToFile(criticReviews.ToList(), path);
+
+//            return _cachedTask;
+//        }
+
+//        /// <summary>
+//        /// Gets chapters for an item
+//        /// </summary>
+//        /// <param name="id">The id.</param>
+//        /// <returns>IEnumerable{ChapterInfo}.</returns>
+//        /// <exception cref="System.ArgumentNullException">id</exception>
+//        public IEnumerable<ChapterInfo> GetChapters(Guid id)
+//        {
+//            CheckDisposed();
+//            if (id == Guid.Empty)
+//            {
+//                throw new ArgumentNullException("id");
+//            }
+//            var list = new List<ChapterInfo>();
+
+//            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;
+//        }
+
+//        /// <summary>
+//        /// Gets a single chapter for an item
+//        /// </summary>
+//        /// <param name="id">The id.</param>
+//        /// <param name="index">The index.</param>
+//        /// <returns>ChapterInfo.</returns>
+//        /// <exception cref="System.ArgumentNullException">id</exception>
+//        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;
+//            }
+//        }
+
+//        /// <summary>
+//        /// Gets the chapter.
+//        /// </summary>
+//        /// <param name="reader">The reader.</param>
+//        /// <returns>ChapterInfo.</returns>
+//        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;
+//        }
+
+//        /// <summary>
+//        /// Saves the chapters.
+//        /// </summary>
+//        /// <param name="id">The id.</param>
+//        /// <param name="chapters">The chapters.</param>
+//        /// <param name="cancellationToken">The cancellation token.</param>
+//        /// <returns>Task.</returns>
+//        /// <exception cref="System.ArgumentNullException">
+//        /// id
+//        /// or
+//        /// chapters
+//        /// or
+//        /// cancellationToken
+//        /// </exception>
+//        public async Task SaveChapters(Guid id, List<ChapterInfo> 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<ItemFields> allFields = Enum.GetNames(typeof(ItemFields))
+//                    .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+//                    .ToList();
+
+//        private IEnumerable<string> 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<string>();
+
+//            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<BaseItem> GetItemList(InternalItemsQuery query)
+//        {
+//            if (query == null)
+//            {
+//                throw new ArgumentNullException("query");
+//            }
+
+//            CheckDisposed();
+
+//            var now = DateTime.UtcNow;
+
+//            var list = new List<BaseItem>();
+
+//            // 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<BaseItem>();
+
+//                foreach (var item in list)
+//                {
+//                    AddItem(newList, item);
+
+//                    if (newList.Count >= limit)
+//                    {
+//                        break;
+//                    }
+//                }
+
+//                list = newList;
+//            }
+
+//            return list;
+//        }
+
+//        private void AddItem(List<BaseItem> 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<BaseItem> 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<BaseItem>
+//                {
+//                    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<BaseItem>();
+//                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<BaseItem>()
+//                {
+//                    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<string, SortOrder>(i, query.SortOrder)));
+//            }
+//            else
+//            {
+//                enableOrderInversion = false;
+//            }
+
+//            if (query.SimilarTo != null)
+//            {
+//                if (orderBy.Count == 0)
+//                {
+//                    orderBy.Add(new Tuple<string, SortOrder>("SimilarityScore", SortOrder.Descending));
+//                    orderBy.Add(new Tuple<string, SortOrder>(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<string, bool> MapOrderByField(string name, InternalItemsQuery query)
+//        {
+//            if (string.Equals(name, ItemSortBy.AirTime, StringComparison.OrdinalIgnoreCase))
+//            {
+//                // TODO
+//                return new Tuple<string, bool>("SortName", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.Runtime, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("RuntimeTicks", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.Random, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("RANDOM()", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.DatePlayed, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("LastPlayedDate", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.PlayCount, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("PlayCount", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.IsFavoriteOrLiked, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("IsFavorite", true);
+//            }
+//            if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("IsFolder", true);
+//            }
+//            if (string.Equals(name, ItemSortBy.IsPlayed, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("played", true);
+//            }
+//            if (string.Equals(name, ItemSortBy.IsUnplayed, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("played", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.DateLastContentAdded, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("DateLastMediaAdded", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.Artist, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=0 LIMIT 1)", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.AlbumArtist, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=1 LIMIT 1)", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.OfficialRating, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("InheritedParentalRatingValue", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.Studio, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("(select CleanValue from itemvalues where ItemId=Guid and Type=3 LIMIT 1)", false);
+//            }
+//            if (string.Equals(name, ItemSortBy.SeriesDatePlayed, StringComparison.OrdinalIgnoreCase))
+//            {
+//                return new Tuple<string, bool>("(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<string, bool>(name, false);
+//        }
+
+//        public List<Guid> 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<Guid>();
+
+//                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<Tuple<Guid, string>> 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<Tuple<Guid, string>>();
+//                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<Guid, string>(id, path));
+//                    }
+
+//                    if (reader.NextResult() && reader.Read())
+//                    {
+//                        count = reader.GetInt32(0);
+//                    }
+//                }
+
+//                return new QueryResult<Tuple<Guid, string>>()
+//                {
+//                    Items = list.ToArray(),
+//                    TotalRecordCount = count
+//                };
+//            }
+//        }
+
+//        public QueryResult<Guid> 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<Guid>
+//                {
+//                    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<Guid>();
+//                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<Guid>()
+//                {
+//                    Items = list.ToArray(),
+//                    TotalRecordCount = count
+//                };
+//            }
+//        }
+
+//        private List<string> GetWhereClauses(InternalItemsQuery query, IDbCommand cmd, string paramSuffix = "")
+//        {
+//            var whereClauses = new List<string>();
+
+//            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<string>();
+//                    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<string>();
+//                if (query.IsMovie ?? false)
+//                {
+//                    var alternateTypes = new List<string>();
+//                    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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+//                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<string>();
+
+//                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<string>();
+
+//                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<string>();
+
+//                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<Tuple<Guid, string>>();
+
+//            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<Guid, string>(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<string, string[]> GetTypeMapDictionary()
+//        {
+//            var dict = new Dictionary<string, string[]>(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<string, string[]> _types = GetTypeMapDictionary();
+
+//        private IEnumerable<string> 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<string> 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<string>();
+
+//                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+//                {
+//                    while (reader.Read())
+//                    {
+//                        list.Add(reader.GetString(0));
+//                    }
+//                }
+
+//                return list;
+//            }
+//        }
+
+//        public List<PersonInfo> 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<PersonInfo>();
+
+//                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+//                {
+//                    while (reader.Read())
+//                    {
+//                        list.Add(GetPerson(reader));
+//                    }
+//                }
+
+//                return list;
+//            }
+//        }
+
+//        private List<string> GetPeopleWhereClauses(InternalPeopleQuery query, IDbCommand cmd)
+//        {
+//            var whereClauses = new List<string>();
+
+//            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<Guid> 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<Tuple<BaseItem, ItemCounts>> GetAllArtists(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetArtists(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetAlbumArtists(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetStudios(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGenres(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetGameGenres(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 2 }, typeof(GameGenre).FullName);
+//        }
+
+//        public QueryResult<Tuple<BaseItem, ItemCounts>> GetMusicGenres(InternalItemsQuery query)
+//        {
+//            return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName);
+//        }
+
+//        public List<string> GetStudioNames()
+//        {
+//            return GetItemValueNames(new[] { 3 }, new List<string>(), new List<string>());
+//        }
+
+//        public List<string> GetAllArtistNames()
+//        {
+//            return GetItemValueNames(new[] { 0, 1 }, new List<string>(), new List<string>());
+//        }
+
+//        public List<string> GetMusicGenreNames()
+//        {
+//            return GetItemValueNames(new[] { 2 }, new List<string> { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist" }, new List<string>());
+//        }
+
+//        public List<string> GetGameGenreNames()
+//        {
+//            return GetItemValueNames(new[] { 2 }, new List<string> { "Game" }, new List<string>());
+//        }
+
+//        public List<string> GetGenreNames()
+//        {
+//            return GetItemValueNames(new[] { 2 }, new List<string>(), new List<string> { "Audio", "MusicVideo", "MusicAlbum", "MusicArtist", "Game", "GameSystem" });
+//        }
+
+//        private List<string> GetItemValueNames(int[] itemValueTypes, List<string> withItemTypes, List<string> 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<string>();
+
+//            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<Tuple<BaseItem, ItemCounts>> 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<Tuple<string, string>>();
+
+//                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<string, string>("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<Tuple<BaseItem, ItemCounts>>();
+//                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<BaseItem, ItemCounts>(item, GetItemCounts(reader, countStartColumn, typesToCount)));
+//                            }
+//                        }
+
+//                        if (reader.NextResult() && reader.Read())
+//                        {
+//                            count = reader.GetInt32(0);
+//                        }
+//                    }
+//                }
+
+//                if (count == 0)
+//                {
+//                    count = list.Count;
+//                }
+
+//                return new QueryResult<Tuple<BaseItem, ItemCounts>>
+//                {
+//                    Items = list.ToArray(),
+//                    TotalRecordCount = count
+//                };
+
+//            }
+//        }
+
+//        private ItemCounts GetItemCounts(IDataReader reader, int countStartColumn, List<string> 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<Tuple<int, string>> GetItemValuesToSave(BaseItem item)
+//        {
+//            var list = new List<Tuple<int, string>>();
+
+//            var hasArtist = item as IHasArtist;
+//            if (hasArtist != null)
+//            {
+//                list.AddRange(hasArtist.Artists.Select(i => new Tuple<int, string>(0, i)));
+//            }
+
+//            var hasAlbumArtist = item as IHasAlbumArtist;
+//            if (hasAlbumArtist != null)
+//            {
+//                list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => new Tuple<int, string>(1, i)));
+//            }
+
+//            list.AddRange(item.Genres.Select(i => new Tuple<int, string>(2, i)));
+//            list.AddRange(item.Studios.Select(i => new Tuple<int, string>(3, i)));
+//            list.AddRange(item.Tags.Select(i => new Tuple<int, string>(4, i)));
+//            list.AddRange(item.Keywords.Select(i => new Tuple<int, string>(5, i)));
+
+//            return list;
+//        }
+
+//        private void UpdateItemValues(Guid itemId, List<Tuple<int, string>> 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<PersonInfo> 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<MediaStream> GetMediaStreams(MediaStreamQuery query)
+//        {
+//            CheckDisposed();
+
+//            if (query == null)
+//            {
+//                throw new ArgumentNullException("query");
+//            }
+
+//            var list = new List<MediaStream>();
+
+//            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<MediaStream> 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();
+//            }
+//        }
+
+//        /// <summary>
+//        /// Gets the chapter.
+//        /// </summary>
+//        /// <param name="reader">The reader.</param>
+//        /// <returns>ChapterInfo.</returns>
+//        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 000000000..d1355ce8f
--- /dev/null
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -0,0 +1,446 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Globalization;
+//using System.IO;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
+//using MediaBrowser.Common.Configuration;
+//using MediaBrowser.Controller.Entities;
+//using MediaBrowser.Controller.Persistence;
+//using MediaBrowser.Model.Logging;
+//using SQLitePCL.pretty;
+
+//namespace Emby.Server.Implementations.Data
+//{
+//    public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
+//    {
+//        private SQLiteDatabaseConnection _connection;
+
+//        public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths)
+//            : base(logger)
+//        {
+//            DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db");
+//        }
+
+//        protected override bool EnableConnectionPooling
+//        {
+//            get { return false; }
+//        }
+
+//        /// <summary>
+//        /// Gets the name of the repository
+//        /// </summary>
+//        /// <value>The name.</value>
+//        public string Name
+//        {
+//            get
+//            {
+//                return "SQLite";
+//            }
+//        }
+
+//        /// <summary>
+//        /// Opens the connection to the database
+//        /// </summary>
+//        /// <returns>Task.</returns>
+//        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);
+//            });
+//        }
+
+//        /// <summary>
+//        /// Saves the user data.
+//        /// </summary>
+//        /// <param name="userId">The user id.</param>
+//        /// <param name="key">The key.</param>
+//        /// <param name="userData">The user data.</param>
+//        /// <param name="cancellationToken">The cancellation token.</param>
+//        /// <returns>Task.</returns>
+//        /// <exception cref="System.ArgumentNullException">userData
+//        /// or
+//        /// cancellationToken
+//        /// or
+//        /// userId
+//        /// or
+//        /// userDataId</exception>
+//        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<UserItemData> userData, CancellationToken cancellationToken)
+//        {
+//            if (userData == null)
+//            {
+//                throw new ArgumentNullException("userData");
+//            }
+//            if (userId == Guid.Empty)
+//            {
+//                throw new ArgumentNullException("userId");
+//            }
+
+//            return PersistAllUserData(userId, userData, cancellationToken);
+//        }
+
+//        /// <summary>
+//        /// Persists the user data.
+//        /// </summary>
+//        /// <param name="userId">The user id.</param>
+//        /// <param name="key">The key.</param>
+//        /// <param name="userData">The user data.</param>
+//        /// <param name="cancellationToken">The cancellation token.</param>
+//        /// <returns>Task.</returns>
+//        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();
+//            }
+//        }
+
+//        /// <summary>
+//        /// Persist all user data for the specified user
+//        /// </summary>
+//        /// <param name="userId"></param>
+//        /// <param name="userData"></param>
+//        /// <param name="cancellationToken"></param>
+//        /// <returns></returns>
+//        private async Task PersistAllUserData(Guid userId, IEnumerable<UserItemData> 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();
+//            }
+//        }
+
+//        /// <summary>
+//        /// Gets the user data.
+//        /// </summary>
+//        /// <param name="userId">The user id.</param>
+//        /// <param name="key">The key.</param>
+//        /// <returns>Task{UserItemData}.</returns>
+//        /// <exception cref="System.ArgumentNullException">
+//        /// userId
+//        /// or
+//        /// key
+//        /// </exception>
+//        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<string> 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<string>();
+//                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;
+//            }
+//        }
+
+//        /// <summary>
+//        /// Return all user-data associated with the given user
+//        /// </summary>
+//        /// <param name="userId"></param>
+//        /// <returns></returns>
+//        public IEnumerable<UserItemData> 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);
+//                    }
+//                }
+//            }
+//        }
+
+//        /// <summary>
+//        /// Read a row from the specified reader into the provided userData object
+//        /// </summary>
+//        /// <param name="reader"></param>
+//        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/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index daf221af0..ff6fe2018 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -53,6 +53,8 @@
     <Compile Include="Connect\Validator.cs" />
     <Compile Include="Data\SqliteDisplayPreferencesRepository.cs" />
     <Compile Include="Data\SqliteFileOrganizationRepository.cs" />
+    <Compile Include="Data\SqliteItemRepository.cs" />
+    <Compile Include="Data\SqliteUserDataRepository.cs" />
     <Compile Include="Data\SqliteUserRepository.cs" />
     <Compile Include="Data\TypeMapper.cs" />
     <Compile Include="Devices\CameraUploadsDynamicFolder.cs" />
-- 
cgit v1.2.3


From 94e622e3a0cfcd14ad47ede3342dfab7a862c4d9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Nov 2016 16:02:32 -0500
Subject: add sqlite logging

---
 .../Data/BaseSqliteRepository.cs                   |  9 ++++
 src/Emby.Server/CoreAppHost.cs                     |  7 +--
 src/Emby.Server/Data/DbConnector.cs                | 52 ----------------------
 src/Emby.Server/Program.cs                         |  3 +-
 4 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 src/Emby.Server/Data/DbConnector.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 6c1a96813..7836c8b41 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -33,8 +33,17 @@ namespace Emby.Server.Implementations.Data
             //CheckOk(rc);
         }
 
+        private static bool _versionLogged;
+
         protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
         {
+            if (!_versionLogged)
+            {
+                _versionLogged = true;
+                Logger.Info("Sqlite version: " + SQLite3.Version);
+                Logger.Info("Sqlite compiler options: " + string.Join(",", SQLite3.CompilerOptions.ToArray()));
+            }
+
             ConnectionFlags connectionFlags;
 
             //isReadOnly = false;
diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs
index 21f6ae445..5291f20ef 100644
--- a/src/Emby.Server/CoreAppHost.cs
+++ b/src/Emby.Server/CoreAppHost.cs
@@ -4,12 +4,12 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Emby.Server.Core;
-using Emby.Server.Core.Data;
 using Emby.Server.Core.FFMpeg;
 using Emby.Server.Data;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
+using Emby.Server.Implementations;
 
 namespace Emby.Server
 {
@@ -55,11 +55,6 @@ namespace Emby.Server
         {
         }
 
-        protected override IDbConnector GetDbConnector()
-        {
-            return new DbConnector(Logger);
-        }
-
         protected override void ConfigureAutoRunInternal(bool autorun)
         {
         }
diff --git a/src/Emby.Server/Data/DbConnector.cs b/src/Emby.Server/Data/DbConnector.cs
deleted file mode 100644
index bd70cff6c..000000000
--- a/src/Emby.Server/Data/DbConnector.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Data;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Logging;
-using Emby.Server.Core.Data;
-using Microsoft.Data.Sqlite;
-
-namespace Emby.Server.Data
-{
-    public class DbConnector : IDbConnector
-    {
-        private readonly ILogger _logger;
-
-        public DbConnector(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public async Task<IDbConnection> Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null)
-        {
-            if (string.IsNullOrEmpty(dbPath))
-            {
-                throw new ArgumentNullException("dbPath");
-            }
-
-            //SQLiteConnection.SetMemoryStatus(false);
-            
-            var connectionstr = new SqliteConnectionStringBuilder
-            {
-                //PageSize = 4096,
-                //CacheSize = cacheSize ?? 2000,
-                //SyncMode = SynchronizationModes.Normal,
-                DataSource = dbPath,
-                //JournalMode = SQLiteJournalModeEnum.Wal,
-
-                // This is causing crashing under linux
-                //Pooling = enablePooling && Environment.OSVersion.Platform == PlatformID.Win32NT,
-                //ReadOnly = isReadOnly,
-                Cache = enablePooling ? SqliteCacheMode.Default : SqliteCacheMode.Private,
-                Mode = isReadOnly ? SqliteOpenMode.ReadOnly : SqliteOpenMode.ReadWriteCreate
-            };
-
-            var connectionString = connectionstr.ConnectionString;
-
-            var connection = new SqliteConnection(connectionString);
-
-            await connection.OpenAsync().ConfigureAwait(false);
-
-            return connection;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index 80e56c8ab..e5d8351fe 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -15,10 +15,11 @@ using Emby.Common.Implementations.Logging;
 using Emby.Common.Implementations.Networking;
 using Emby.Drawing;
 using Emby.Server.Core;
-using Emby.Server.Core.Browser;
+using Emby.Server.Implementations.Browser;
 using Emby.Server.Implementations.IO;
 using MediaBrowser.Common.Net;
 using Emby.Server.IO;
+using Emby.Server.Implementations;
 
 namespace Emby.Server
 {
-- 
cgit v1.2.3


From e297e90bceeb3310e32142af406403d54875720d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Nov 2016 18:48:52 -0500
Subject: update .net core startup

---
 Emby.Server.Core/ApplicationHost.cs                | 36 +++++++++++++++++-
 .../Data/BaseSqliteRepository.cs                   | 20 ++++++----
 .../Data/SqliteItemRepository.cs                   |  8 ++++
 .../TunerHosts/HdHomerun/HdHomerunLiveStream.cs    |  5 ++-
 MediaBrowser.Server.Mono/MonoAppHost.cs            |  5 ---
 MediaBrowser.ServerApplication/WindowsAppHost.cs   | 32 ----------------
 src/Emby.Server/CoreAppHost.cs                     | 43 +++++++++++++++++++---
 src/Emby.Server/Program.cs                         | 38 ++++++++++++++-----
 src/Emby.Server/project.json                       |  2 +-
 9 files changed, 127 insertions(+), 62 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index ba0d830d3..55a851033 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -132,6 +132,8 @@ using SocketHttpListener.Primitives;
 using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions;
 using Emby.Drawing;
 using Emby.Server.Implementations.Migrations;
+using MediaBrowser.Model.Diagnostics;
+using Emby.Common.Implementations.Diagnostics;
 
 namespace Emby.Server.Core
 {
@@ -1543,7 +1545,39 @@ namespace Emby.Server.Core
             }
         }
 
-        public abstract void LaunchUrl(string url);
+        public void LaunchUrl(string url)
+        {
+            if (EnvironmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows)
+            {
+                throw new NotImplementedException();
+            }
+
+            var process = ProcessFactory.Create(new ProcessOptions {
+                FileName = url,
+                EnableRaisingEvents = true,
+                UseShellExecute = true,
+                ErrorDialog = false
+            });
+
+            process.Exited += ProcessExited;
+
+            try
+            {
+                process.Start();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Error launching url: {0}", url);
+                Logger.ErrorException("Error launching url: {0}", ex, url);
+
+                throw;
+            }
+        }
+
+        private static void ProcessExited(object sender, EventArgs e)
+        {
+            ((IProcess)sender).Dispose();
+        }
 
         public void EnableLoopback(string appName)
         {
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 7836c8b41..c506411d4 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -12,12 +12,22 @@ namespace Emby.Server.Implementations.Data
     public abstract class BaseSqliteRepository : IDisposable
     {
         protected string DbFilePath { get; set; }
-        protected ReaderWriterLockSlim WriteLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+        protected ReaderWriterLockSlim WriteLock;
+
         protected ILogger Logger { get; private set; }
 
         protected BaseSqliteRepository(ILogger logger)
         {
             Logger = logger;
+
+            WriteLock = AllowLockRecursion ?
+              new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion) :
+              new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+        }
+
+        protected virtual bool AllowLockRecursion
+        {
+            get { return false; }
         }
 
         protected virtual bool EnableConnectionPooling
@@ -86,7 +96,7 @@ namespace Emby.Server.Implementations.Data
             var cacheSize = CacheSize;
             if (cacheSize.HasValue)
             {
-                
+
             }
 
             if (EnableExclusiveMode)
@@ -206,11 +216,7 @@ namespace Emby.Server.Implementations.Data
                 return;
             }
 
-            connection.ExecuteAll(string.Join(";", new string[]
-            {
-                "alter table " + table,
-                "add column " + columnName + " " + type + " NULL"
-            }));
+            connection.Execute("alter table " + table + " add column " + columnName + " " + type + " NULL");
         }
     }
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 255235cc7..150e4072a 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -95,6 +95,14 @@ namespace Emby.Server.Implementations.Data
             DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
         }
 
+        protected override bool AllowLockRecursion
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private const string ChaptersTableName = "Chapters2";
 
         protected override int? CacheSize
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs
index 1e8057f87..4852270d5 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs
@@ -89,7 +89,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                         {
                             Url = url,
                             CancellationToken = cancellationToken,
-                            BufferContent = false
+                            BufferContent = false,
+
+                            // Increase a little bit
+                            TimeoutMs = 30000
 
                         }, "GET").ConfigureAwait(false))
                         {
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index f317997f8..8def1ca2b 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -126,11 +126,6 @@ namespace MediaBrowser.Server.Mono
             throw new NotImplementedException();
         }
 
-        public override void LaunchUrl(string url)
-        {
-            throw new NotImplementedException();
-        }
-
         protected override void EnableLoopbackInternal(string appName)
         {
         }
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index e36287584..c2cdb9ab0 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -119,38 +119,6 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        public override void LaunchUrl(string url)
-        {
-            var process = new Process
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = url
-                },
-
-                EnableRaisingEvents = true,
-            };
-
-            process.Exited += ProcessExited;
-
-            try
-            {
-                process.Start();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Error launching url: {0}", url);
-                Logger.ErrorException("Error launching url: {0}", ex, url);
-
-                throw;
-            }
-        }
-
-        private static void ProcessExited(object sender, EventArgs e)
-        {
-            ((Process)sender).Dispose();
-        }
-
         protected override void EnableLoopbackInternal(string appName)
         {
             LoopUtil.Run(appName);
diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs
index 5291f20ef..09df664fa 100644
--- a/src/Emby.Server/CoreAppHost.cs
+++ b/src/Emby.Server/CoreAppHost.cs
@@ -4,8 +4,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Emby.Server.Core;
-using Emby.Server.Core.FFMpeg;
-using Emby.Server.Data;
+using Emby.Server.Implementations.FFMpeg;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
@@ -39,9 +38,37 @@ namespace Emby.Server
         {
             var info = new FFMpegInstallInfo();
 
+            if (EnvironmentInfo.OperatingSystem == OperatingSystem.Windows)
+            {
+                info.FFMpegFilename = "ffmpeg.exe";
+                info.FFProbeFilename = "ffprobe.exe";
+                info.Version = "20160410";
+                info.ArchiveType = "7z";
+                info.DownloadUrls = GetDownloadUrls();
+            }
+
             return info;
         }
 
+        private string[] GetDownloadUrls()
+        {
+            switch (EnvironmentInfo.SystemArchitecture)
+            {
+                case Architecture.X64:
+                    return new[]
+                    {
+                                "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win64.7z"
+                    };
+                case Architecture.X86:
+                    return new[]
+                    {
+                                "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win32.7z"
+                    };
+            }
+
+            return new string[] { };
+        }
+
         protected override List<Assembly> GetAssembliesWithPartsInternal()
         {
             var list = new List<Assembly>();
@@ -59,10 +86,6 @@ namespace Emby.Server
         {
         }
 
-        public override void LaunchUrl(string url)
-        {
-        }
-
         protected override void EnableLoopbackInternal(string appName)
         {
         }
@@ -98,5 +121,13 @@ namespace Emby.Server
                 return Program.CanSelfUpdate;
             }
         }
+
+        protected override bool SupportsDualModeSockets
+        {
+            get
+            {
+                return true;
+            }
+        }
     }
 }
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index e5d8351fe..24e391c73 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -39,19 +39,34 @@ namespace Emby.Server
         /// </summary>
         public static void Main(string[] args)
         {
-            var options = new StartupOptions();
+            var options = new StartupOptions(Environment.GetCommandLineArgs());
+
+            var environmentInfo = new EnvironmentInfo();
 
-            var currentProcess = Process.GetCurrentProcess();
-            
             var baseDirectory = System.AppContext.BaseDirectory;
-            //var architecturePath = Path.Combine(Path.GetDirectoryName(applicationPath), Environment.Is64BitProcess ? "x64" : "x86");
+            string archPath = baseDirectory;
+            if (environmentInfo.SystemArchitecture == MediaBrowser.Model.System.Architecture.X64)
+            {
+                archPath = Path.Combine(archPath, "x64");
+            }
+            else if (environmentInfo.SystemArchitecture == MediaBrowser.Model.System.Architecture.X86)
+            {
+                archPath = Path.Combine(archPath, "x86");
+            }
+            else
+            {
+                archPath = Path.Combine(archPath, "arm");
+            }
 
             //Wand.SetMagickCoderModulePath(architecturePath);
 
-            //var success = SetDllDirectory(architecturePath);
+            if (environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows)
+            {
+                SetDllDirectory(archPath);
+            }
 
             var appPaths = CreateApplicationPaths(baseDirectory);
-            SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
+            SetSqliteProvider();
 
             var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
             logManager.ReloadLogger(LogSeverity.Debug);
@@ -75,7 +90,12 @@ namespace Emby.Server
                 return;
             }
 
-            RunApplication(appPaths, logManager, options);
+            RunApplication(appPaths, logManager, options, environmentInfo);
+        }
+
+        private static void SetSqliteProvider()
+        {
+            SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
         }
 
         /// <summary>
@@ -171,7 +191,7 @@ namespace Emby.Server
         /// <param name="appPaths">The app paths.</param>
         /// <param name="logManager">The log manager.</param>
         /// <param name="options">The options.</param>
-        private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options)
+        private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options, EnvironmentInfo environmentInfo)
         {
             var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, true);
 
@@ -185,7 +205,7 @@ namespace Emby.Server
                 fileSystem,
                 new PowerManagement(),
                 "emby.windows.zip",
-                new EnvironmentInfo(),
+                environmentInfo,
                 imageEncoder,
                 new CoreSystemEvents(),
                 new MemoryStreamFactory(),
diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json
index 0e1cf8bee..35ebdc213 100644
--- a/src/Emby.Server/project.json
+++ b/src/Emby.Server/project.json
@@ -15,7 +15,7 @@
     "Microsoft.Win32.Registry": "4.0.0",
     "System.Runtime.Extensions": "4.1.0",
     "System.Diagnostics.Process": "4.1.0",
-    "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.0"
+    "SQLitePCLRaw.provider.sqlite3.netstandard11": "1.1.1-pre20161109081005"
   },
 
   "frameworks": {
-- 
cgit v1.2.3


From 1dc080df8ba5b9af9245788634d56cb155afd2ba Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Nov 2016 22:52:58 -0500
Subject: update connections

---
 .../Activity/ActivityRepository.cs                 |  16 +-
 .../Data/BaseSqliteRepository.cs                   |  58 +-
 .../Data/SqliteDisplayPreferencesRepository.cs     |  26 +-
 .../Data/SqliteExtensions.cs                       |  10 +-
 .../Data/SqliteFileOrganizationRepository.cs       |   8 +
 .../Data/SqliteItemRepository.cs                   | 799 +++++++++++----------
 .../Data/SqliteUserDataRepository.cs               |  99 +--
 .../Data/SqliteUserRepository.cs                   |  20 +-
 .../Notifications/SqliteNotificationsRepository.cs |  25 +-
 .../Security/AuthenticationRepository.cs           |  55 +-
 .../Social/SharingRepository.cs                    |  16 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs |  76 +-
 12 files changed, 672 insertions(+), 536 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index d730e420a..8a7573d66 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -27,6 +27,14 @@ namespace Emby.Server.Implementations.Activity
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)",
@@ -51,9 +59,9 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException("entry");
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -79,9 +87,9 @@ namespace Emby.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index c506411d4..382c7f245 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -30,11 +30,6 @@ namespace Emby.Server.Implementations.Data
             get { return false; }
         }
 
-        protected virtual bool EnableConnectionPooling
-        {
-            get { return true; }
-        }
-
         static BaseSqliteRepository()
         {
             SQLite3.EnableSharedCache = false;
@@ -45,7 +40,7 @@ namespace Emby.Server.Implementations.Data
 
         private static bool _versionLogged;
 
-        protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
+        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action<SQLiteDatabaseConnection> onConnect = null)
         {
             if (!_versionLogged)
             {
@@ -56,7 +51,7 @@ namespace Emby.Server.Implementations.Data
 
             ConnectionFlags connectionFlags;
 
-            //isReadOnly = false;
+            isReadOnly = false;
 
             if (isReadOnly)
             {
@@ -70,46 +65,40 @@ namespace Emby.Server.Implementations.Data
                 connectionFlags |= ConnectionFlags.ReadWrite;
             }
 
-            if (EnableConnectionPooling)
-            {
-                connectionFlags |= ConnectionFlags.SharedCached;
-            }
-            else
-            {
-                connectionFlags |= ConnectionFlags.PrivateCache;
-            }
-
+            connectionFlags |= ConnectionFlags.SharedCached;
             connectionFlags |= ConnectionFlags.NoMutex;
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
             var queries = new List<string>
             {
-                "pragma default_temp_store = memory",
+                "pragma temp_store = memory",
                 "PRAGMA page_size=4096",
                 "PRAGMA journal_mode=WAL",
-                "PRAGMA temp_store=memory",
-                "PRAGMA synchronous=Normal",
+                "pragma synchronous=Normal",
                 //"PRAGMA cache size=-10000"
             };
 
-            var cacheSize = CacheSize;
-            if (cacheSize.HasValue)
-            {
+            //var cacheSize = CacheSize;
+            //if (cacheSize.HasValue)
+            //{
 
-            }
+            //}
 
-            if (EnableExclusiveMode)
-            {
-                queries.Add("PRAGMA locking_mode=EXCLUSIVE");
-            }
+            ////foreach (var query in queries)
+            ////{
+            ////    db.Execute(query);
+            ////}
 
-            //foreach (var query in queries)
-            //{
-            //    db.Execute(query);
-            //}
+            using (WriteLock.Write())
+            {
+                db.ExecuteAll(string.Join(";", queries.ToArray()));
 
-            db.ExecuteAll(string.Join(";", queries.ToArray()));
+                if (onConnect != null)
+                {
+                    onConnect(db);
+                }
+            }
 
             return db;
         }
@@ -122,11 +111,6 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        protected virtual bool EnableExclusiveMode
-        {
-            get { return false; }
-        }
-
         internal static void CheckOk(int rc)
         {
             string msg = "";
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 184caa4d4..ab927ce86 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -54,9 +54,17 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+               {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
-                                "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
+                               "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
                                 "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
                                };
 
@@ -86,9 +94,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -130,9 +138,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -162,9 +170,9 @@ namespace Emby.Server.Implementations.Data
 
             var guidId = displayPreferencesId.GetMD5();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client"))
                     {
@@ -196,9 +204,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<DisplayPreferences>();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId"))
                     {
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index e4e91626d..5b2549087 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -131,11 +131,13 @@ namespace Emby.Server.Implementations.Data
 
         public static void Attach(IDatabaseConnection db, string path, string alias)
         {
-            var commandText = string.Format("attach ? as {0};", alias);
-            var paramList = new List<object>();
-            paramList.Add(path);
+            var commandText = string.Format("attach @path as {0};", alias);
 
-            db.Execute(commandText, paramList.ToArray());
+            using (var statement = db.PrepareStatement(commandText))
+            {
+                statement.TryBind("@path", path);
+                statement.MoveNext();
+            }
         }
 
         public static bool IsDBNull(this IReadOnlyList<IResultSetValue> result, int index)
diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
index 96edc5d0d..a71682329 100644
--- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
@@ -31,6 +31,14 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists FileOrganizerResults (ResultId GUID PRIMARY KEY, OriginalPath TEXT, TargetPath TEXT, FileLength INT, OrganizationDate datetime, Status TEXT, OrganizationType TEXT, StatusMessage TEXT, ExtractedName TEXT, ExtractedYear int null, ExtractedSeasonNumber int null, ExtractedEpisodeNumber int null, ExtractedEndingEpisodeNumber, DuplicatePaths TEXT int null)",
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c720a8d89..754af9640 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -127,10 +127,19 @@ namespace Emby.Server.Implementations.Data
         {
             _connection = CreateConnection(false);
 
+            _connection.ExecuteAll(string.Join(";", new[]
+            {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+             }));
+
             var createMediaStreamsTableCommand
                = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
             string[] queries = {
+                                "PRAGMA locking_mode=NORMAL",
 
                                 "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)",
 
@@ -344,25 +353,26 @@ namespace Emby.Server.Implementations.Data
 
             _connection.RunQueries(postQueries);
 
-            SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
-            userDataRepo.Initialize(_connection, WriteLock);
+            //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
+            userDataRepo.Initialize(WriteLock);
             //await Vacuum(_connection).ConfigureAwait(false);
         }
 
-        protected override bool EnableConnectionPooling
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        protected override bool EnableExclusiveMode
+        private SQLiteDatabaseConnection CreateConnection(bool readOnly, bool attachUserdata)
         {
-            get
+            Action<SQLiteDatabaseConnection> onConnect = null;
+
+            if (attachUserdata)
             {
-                return true;
+                onConnect =
+                    c => SqliteExtensions.Attach(c, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"),
+                            "UserDataDb");
             }
+
+            var conn = CreateConnection(readOnly, onConnect);
+
+            return conn;
         }
 
         private readonly string[] _retriveItemColumns =
@@ -635,12 +645,15 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                _connection.RunInTransaction(db =>
+                using (WriteLock.Write())
                 {
-                    SaveItemsInTranscation(db, items);
-                });
+                    connection.RunInTransaction(db =>
+                    {
+                        SaveItemsInTranscation(db, items);
+                    });
+                }
             }
         }
 
@@ -1170,15 +1183,18 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@guid", id);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                     {
-                        return GetItem(row);
+                        statement.TryBind("@guid", id);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            return GetItem(row);
+                        }
                     }
                 }
             }
@@ -1976,15 +1992,18 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<ChapterInfo>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@ItemId", id);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                     {
-                        list.Add(GetChapter(row));
+                        statement.TryBind("@ItemId", id);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(GetChapter(row));
+                        }
                     }
                 }
             }
@@ -2007,16 +2026,19 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@ItemId", id);
-                    statement.TryBind("@ChapterIndex", index);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
                     {
-                        return GetChapter(row);
+                        statement.TryBind("@ItemId", id);
+                        statement.TryBind("@ChapterIndex", index);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            return GetChapter(row);
+                        }
                     }
                 }
             }
@@ -2085,35 +2107,38 @@ namespace Emby.Server.Implementations.Data
 
             var index = 0;
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                _connection.RunInTransaction(db =>
+                using (WriteLock.Write())
                 {
-                    // First delete chapters
-                    _connection.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue());
-
-                    using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)"))
+                    connection.RunInTransaction(db =>
                     {
-                        foreach (var chapter in chapters)
+                        // First delete chapters
+                        db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue());
+
+                        using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)"))
                         {
-                            if (index > 0)
+                            foreach (var chapter in chapters)
                             {
-                                saveChapterStatement.Reset();
-                            }
+                                if (index > 0)
+                                {
+                                    saveChapterStatement.Reset();
+                                }
 
-                            saveChapterStatement.TryBind("@ItemId", id.ToGuidParamValue());
-                            saveChapterStatement.TryBind("@ChapterIndex", index);
-                            saveChapterStatement.TryBind("@StartPositionTicks", chapter.StartPositionTicks);
-                            saveChapterStatement.TryBind("@Name", chapter.Name);
-                            saveChapterStatement.TryBind("@ImagePath", chapter.ImagePath);
-                            saveChapterStatement.TryBind("@ImageDateModified", chapter.ImageDateModified);
+                                saveChapterStatement.TryBind("@ItemId", id.ToGuidParamValue());
+                                saveChapterStatement.TryBind("@ChapterIndex", index);
+                                saveChapterStatement.TryBind("@StartPositionTicks", chapter.StartPositionTicks);
+                                saveChapterStatement.TryBind("@Name", chapter.Name);
+                                saveChapterStatement.TryBind("@ImagePath", chapter.ImagePath);
+                                saveChapterStatement.TryBind("@ImageDateModified", chapter.ImageDateModified);
 
-                            saveChapterStatement.MoveNext();
+                                saveChapterStatement.MoveNext();
 
-                            index++;
+                                index++;
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         }
 
@@ -2383,31 +2408,34 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    if (EnableJoinUserData(query))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        var item = GetItem(row, query);
-                        if (item != null)
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            list.Add(item);
+                            var item = GetItem(row, query);
+                            if (item != null)
+                            {
+                                list.Add(item);
+                            }
                         }
                     }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
+                    LogQueryTime("GetItemList", commandText, now);
+                }
             }
 
             // Hack for right now since we currently don't support filtering out these duplicates within a query
@@ -2548,72 +2576,75 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                var totalRecordCount = 0;
-                var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
-
-                if (!isReturningZeroItems)
+                using (WriteLock.Read())
                 {
-                    using (var statement = _connection.PrepareStatement(commandText))
+                    var totalRecordCount = 0;
+                    var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
+
+                    if (!isReturningZeroItems)
                     {
-                        if (EnableJoinUserData(query))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            var item = GetItem(row, query);
-                            if (item != null)
+                            foreach (var row in statement.ExecuteQuery())
                             {
-                                list.Add(item);
+                                var item = GetItem(row, query);
+                                if (item != null)
+                                {
+                                    list.Add(item);
+                                }
                             }
                         }
                     }
-                }
 
-                commandText = string.Empty;
+                    commandText = string.Empty;
 
-                if (EnableGroupByPresentationUniqueKey(query))
-                {
-                    commandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
-                }
-                else
-                {
-                    commandText += " select count (guid)" + GetFromText();
-                }
+                    if (EnableGroupByPresentationUniqueKey(query))
+                    {
+                        commandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
+                    }
+                    else
+                    {
+                        commandText += " select count (guid)" + GetFromText();
+                    }
 
-                commandText += GetJoinUserDataText(query);
-                commandText += whereTextWithoutPaging;
+                    commandText += GetJoinUserDataText(query);
+                    commandText += whereTextWithoutPaging;
 
-                using (var statement = _connection.PrepareStatement(commandText))
-                {
-                    if (EnableJoinUserData(query))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
-                }
+                        totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                    }
 
-                LogQueryTime("GetItems", commandText, now);
+                    LogQueryTime("GetItems", commandText, now);
 
-                return new QueryResult<BaseItem>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = totalRecordCount
-                };
+                    return new QueryResult<BaseItem>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = totalRecordCount
+                    };
+                }
             }
         }
 
@@ -2774,29 +2805,32 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    if (EnableJoinUserData(query))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        list.Add(row[0].ReadGuid());
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(row[0].ReadGuid());
+                        }
                     }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
+                    LogQueryTime("GetItemList", commandText, now);
 
-                return list;
+                    return list;
+                }
             }
         }
 
@@ -2842,34 +2876,37 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Tuple<Guid, string>>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    if (EnableJoinUserData(query))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
-
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        var id = row.GetGuid(0);
-                        string path = null;
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                        if (!row.IsDBNull(1))
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            path = row.GetString(1);
+                            var id = row.GetGuid(0);
+                            string path = null;
+
+                            if (!row.IsDBNull(1))
+                            {
+                                path = row.GetString(1);
+                            }
+                            list.Add(new Tuple<Guid, string>(id, path));
                         }
-                        list.Add(new Tuple<Guid, string>(id, path));
                     }
-                }
 
-                LogQueryTime("GetItemIdsWithPath", commandText, now);
+                    LogQueryTime("GetItemIdsWithPath", commandText, now);
 
-                return list;
+                    return list;
+                }
             }
         }
 
@@ -2928,64 +2965,67 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                var totalRecordCount = 0;
-
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    if (EnableJoinUserData(query))
+                    var totalRecordCount = 0;
+
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        list.Add(row[0].ReadGuid());
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(row[0].ReadGuid());
+                        }
                     }
-                }
 
-                commandText = string.Empty;
+                    commandText = string.Empty;
 
-                if (EnableGroupByPresentationUniqueKey(query))
-                {
-                    commandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
-                }
-                else
-                {
-                    commandText += " select count (guid)" + GetFromText();
-                }
+                    if (EnableGroupByPresentationUniqueKey(query))
+                    {
+                        commandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
+                    }
+                    else
+                    {
+                        commandText += " select count (guid)" + GetFromText();
+                    }
 
-                commandText += GetJoinUserDataText(query);
-                commandText += whereTextWithoutPaging;
+                    commandText += GetJoinUserDataText(query);
+                    commandText += whereTextWithoutPaging;
 
-                using (var statement = _connection.PrepareStatement(commandText))
-                {
-                    if (EnableJoinUserData(query))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        statement.TryBind("@UserId", query.User.Id);
-                    }
+                        if (EnableJoinUserData(query))
+                        {
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                    BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                    // Running this again will bind the params
-                    GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
-                }
+                        totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                    }
 
-                LogQueryTime("GetItemIds", commandText, now);
+                    LogQueryTime("GetItemIds", commandText, now);
 
-                return new QueryResult<Guid>()
-                {
-                    Items = list.ToArray(),
-                    TotalRecordCount = totalRecordCount
-                };
+                    return new QueryResult<Guid>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = totalRecordCount
+                    };
+                }
             }
         }
 
@@ -4289,33 +4329,36 @@ namespace Emby.Server.Implementations.Data
 
             var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags";
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                foreach (var row in _connection.Query(commandText))
+                using (WriteLock.Write())
                 {
-                    var id = row.GetGuid(0);
-                    string value = row.IsDBNull(2) ? null : row.GetString(2);
+                    foreach (var row in connection.Query(commandText))
+                    {
+                        var id = row.GetGuid(0);
+                        string value = row.IsDBNull(2) ? null : row.GetString(2);
 
-                    newValues.Add(new Tuple<Guid, string>(id, value));
-                }
+                        newValues.Add(new Tuple<Guid, string>(id, value));
+                    }
 
-                Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count);
-                if (newValues.Count == 0)
-                {
-                    return;
-                }
+                    Logger.Debug("UpdateInheritedTags - {0} rows", newValues.Count);
+                    if (newValues.Count == 0)
+                    {
+                        return;
+                    }
 
-                // write lock here
-                using (var statement = _connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"))
-                {
-                    foreach (var item in newValues)
+                    // write lock here
+                    using (var statement = connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"))
                     {
-                        var paramList = new List<object>();
+                        foreach (var item in newValues)
+                        {
+                            var paramList = new List<object>();
 
-                        paramList.Add(item.Item1);
-                        paramList.Add(item.Item2);
+                            paramList.Add(item.Item1);
+                            paramList.Add(item.Item2);
 
-                        statement.Execute(paramList.ToArray());
+                            statement.Execute(paramList.ToArray());
+                        }
                     }
                 }
             }
@@ -4360,28 +4403,31 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                _connection.RunInTransaction(db =>
+                using (WriteLock.Write())
                 {
-                    // Delete people
-                    ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue());
+                    connection.RunInTransaction(db =>
+                    {
+                        // Delete people
+                        ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue());
 
-                    // Delete chapters
-                    ExecuteWithSingleParam(db, "delete from " + ChaptersTableName + " where ItemId=@Id", id.ToGuidParamValue());
+                        // Delete chapters
+                        ExecuteWithSingleParam(db, "delete from " + ChaptersTableName + " where ItemId=@Id", id.ToGuidParamValue());
 
-                    // Delete media streams
-                    ExecuteWithSingleParam(db, "delete from mediastreams where ItemId=@Id", id.ToGuidParamValue());
+                        // Delete media streams
+                        ExecuteWithSingleParam(db, "delete from mediastreams where ItemId=@Id", id.ToGuidParamValue());
 
-                    // Delete ancestors
-                    ExecuteWithSingleParam(db, "delete from AncestorIds where ItemId=@Id", id.ToGuidParamValue());
+                        // Delete ancestors
+                        ExecuteWithSingleParam(db, "delete from AncestorIds where ItemId=@Id", id.ToGuidParamValue());
 
-                    // Delete item values
-                    ExecuteWithSingleParam(db, "delete from ItemValues where ItemId=@Id", id.ToGuidParamValue());
+                        // Delete item values
+                        ExecuteWithSingleParam(db, "delete from ItemValues where ItemId=@Id", id.ToGuidParamValue());
 
-                    // Delete the item
-                    ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue());
-                });
+                        // Delete the item
+                        ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue());
+                    });
+                }
             }
         }
 
@@ -4417,19 +4463,22 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<string>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    // Run this again to bind the params
-                    GetPeopleWhereClauses(query, statement);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        list.Add(row.GetString(0));
+                        // Run this again to bind the params
+                        GetPeopleWhereClauses(query, statement);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(row.GetString(0));
+                        }
                     }
+                    return list;
                 }
-                return list;
             }
         }
 
@@ -4455,16 +4504,19 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<PersonInfo>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    // Run this again to bind the params
-                    GetPeopleWhereClauses(query, statement);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        list.Add(GetPerson(row));
+                        // Run this again to bind the params
+                        GetPeopleWhereClauses(query, statement);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(GetPerson(row));
+                        }
                     }
                 }
             }
@@ -4667,13 +4719,16 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " Group By CleanValue";
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                foreach (var row in _connection.Query(commandText))
+                using (WriteLock.Write())
                 {
-                    if (!row.IsDBNull(0))
+                    foreach (var row in connection.Query(commandText))
                     {
-                        list.Add(row.GetString(0));
+                        if (!row.IsDBNull(0))
+                        {
+                            list.Add(row.GetString(0));
+                        }
                     }
                 }
             }
@@ -4825,67 +4880,70 @@ namespace Emby.Server.Implementations.Data
             var list = new List<Tuple<BaseItem, ItemCounts>>();
             var count = 0;
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                if (!isReturningZeroItems)
+                using (WriteLock.Read())
                 {
-                    using (var statement = _connection.PrepareStatement(commandText))
+                    if (!isReturningZeroItems)
                     {
-                        statement.TryBind("@SelectType", returnType);
-                        if (EnableJoinUserData(query))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            statement.TryBind("@SelectType", returnType);
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        if (typeSubQuery != null)
-                        {
-                            GetWhereClauses(typeSubQuery, null, "itemTypes");
-                        }
-                        BindSimilarParams(query, statement);
-                        GetWhereClauses(innerQuery, statement);
-                        GetWhereClauses(outerQuery, statement);
+                            if (typeSubQuery != null)
+                            {
+                                GetWhereClauses(typeSubQuery, null, "itemTypes");
+                            }
+                            BindSimilarParams(query, statement);
+                            GetWhereClauses(innerQuery, statement);
+                            GetWhereClauses(outerQuery, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            var item = GetItem(row);
-                            if (item != null)
+                            foreach (var row in statement.ExecuteQuery())
                             {
-                                var countStartColumn = columns.Count - 1;
+                                var item = GetItem(row);
+                                if (item != null)
+                                {
+                                    var countStartColumn = columns.Count - 1;
 
-                                list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(row, countStartColumn, typesToCount)));
+                                    list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(row, countStartColumn, typesToCount)));
+                                }
                             }
-                        }
 
-                        LogQueryTime("GetItemValues", commandText, now);
+                            LogQueryTime("GetItemValues", commandText, now);
+                        }
                     }
-                }
 
-                if (query.EnableTotalRecordCount)
-                {
-                    commandText = "select count (distinct PresentationUniqueKey)" + GetFromText();
+                    if (query.EnableTotalRecordCount)
+                    {
+                        commandText = "select count (distinct PresentationUniqueKey)" + GetFromText();
 
-                    commandText += GetJoinUserDataText(query);
-                    commandText += whereText;
+                        commandText += GetJoinUserDataText(query);
+                        commandText += whereText;
 
-                    using (var statement = _connection.PrepareStatement(commandText))
-                    {
-                        statement.TryBind("@SelectType", returnType);
-                        if (EnableJoinUserData(query))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            statement.TryBind("@SelectType", returnType);
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        if (typeSubQuery != null)
-                        {
-                            GetWhereClauses(typeSubQuery, null, "itemTypes");
-                        }
-                        BindSimilarParams(query, statement);
-                        GetWhereClauses(innerQuery, statement);
-                        GetWhereClauses(outerQuery, statement);
+                            if (typeSubQuery != null)
+                            {
+                                GetWhereClauses(typeSubQuery, null, "itemTypes");
+                            }
+                            BindSimilarParams(query, statement);
+                            GetWhereClauses(innerQuery, statement);
+                            GetWhereClauses(outerQuery, statement);
 
-                        count = statement.ExecuteQuery().SelectScalarInt().First();
+                            count = statement.ExecuteQuery().SelectScalarInt().First();
 
-                        LogQueryTime("GetItemValues", commandText, now);
+                            LogQueryTime("GetItemValues", commandText, now);
+                        }
                     }
                 }
             }
@@ -5043,33 +5101,35 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                // First delete 
-                // "delete from People where ItemId=?"
-                _connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue());
+                using (WriteLock.Write())
+                { // First delete 
+                    // "delete from People where ItemId=?"
+                    connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue());
 
-                var listIndex = 0;
+                    var listIndex = 0;
 
-                using (var statement = _connection.PrepareStatement(
-                            "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)"))
-                {
-                    foreach (var person in people)
+                    using (var statement = connection.PrepareStatement(
+                                "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)"))
                     {
-                        if (listIndex > 0)
+                        foreach (var person in people)
                         {
-                            statement.Reset();
-                        }
+                            if (listIndex > 0)
+                            {
+                                statement.Reset();
+                            }
 
-                        statement.TryBind("@ItemId", itemId.ToGuidParamValue());
-                        statement.TryBind("@Name", person.Name);
-                        statement.TryBind("@Role", person.Role);
-                        statement.TryBind("@PersonType", person.Type);
-                        statement.TryBind("@SortOrder", person.SortOrder);
-                        statement.TryBind("@ListOrder", listIndex);
+                            statement.TryBind("@ItemId", itemId.ToGuidParamValue());
+                            statement.TryBind("@Name", person.Name);
+                            statement.TryBind("@Role", person.Role);
+                            statement.TryBind("@PersonType", person.Type);
+                            statement.TryBind("@SortOrder", person.SortOrder);
+                            statement.TryBind("@ListOrder", listIndex);
 
-                        statement.MoveNext();
-                        listIndex++;
+                            statement.MoveNext();
+                            listIndex++;
+                        }
                     }
                 }
             }
@@ -5127,25 +5187,28 @@ namespace Emby.Server.Implementations.Data
 
             cmdText += " order by StreamIndex ASC";
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement(cmdText))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
-
-                    if (query.Type.HasValue)
+                    using (var statement = connection.PrepareStatement(cmdText))
                     {
-                        statement.TryBind("@StreamType", query.Type.Value.ToString());
-                    }
+                        statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
 
-                    if (query.Index.HasValue)
-                    {
-                        statement.TryBind("@StreamIndex", query.Index.Value);
-                    }
+                        if (query.Type.HasValue)
+                        {
+                            statement.TryBind("@StreamType", query.Type.Value.ToString());
+                        }
 
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        list.Add(GetMediaStream(row));
+                        if (query.Index.HasValue)
+                        {
+                            statement.TryBind("@StreamIndex", query.Index.Value);
+                        }
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(GetMediaStream(row));
+                        }
                     }
                 }
             }
@@ -5169,58 +5232,60 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                // First delete chapters
-                _connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue());
+                using (WriteLock.Write())
+                {     // First delete chapters
+                    connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue());
 
-                using (var statement = _connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})",
-                            string.Join(",", _mediaStreamSaveColumns),
-                            string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray()))))
-                {
-                    foreach (var stream in streams)
+                    using (var statement = connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})",
+                                string.Join(",", _mediaStreamSaveColumns),
+                                string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray()))))
                     {
-                        var paramList = new List<object>();
-
-                        paramList.Add(id.ToGuidParamValue());
-                        paramList.Add(stream.Index);
-                        paramList.Add(stream.Type.ToString());
-                        paramList.Add(stream.Codec);
-                        paramList.Add(stream.Language);
-                        paramList.Add(stream.ChannelLayout);
-                        paramList.Add(stream.Profile);
-                        paramList.Add(stream.AspectRatio);
-                        paramList.Add(stream.Path);
-
-                        paramList.Add(stream.IsInterlaced);
-                        paramList.Add(stream.BitRate);
-                        paramList.Add(stream.Channels);
-                        paramList.Add(stream.SampleRate);
-
-                        paramList.Add(stream.IsDefault);
-                        paramList.Add(stream.IsForced);
-                        paramList.Add(stream.IsExternal);
-
-                        paramList.Add(stream.Width);
-                        paramList.Add(stream.Height);
-                        paramList.Add(stream.AverageFrameRate);
-                        paramList.Add(stream.RealFrameRate);
-                        paramList.Add(stream.Level);
-                        paramList.Add(stream.PixelFormat);
-                        paramList.Add(stream.BitDepth);
-                        paramList.Add(stream.IsExternal);
-                        paramList.Add(stream.RefFrames);
-
-                        paramList.Add(stream.CodecTag);
-                        paramList.Add(stream.Comment);
-                        paramList.Add(stream.NalLengthSize);
-                        paramList.Add(stream.IsAVC);
-                        paramList.Add(stream.Title);
-
-                        paramList.Add(stream.TimeBase);
-                        paramList.Add(stream.CodecTimeBase);
-
-                        statement.Execute(paramList.ToArray());
+                        foreach (var stream in streams)
+                        {
+                            var paramList = new List<object>();
+
+                            paramList.Add(id.ToGuidParamValue());
+                            paramList.Add(stream.Index);
+                            paramList.Add(stream.Type.ToString());
+                            paramList.Add(stream.Codec);
+                            paramList.Add(stream.Language);
+                            paramList.Add(stream.ChannelLayout);
+                            paramList.Add(stream.Profile);
+                            paramList.Add(stream.AspectRatio);
+                            paramList.Add(stream.Path);
+
+                            paramList.Add(stream.IsInterlaced);
+                            paramList.Add(stream.BitRate);
+                            paramList.Add(stream.Channels);
+                            paramList.Add(stream.SampleRate);
+
+                            paramList.Add(stream.IsDefault);
+                            paramList.Add(stream.IsForced);
+                            paramList.Add(stream.IsExternal);
+
+                            paramList.Add(stream.Width);
+                            paramList.Add(stream.Height);
+                            paramList.Add(stream.AverageFrameRate);
+                            paramList.Add(stream.RealFrameRate);
+                            paramList.Add(stream.Level);
+                            paramList.Add(stream.PixelFormat);
+                            paramList.Add(stream.BitDepth);
+                            paramList.Add(stream.IsExternal);
+                            paramList.Add(stream.RefFrames);
+
+                            paramList.Add(stream.CodecTag);
+                            paramList.Add(stream.Comment);
+                            paramList.Add(stream.NalLengthSize);
+                            paramList.Add(stream.IsAVC);
+                            paramList.Add(stream.Title);
+
+                            paramList.Add(stream.TimeBase);
+                            paramList.Add(stream.CodecTimeBase);
+
+                            statement.Execute(paramList.ToArray());
+                        }
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index a66536179..0b4768c14 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -14,19 +14,12 @@ namespace Emby.Server.Implementations.Data
 {
     public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
     {
-        private SQLiteDatabaseConnection _connection;
-
         public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths)
             : base(logger)
         {
             DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db");
         }
 
-        protected override bool EnableConnectionPooling
-        {
-            get { return false; }
-        }
-
         /// <summary>
         /// Gets the name of the repository
         /// </summary>
@@ -43,13 +36,24 @@ namespace Emby.Server.Implementations.Data
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public void Initialize(SQLiteDatabaseConnection connection, ReaderWriterLockSlim writeLock)
+        public void Initialize(ReaderWriterLockSlim writeLock)
         {
             WriteLock.Dispose();
             WriteLock = writeLock;
-            _connection = connection;
 
-            string[] queries = {
+            using (var connection = CreateConnection())
+            {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
+                string[] queries = {
+
+                                "PRAGMA locking_mode=NORMAL",
 
                                 "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
 
@@ -69,15 +73,16 @@ namespace Emby.Server.Implementations.Data
                                 "pragma shrink_memory"
                                };
 
-            _connection.RunQueries(queries);
+                connection.RunQueries(queries);
 
-            connection.RunInTransaction(db =>
-            {
-                var existingColumnNames = GetColumnNames(db, "userdata");
+                connection.RunInTransaction(db =>
+                {
+                    var existingColumnNames = GetColumnNames(db, "userdata");
 
-                AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames);
-                AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
-            });
+                    AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames);
+                    AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
+                });
+            }
         }
 
         /// <summary>
@@ -139,18 +144,21 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                _connection.RunInTransaction(db =>
+                using (WriteLock.Write())
                 {
-                    SaveUserData(db, userId, key, userData);
-                });
+                    connection.RunInTransaction(db =>
+                    {
+                        SaveUserData(db, userId, key, userData);
+                    });
+                }
             }
         }
 
         private void SaveUserData(IDatabaseConnection db, Guid userId, string key, UserItemData userData)
         {
-            using (var statement = _connection.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"))
+            using (var statement = db.PrepareStatement("replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"))
             {
                 statement.TryBind("@UserId", userId.ToGuidParamValue());
                 statement.TryBind("@Key", key);
@@ -207,15 +215,18 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                _connection.RunInTransaction(db =>
+                using (WriteLock.Write())
                 {
-                    foreach (var userItemData in userDataList)
+                    connection.RunInTransaction(db =>
                     {
-                        SaveUserData(db, userId, userItemData.Key, userItemData);
-                    }
-                });
+                        foreach (var userItemData in userDataList)
+                        {
+                            SaveUserData(db, userId, userItemData.Key, userItemData);
+                        }
+                    });
+                }
             }
         }
 
@@ -241,16 +252,19 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("key");
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
             {
-                using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@UserId", userId.ToGuidParamValue());
-                    statement.TryBind("@Key", key);
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                     {
-                        return ReadRow(row);
+                        statement.TryBind("@UserId", userId.ToGuidParamValue());
+                        statement.TryBind("@Key", key);
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            return ReadRow(row);
+                        }
                     }
                 }
             }
@@ -291,15 +305,18 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<UserItemData>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var statement = _connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId"))
+                using (WriteLock.Read())
                 {
-                    statement.TryBind("@UserId", userId.ToGuidParamValue());
-
-                    foreach (var row in statement.ExecuteQuery())
+                    using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId"))
                     {
-                        list.Add(ReadRow(row));
+                        statement.TryBind("@UserId", userId.ToGuidParamValue());
+
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(ReadRow(row));
+                        }
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 5e148d95a..0a2f9e7cd 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -50,6 +50,14 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists users (guid GUID primary key, data BLOB)",
@@ -83,9 +91,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -108,9 +116,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     foreach (var row in connection.Query("select guid,data from users"))
                     {
@@ -146,9 +154,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 5a3b64dbb..5fc691527 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -29,7 +29,16 @@ namespace Emby.Server.Implementations.Notifications
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
+
                                 "create table if not exists Notifications (Id GUID NOT NULL, UserId GUID NOT NULL, Date DATETIME NOT NULL, Name TEXT NOT NULL, Description TEXT NULL, Url TEXT NULL, Level TEXT NOT NULL, IsRead BOOLEAN NOT NULL, Category TEXT NOT NULL, RelatedId TEXT NULL, PRIMARY KEY (Id, UserId))",
                                 "create index if not exists idx_Notifications1 on Notifications(Id)",
                                 "create index if not exists idx_Notifications2 on Notifications(UserId)"
@@ -103,9 +112,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationsSummary();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
@@ -220,9 +229,9 @@ namespace Emby.Server.Implementations.Notifications
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -283,9 +292,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -305,9 +314,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index a9141f153..0a598e9a7 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -30,9 +30,17 @@ namespace Emby.Server.Implementations.Security
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
-                                "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)",
+                               "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)",
                                 "create index if not exists idx_AccessTokens on AccessTokens(Id)"
                                };
 
@@ -63,9 +71,9 @@ namespace Emby.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -200,28 +208,31 @@ namespace Emby.Server.Implementations.Security
 
                 var list = new List<AuthenticationInfo>();
 
-                using (var statement = connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
                 {
-                    BindAuthenticationQueryParams(query, statement);
-
-                    foreach (var row in statement.ExecuteQuery())
-                    {
-                        list.Add(Get(row));
-                    }
-
-                    using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
-                        BindAuthenticationQueryParams(query, totalCountStatement);
+                        BindAuthenticationQueryParams(query, statement);
 
-                        var count = totalCountStatement.ExecuteQuery()
-                            .SelectScalarInt()
-                            .First();
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(Get(row));
+                        }
 
-                        return new QueryResult<AuthenticationInfo>()
+                        using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging))
                         {
-                            Items = list.ToArray(),
-                            TotalRecordCount = count
-                        };
+                            BindAuthenticationQueryParams(query, totalCountStatement);
+
+                            var count = totalCountStatement.ExecuteQuery()
+                                .SelectScalarInt()
+                                .First();
+
+                            return new QueryResult<AuthenticationInfo>()
+                            {
+                                Items = list.ToArray(),
+                                TotalRecordCount = count
+                            };
+                        }
                     }
                 }
             }
@@ -234,9 +245,9 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseSelectText + " where Id=@Id";
 
diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs
index 9065ee108..e0ee62780 100644
--- a/Emby.Server.Implementations/Social/SharingRepository.cs
+++ b/Emby.Server.Implementations/Social/SharingRepository.cs
@@ -27,6 +27,14 @@ namespace Emby.Server.Implementations.Social
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists Shares (Id GUID, ItemId TEXT, UserId TEXT, ExpirationDate DateTime, PRIMARY KEY (Id))",
@@ -50,9 +58,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("info.Id");
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -75,9 +83,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = ?";
 
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index 6fb918f15..36558142b 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -43,6 +43,14 @@ namespace Emby.Server.Implementations.Sync
         {
             using (var connection = CreateConnection())
             {
+                connection.ExecuteAll(string.Join(";", new[]
+                {
+                                "pragma default_temp_store = memory",
+                                "pragma default_synchronous=Normal",
+                                "pragma temp_store = memory",
+                                "pragma synchronous=Normal",
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, Bitrate INT, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
@@ -95,9 +103,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -206,9 +214,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     string commandText;
                     var paramList = new List<object>();
@@ -259,9 +267,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -281,9 +289,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobSelectText;
                     var paramList = new List<object>();
@@ -379,11 +387,11 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Read())
-            {
-                var guid = new Guid(id);
+            var guid = new Guid(id);
 
-                using (var connection = CreateConnection(true))
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobItemSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -407,9 +415,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("query");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = baseSelectText;
                     var paramList = new List<object>();
@@ -487,30 +495,30 @@ namespace Emby.Server.Implementations.Sync
 
             var now = DateTime.UtcNow;
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
-                {
-                    var commandText = "select ItemId,Status,Progress from SyncJobItems";
-                    var whereClauses = new List<string>();
+                var commandText = "select ItemId,Status,Progress from SyncJobItems";
+                var whereClauses = new List<string>();
 
-                    if (!string.IsNullOrWhiteSpace(query.TargetId))
-                    {
-                        whereClauses.Add("TargetId=@TargetId");
-                    }
+                if (!string.IsNullOrWhiteSpace(query.TargetId))
+                {
+                    whereClauses.Add("TargetId=@TargetId");
+                }
 
-                    if (query.Statuses.Length > 0)
-                    {
-                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+                if (query.Statuses.Length > 0)
+                {
+                    var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
 
-                        whereClauses.Add(string.Format("Status in ({0})", statuses));
-                    }
+                    whereClauses.Add(string.Format("Status in ({0})", statuses));
+                }
 
-                    if (whereClauses.Count > 0)
-                    {
-                        commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                    }
+                if (whereClauses.Count > 0)
+                {
+                    commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                }
 
+                using (WriteLock.Read())
+                {
                     using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (!string.IsNullOrWhiteSpace(query.TargetId))
@@ -664,9 +672,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     string commandText;
 
-- 
cgit v1.2.3


From f275d7f3d2f40f5e4cbe2f97df6dbd9be8ec37fe Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 21 Nov 2016 03:54:53 -0500
Subject: reduce library queries

---
 .../EnvironmentInfo/EnvironmentInfo.cs             |  5 ++
 Emby.Server.Core/ApplicationHost.cs                |  2 +-
 .../Activity/ActivityRepository.cs                 |  5 +-
 .../Data/BaseSqliteRepository.cs                   | 37 +++++++--
 .../Data/SqliteDisplayPreferencesRepository.cs     |  5 +-
 .../Data/SqliteFileOrganizationRepository.cs       |  5 +-
 .../Data/SqliteItemRepository.cs                   | 96 +++++++++++-----------
 .../Data/SqliteUserDataRepository.cs               |  5 +-
 .../Data/SqliteUserRepository.cs                   |  5 +-
 Emby.Server.Implementations/Dto/DtoService.cs      | 16 +++-
 .../Library/LibraryManager.cs                      | 31 +++----
 .../Library/UserViewManager.cs                     | 30 ++++---
 .../LiveTv/LiveTvManager.cs                        |  2 +-
 .../Notifications/SqliteNotificationsRepository.cs | 11 ++-
 .../Security/AuthenticationRepository.cs           |  5 +-
 .../Social/SharingRepository.cs                    |  5 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs |  5 +-
 Emby.Server.Implementations/TV/TVSeriesManager.cs  |  4 +-
 MediaBrowser.Api/Library/LibraryService.cs         |  2 +-
 MediaBrowser.Api/Movies/MoviesService.cs           | 17 +---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  6 ++
 MediaBrowser.Controller/Entities/BaseItem.cs       | 22 ++++-
 MediaBrowser.Controller/Entities/Folder.cs         | 39 +++++----
 .../Entities/InternalItemsQuery.cs                 |  1 -
 MediaBrowser.Controller/Entities/TV/Episode.cs     |  6 ++
 MediaBrowser.Controller/Entities/TV/Season.cs      |  6 ++
 MediaBrowser.Controller/Entities/TV/Series.cs      |  1 -
 .../Entities/UserViewBuilder.cs                    | 10 +--
 MediaBrowser.Controller/Library/ILibraryManager.cs |  5 +-
 MediaBrowser.Controller/TV/ITVSeriesManager.cs     |  2 +-
 MediaBrowser.Model/System/IEnvironmentInfo.cs      |  1 +
 MediaBrowser.Providers/Manager/MetadataService.cs  | 14 ++--
 32 files changed, 230 insertions(+), 176 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index c040e3931..ebd596dc4 100644
--- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -105,5 +105,10 @@ namespace Emby.Common.Implementations.EnvironmentInfo
         {
             return null;
         }
+
+        public string StackTrace
+        {
+            get { return Environment.StackTrace; }
+        }
     }
 }
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 55a851033..d48138080 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -551,7 +551,7 @@ namespace Emby.Server.Core
             DisplayPreferencesRepository = displayPreferencesRepo;
             RegisterSingleInstance(DisplayPreferencesRepository);
 
-            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager);
+            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo);
             ItemRepository = itemRepo;
             RegisterSingleInstance(ItemRepository);
 
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 8a7573d66..eef9792de 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -29,10 +29,9 @@ namespace Emby.Server.Implementations.Activity
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 382c7f245..d4226ec25 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -40,6 +40,8 @@ namespace Emby.Server.Implementations.Data
 
         private static bool _versionLogged;
 
+        private string _defaultWal;
+
         protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action<SQLiteDatabaseConnection> onConnect = null)
         {
             if (!_versionLogged)
@@ -51,6 +53,15 @@ namespace Emby.Server.Implementations.Data
 
             ConnectionFlags connectionFlags;
 
+            if (isReadOnly)
+            {
+                //Logger.Info("Opening read connection");
+            }
+            else
+            {
+                //Logger.Info("Opening write connection");
+            }
+
             isReadOnly = false;
 
             if (isReadOnly)
@@ -70,12 +81,16 @@ namespace Emby.Server.Implementations.Data
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
+            if (string.IsNullOrWhiteSpace(_defaultWal))
+            {
+                _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First();
+            }
+
             var queries = new List<string>
             {
+                "PRAGMA default_temp_store=memory",
                 "pragma temp_store = memory",
-                "PRAGMA page_size=4096",
-                "PRAGMA journal_mode=WAL",
-                "pragma synchronous=Normal",
+                "PRAGMA journal_mode=WAL"
                 //"PRAGMA cache size=-10000"
             };
 
@@ -90,13 +105,19 @@ namespace Emby.Server.Implementations.Data
             ////    db.Execute(query);
             ////}
 
-            using (WriteLock.Write())
-            {
-                db.ExecuteAll(string.Join(";", queries.ToArray()));
+            //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
+            //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
 
-                if (onConnect != null)
+            //if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase) || onConnect != null)
+            {
+                using (WriteLock.Write())
                 {
-                    onConnect(db);
+                    db.ExecuteAll(string.Join(";", queries.ToArray()));
+
+                    if (onConnect != null)
+                    {
+                        onConnect(db);
+                    }
                 }
             }
 
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index ab927ce86..17afbcfa9 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -56,10 +56,9 @@ namespace Emby.Server.Implementations.Data
             {
                 connection.ExecuteAll(string.Join(";", new[]
                {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
index a71682329..efc0ee2ed 100644
--- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
@@ -33,10 +33,9 @@ namespace Emby.Server.Implementations.Data
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 754af9640..bc1eca06a 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -29,6 +29,7 @@ using MediaBrowser.Server.Implementations.Devices;
 using MediaBrowser.Server.Implementations.Playlists;
 using MediaBrowser.Model.Reflection;
 using SQLitePCL.pretty;
+using MediaBrowser.Model.System;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -66,14 +67,14 @@ namespace Emby.Server.Implementations.Data
 
         private readonly string _criticReviewsPath;
 
-        public const int LatestSchemaVersion = 109;
         private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly IFileSystem _fileSystem;
+        private readonly IEnvironmentInfo _environmentInfo;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo)
             : base(logger)
         {
             if (config == null)
@@ -89,6 +90,7 @@ namespace Emby.Server.Implementations.Data
             _jsonSerializer = jsonSerializer;
             _memoryStreamProvider = memoryStreamProvider;
             _fileSystem = fileSystem;
+            _environmentInfo = environmentInfo;
             _typeMapper = new TypeMapper(assemblyInfo);
 
             _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews");
@@ -129,10 +131,9 @@ namespace Emby.Server.Implementations.Data
 
             _connection.ExecuteAll(string.Join(";", new[]
             {
-                                "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "PRAGMA page_size=4096",
+                                "PRAGMA default_temp_store=memory",
+                                "PRAGMA temp_store=memory"
              }));
 
             var createMediaStreamsTableCommand
@@ -193,7 +194,6 @@ namespace Emby.Server.Implementations.Data
                 AddColumn(db, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames);
                 AddColumn(db, "TypedBaseItems", "ParentId", "GUID", existingColumnNames);
                 AddColumn(db, "TypedBaseItems", "Genres", "Text", existingColumnNames);
-                AddColumn(db, "TypedBaseItems", "SchemaVersion", "INT", existingColumnNames);
                 AddColumn(db, "TypedBaseItems", "SortName", "Text", existingColumnNames);
                 AddColumn(db, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames);
 
@@ -205,7 +205,6 @@ namespace Emby.Server.Implementations.Data
                 AddColumn(db, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames);
 
                 AddColumn(db, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames);
-                AddColumn(db, "TypedBaseItems", "IsOffline", "BIT", existingColumnNames);
                 AddColumn(db, "TypedBaseItems", "LocationType", "Text", existingColumnNames);
 
                 AddColumn(db, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames);
@@ -381,7 +380,6 @@ namespace Emby.Server.Implementations.Data
             "data",
             "StartDate",
             "EndDate",
-            "IsOffline",
             "ChannelId",
             "IsMovie",
             "IsSports",
@@ -529,7 +527,6 @@ namespace Emby.Server.Implementations.Data
                 "ParentId",
                 "Genres",
                 "InheritedParentalRatingValue",
-                "SchemaVersion",
                 "SortName",
                 "RunTimeTicks",
                 "OfficialRatingDescription",
@@ -539,7 +536,6 @@ namespace Emby.Server.Implementations.Data
                 "DateCreated",
                 "DateModified",
                 "ForcedSortName",
-                "IsOffline",
                 "LocationType",
                 "PreferredMetadataLanguage",
                 "PreferredMetadataCountryCode",
@@ -790,7 +786,6 @@ namespace Emby.Server.Implementations.Data
             }
 
             saveItemStatement.TryBind("@InheritedParentalRatingValue", item.GetInheritedParentalRatingValue() ?? 0);
-            saveItemStatement.TryBind("@SchemaVersion", LatestSchemaVersion);
 
             saveItemStatement.TryBind("@SortName", item.SortName);
             saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks);
@@ -803,7 +798,6 @@ namespace Emby.Server.Implementations.Data
             saveItemStatement.TryBind("@DateModified", item.DateModified);
 
             saveItemStatement.TryBind("@ForcedSortName", item.ForcedSortName);
-            saveItemStatement.TryBind("@IsOffline", item.IsOffline);
             saveItemStatement.TryBind("@LocationType", item.LocationType.ToString());
 
             saveItemStatement.TryBind("@PreferredMetadataLanguage", item.PreferredMetadataLanguage);
@@ -1182,7 +1176,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
-
+            //Logger.Info("Retrieving item {0}", id.ToString("N"));
             using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
@@ -1369,64 +1363,72 @@ namespace Emby.Server.Implementations.Data
 
             if (!reader.IsDBNull(4))
             {
-                item.IsOffline = reader.GetBoolean(4);
+                item.ChannelId = reader.GetString(4);
             }
 
-            if (!reader.IsDBNull(5))
-            {
-                item.ChannelId = reader.GetString(5);
-            }
+            var index = 5;
 
             var hasProgramAttributes = item as IHasProgramAttributes;
             if (hasProgramAttributes != null)
             {
-                if (!reader.IsDBNull(6))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsMovie = reader.GetBoolean(6);
+                    hasProgramAttributes.IsMovie = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(7))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsSports = reader.GetBoolean(7);
+                    hasProgramAttributes.IsSports = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(8))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsKids = reader.GetBoolean(8);
+                    hasProgramAttributes.IsKids = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(9))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsSeries = reader.GetBoolean(9);
+                    hasProgramAttributes.IsSeries = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(10))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsLive = reader.GetBoolean(10);
+                    hasProgramAttributes.IsLive = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(11))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsNews = reader.GetBoolean(11);
+                    hasProgramAttributes.IsNews = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(12))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsPremiere = reader.GetBoolean(12);
+                    hasProgramAttributes.IsPremiere = reader.GetBoolean(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(13))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.EpisodeTitle = reader.GetString(13);
+                    hasProgramAttributes.EpisodeTitle = reader.GetString(index);
                 }
+                index++;
 
-                if (!reader.IsDBNull(14))
+                if (!reader.IsDBNull(index))
                 {
-                    hasProgramAttributes.IsRepeat = reader.GetBoolean(14);
+                    hasProgramAttributes.IsRepeat = reader.GetBoolean(index);
                 }
+                index++;
+            }
+            else
+            {
+                index += 9;
             }
-
-            var index = 15;
 
             if (!reader.IsDBNull(index))
             {
@@ -2368,6 +2370,8 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
+            //Logger.Info("GetItemList: " + _environmentInfo.StackTrace);
+
             var now = DateTime.UtcNow;
 
             var list = new List<BaseItem>();
@@ -2533,6 +2537,7 @@ namespace Emby.Server.Implementations.Data
                     TotalRecordCount = returnList.Count
                 };
             }
+            //Logger.Info("GetItems: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2770,6 +2775,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
+            //Logger.Info("GetItemIdsList: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2928,6 +2934,7 @@ namespace Emby.Server.Implementations.Data
                     TotalRecordCount = returnList.Count
                 };
             }
+            //Logger.Info("GetItemIds: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -3053,14 +3060,6 @@ namespace Emby.Server.Implementations.Data
                     statement.TryBind("@IsLocked", query.IsLocked);
                 }
             }
-            if (query.IsOffline.HasValue)
-            {
-                whereClauses.Add("IsOffline=@IsOffline");
-                if (statement != null)
-                {
-                    statement.TryBind("@IsOffline", query.IsOffline);
-                }
-            }
 
             var exclusiveProgramAttribtues = !(query.IsMovie ?? true) ||
                                              !(query.IsSports ?? true) ||
@@ -4721,7 +4720,7 @@ namespace Emby.Server.Implementations.Data
 
             using (var connection = CreateConnection(true))
             {
-                using (WriteLock.Write())
+                using (WriteLock.Read())
                 {
                     foreach (var row in connection.Query(commandText))
                     {
@@ -4750,6 +4749,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
+            //Logger.Info("GetItemValues: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 0b4768c14..9f7cce13b 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -45,10 +45,9 @@ namespace Emby.Server.Implementations.Data
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 0a2f9e7cd..f902d981f 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -52,10 +52,9 @@ namespace Emby.Server.Implementations.Data
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 85549439b..438fc55d7 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -482,7 +482,7 @@ namespace Emby.Server.Implementations.Dto
             {
                 if (dtoOptions.EnableUserData)
                 {
-                    dto.UserData = _userDataRepository.GetUserDataDto(item, user).Result;
+                    dto.UserData = await _userDataRepository.GetUserDataDto(item, user).ConfigureAwait(false);
                 }
             }
 
@@ -1450,11 +1450,19 @@ namespace Emby.Server.Implementations.Dto
 
         private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner)
         {
+            if (!item.SupportsInheritedParentImages)
+            {
+                return;
+            }
+
             var logoLimit = options.GetImageLimit(ImageType.Logo);
             var artLimit = options.GetImageLimit(ImageType.Art);
             var thumbLimit = options.GetImageLimit(ImageType.Thumb);
             var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
 
+            // For now. Emby apps are not using this
+            artLimit = 0;
+
             if (logoLimit == 0 && artLimit == 0 && thumbLimit == 0 && backdropLimit == 0)
             {
                 return;
@@ -1515,6 +1523,12 @@ namespace Emby.Server.Implementations.Dto
                 }
 
                 isFirst = false;
+
+                if (!parent.SupportsInheritedParentImages)
+                {
+                    break;
+                }
+
                 parent = parent.GetParent();
             }
         }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 13c6485e5..283d193dd 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -339,11 +339,6 @@ namespace Emby.Server.Implementations.Library
             {
                 throw new ArgumentNullException("item");
             }
-            RegisterItem(item.Id, item);
-        }
-
-        private void RegisterItem(Guid id, BaseItem item)
-        {
             if (item is IItemByName)
             {
                 if (!(item is MusicArtist))
@@ -354,13 +349,13 @@ namespace Emby.Server.Implementations.Library
 
             if (item.IsFolder)
             {
-                if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
-                {
-                    if (item.SourceType != SourceType.Library)
-                    {
-                        return;
-                    }
-                }
+                //if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
+                //{
+                //    if (item.SourceType != SourceType.Library)
+                //    {
+                //        return;
+                //    }
+                //}
             }
             else
             {
@@ -370,7 +365,7 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; });
+            LibraryItemsCache.AddOrUpdate(item.Id, item, delegate { return item; });
         }
 
         public async Task DeleteItem(BaseItem item, DeleteOptions options)
@@ -822,7 +817,7 @@ namespace Emby.Server.Implementations.Library
 
             return _userRootFolder;
         }
-
+        
         public BaseItem FindByPath(string path, bool? isFolder)
         {
             // If this returns multiple items it could be tricky figuring out which one is correct. 
@@ -836,7 +831,7 @@ namespace Emby.Server.Implementations.Library
                 SortOrder = SortOrder.Descending,
                 Limit = 1
             };
-
+            
             return GetItemList(query)
                 .FirstOrDefault();
         }
@@ -1273,10 +1268,8 @@ namespace Emby.Server.Implementations.Library
             return ItemRepository.GetItemList(query);
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, IEnumerable<string> parentIds)
+        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
         {
-            var parents = parentIds.Select(i => GetItemById(new Guid(i))).Where(i => i != null).ToList();
-
             SetTopParentIdsOrAncestors(query, parents);
 
             if (query.AncestorIds.Length == 0 && query.TopParentIds.Length == 0)
@@ -1536,7 +1529,7 @@ namespace Emby.Server.Implementations.Library
                 }
 
                 // Handle grouping
-                if (user != null && !string.IsNullOrWhiteSpace(view.ViewType) && UserView.IsEligibleForGrouping(view.ViewType))
+                if (user != null && !string.IsNullOrWhiteSpace(view.ViewType) && UserView.IsEligibleForGrouping(view.ViewType) && user.Configuration.GroupedFolders.Length > 0)
                 {
                     return user.RootFolder
                         .GetChildren(user, true)
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index b93f565a3..f7cc8bb73 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -245,20 +245,26 @@ namespace Emby.Server.Implementations.Library
             var includeItemTypes = request.IncludeItemTypes;
             var limit = request.Limit ?? 10;
 
-            var parentIds = string.IsNullOrEmpty(parentId)
-              ? new string[] { }
-              : new[] { parentId };
+            var parents = new List<BaseItem>();
 
-            if (parentIds.Length == 0)
+            if (!string.IsNullOrWhiteSpace(parentId))
             {
-                parentIds = user.RootFolder.GetChildren(user, true)
-                    .OfType<Folder>()
-                    .Select(i => i.Id.ToString("N"))
-                    .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i))
-                    .ToArray();
+                var parent = _libraryManager.GetItemById(parentId) as Folder;
+                if (parent != null)
+                {
+                    parents.Add(parent);
+                }
+            }
+
+            if (parents.Count == 0)
+            {
+                parents = user.RootFolder.GetChildren(user, true)
+                    .Where(i => i is Folder)
+                    .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
+                    .ToList();
             }
 
-            if (parentIds.Length == 0)
+            if (parents.Count == 0)
             {
                 return new List<BaseItem>();
             }
@@ -283,10 +289,10 @@ namespace Emby.Server.Implementations.Library
                 ExcludeItemTypes = excludeItemTypes,
                 ExcludeLocationTypes = new[] { LocationType.Virtual },
                 Limit = limit * 5,
-                SourceTypes = parentIds.Length == 0 ? new[] { SourceType.Library } : new SourceType[] { },
+                SourceTypes = parents.Count == 0 ? new[] { SourceType.Library } : new SourceType[] { },
                 IsPlayed = request.IsPlayed
 
-            }, parentIds);
+            }, parents);
         }
     }
 }
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 3a6f23fe9..faf9687f4 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -491,7 +491,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             var id = _tvDtoService.GetInternalChannelId(serviceName, channelInfo.Id);
 
-            var item = _itemRepo.RetrieveItem(id) as LiveTvChannel;
+            var item = _libraryManager.GetItemById(id) as LiveTvChannel;
 
             if (item == null)
             {
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 5fc691527..66ef5d5d1 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -31,10 +31,9 @@ namespace Emby.Server.Implementations.Notifications
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
@@ -57,9 +56,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationResult();
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                //using (WriteLock.Read())
                 {
                     var clauses = new List<string>();
                     var paramList = new List<object>();
@@ -114,7 +113,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection(true))
             {
-                using (WriteLock.Read())
+                //using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 0a598e9a7..dad05718c 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -32,10 +32,9 @@ namespace Emby.Server.Implementations.Security
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs
index e0ee62780..6dab54bc6 100644
--- a/Emby.Server.Implementations/Social/SharingRepository.cs
+++ b/Emby.Server.Implementations/Social/SharingRepository.cs
@@ -29,10 +29,9 @@ namespace Emby.Server.Implementations.Social
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index 36558142b..308c3bd00 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -45,10 +45,9 @@ namespace Emby.Server.Implementations.Sync
             {
                 connection.ExecuteAll(string.Join(";", new[]
                 {
+                                "PRAGMA page_size=4096",
                                 "pragma default_temp_store = memory",
-                                "pragma default_synchronous=Normal",
-                                "pragma temp_store = memory",
-                                "pragma synchronous=Normal",
+                                "pragma temp_store = memory"
                 }));
 
                 string[] queries = {
diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index a47aaa305..fd576e081 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -72,7 +72,7 @@ namespace Emby.Server.Implementations.TV
             return GetResult(episodes, null, request);
         }
 
-        public QueryResult<BaseItem> GetNextUp(NextUpQuery request, IEnumerable<Folder> parentsFolders)
+        public QueryResult<BaseItem> GetNextUp(NextUpQuery request, List<Folder> parentsFolders)
         {
             var user = _userManager.GetUserById(request.UserId);
 
@@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.TV
                 PresentationUniqueKey = presentationUniqueKey,
                 Limit = limit
 
-            }, parentsFolders.Select(i => i.Id.ToString("N"))).Cast<Series>();
+            }, parentsFolders.Cast<BaseItem>().ToList()).Cast<Series>();
 
             // Avoid implicitly captured closure
             var episodes = GetNextUpEpisodes(request, user, items);
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 36a58cc20..695718a25 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -369,7 +369,7 @@ namespace MediaBrowser.Api.Library
 
             if (item is Movie || (program != null && program.IsMovie) || item is Trailer)
             {
-                return new MoviesService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService, _config, _authContext)
+                return new MoviesService(_userManager, _libraryManager, _dtoService, _config, _authContext)
                 {
                     Request = Request,
 
diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index 1b2fa4fff..b5c6f52fc 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -78,16 +78,8 @@ namespace MediaBrowser.Api.Movies
         /// </summary>
         private readonly IUserManager _userManager;
 
-        /// <summary>
-        /// The _user data repository
-        /// </summary>
-        private readonly IUserDataManager _userDataRepository;
-        /// <summary>
-        /// The _library manager
-        /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        private readonly IItemRepository _itemRepo;
         private readonly IDtoService _dtoService;
         private readonly IServerConfigurationManager _config;
         private readonly IAuthorizationContext _authContext;
@@ -95,17 +87,10 @@ namespace MediaBrowser.Api.Movies
         /// <summary>
         /// Initializes a new instance of the <see cref="MoviesService" /> class.
         /// </summary>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="userDataRepository">The user data repository.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        /// <param name="itemRepo">The item repo.</param>
-        /// <param name="dtoService">The dto service.</param>
-        public MoviesService(IUserManager userManager, IUserDataManager userDataRepository, ILibraryManager libraryManager, IItemRepository itemRepo, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext)
+        public MoviesService(IUserManager userManager, ILibraryManager libraryManager, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext)
         {
             _userManager = userManager;
-            _userDataRepository = userDataRepository;
             _libraryManager = libraryManager;
-            _itemRepo = itemRepo;
             _dtoService = dtoService;
             _config = config;
             _authContext = authContext;
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 539cc5f22..e4f638cb6 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -61,6 +61,12 @@ namespace MediaBrowser.Controller.Entities.Audio
             get { return true; }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsInheritedParentImages
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         protected override bool SupportsOwnedItems
         {
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index cd61d2cce..b7ea7a92d 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1569,6 +1569,12 @@ namespace MediaBrowser.Controller.Entities
             return IsVisibleStandaloneInternal(user, true);
         }
 
+        [IgnoreDataMember]
+        public virtual bool SupportsInheritedParentImages
+        {
+            get { return false; }
+        }
+
         protected bool IsVisibleStandaloneInternal(User user, bool checkFolders)
         {
             if (!IsVisible(user))
@@ -2329,17 +2335,25 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                if (GetParent() is AggregateFolder || this is BasePluginFolder || this is Channel)
+                if (this is BasePluginFolder || this is Channel)
                 {
                     return true;
                 }
 
                 var view = this as UserView;
-                if (view != null && string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+                if (view != null)
                 {
-                    return true;
+                    if (string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                    if (string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
                 }
-                if (view != null && string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+
+                if (GetParent() is AggregateFolder)
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 3df77673f..d4ddab7b2 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1383,6 +1383,15 @@ namespace MediaBrowser.Controller.Entities
                 {
                     return false;
                 }
+                var iItemByName = this as IItemByName;
+                if (iItemByName != null)
+                {
+                    var hasDualAccess = this as IHasDualAccess;
+                    if (hasDualAccess == null || hasDualAccess.IsAccessedByName)
+                    {
+                        return false;
+                    }
+                }
 
                 return true;
             }
@@ -1395,17 +1404,6 @@ namespace MediaBrowser.Controller.Entities
                 return;
             }
 
-            var unplayedQueryResult = await GetItems(new InternalItemsQuery(user)
-            {
-                Recursive = true,
-                IsFolder = false,
-                IsVirtualItem = false,
-                EnableTotalRecordCount = true,
-                Limit = 0,
-                IsPlayed = false
-
-            }).ConfigureAwait(false);
-
             var allItemsQueryResult = await GetItems(new InternalItemsQuery(user)
             {
                 Recursive = true,
@@ -1415,17 +1413,28 @@ namespace MediaBrowser.Controller.Entities
                 Limit = 0
 
             }).ConfigureAwait(false);
+            var recursiveItemCount = allItemsQueryResult.TotalRecordCount;
 
             if (itemDto != null)
             {
                 itemDto.RecursiveItemCount = allItemsQueryResult.TotalRecordCount;
             }
 
-            var recursiveItemCount = allItemsQueryResult.TotalRecordCount;
-            double unplayedCount = unplayedQueryResult.TotalRecordCount;
-
-            if (recursiveItemCount > 0)
+            if (recursiveItemCount > 0 && SupportsPlayedStatus)
             {
+                var unplayedQueryResult = recursiveItemCount > 0 ? await GetItems(new InternalItemsQuery(user)
+                {
+                    Recursive = true,
+                    IsFolder = false,
+                    IsVirtualItem = false,
+                    EnableTotalRecordCount = true,
+                    Limit = 0,
+                    IsPlayed = false
+
+                }).ConfigureAwait(false) : new QueryResult<BaseItem>();
+
+                double unplayedCount = unplayedQueryResult.TotalRecordCount;
+
                 var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100;
                 dto.PlayedPercentage = 100 - unplayedPercentage;
                 dto.Played = dto.PlayedPercentage.Value >= 100;
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 94baacf13..be6e95ddd 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -124,7 +124,6 @@ namespace MediaBrowser.Controller.Entities
         public int? MaxParentalRating { get; set; }
 
         public bool? HasDeadParentId { get; set; }
-        public bool? IsOffline { get; set; }
         public bool? IsVirtualItem { get; set; }
 
         public Guid? ParentId { get; set; }
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 99abf5611..29a63f317 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -71,6 +71,12 @@ namespace MediaBrowser.Controller.Entities.TV
             {
                 return IsStacked || MediaSourceCount > 1;
             }
+        }
+
+        [IgnoreDataMember]
+        public override bool SupportsInheritedParentImages
+        {
+            get { return true; }
         }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index d8a9a16c1..2663a9dd5 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -39,6 +39,12 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsInheritedParentImages
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public override Guid? DisplayParentId
         {
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index a997d3476..69a3a67c8 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -135,7 +135,6 @@ namespace MediaBrowser.Controller.Entities.TV
             {
                 AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(this),
                 IncludeItemTypes = new[] { typeof(Season).Name },
-                SortBy = new[] { ItemSortBy.SortName },
                 IsVirtualItem = false,
                 Limit = 0
             });
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 3820de83d..d5781d21e 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -1812,7 +1812,7 @@ namespace MediaBrowser.Controller.Entities
                 .Where(i => user.IsFolderGrouped(i.Id) && UserView.IsEligibleForGrouping(i));
         }
 
-        private IEnumerable<Folder> GetMediaFolders(User user, IEnumerable<string> viewTypes)
+        private List<Folder> GetMediaFolders(User user, IEnumerable<string> viewTypes)
         {
             if (user == null)
             {
@@ -1822,7 +1822,7 @@ namespace MediaBrowser.Controller.Entities
                         var folder = i as ICollectionFolder;
 
                         return folder != null && viewTypes.Contains(folder.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
-                    });
+                    }).ToList();
             }
             return GetMediaFolders(user)
                 .Where(i =>
@@ -1830,17 +1830,17 @@ namespace MediaBrowser.Controller.Entities
                     var folder = i as ICollectionFolder;
 
                     return folder != null && viewTypes.Contains(folder.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
-                });
+                }).ToList();
         }
 
-        private IEnumerable<Folder> GetMediaFolders(Folder parent, User user, IEnumerable<string> viewTypes)
+        private List<Folder> GetMediaFolders(Folder parent, User user, IEnumerable<string> viewTypes)
         {
             if (parent == null || parent is UserView)
             {
                 return GetMediaFolders(user, viewTypes);
             }
 
-            return new[] { parent };
+            return new List<Folder> { parent };
         }
 
         private IEnumerable<BaseItem> GetRecursiveChildren(Folder parent, User user, IEnumerable<string> viewTypes)
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index acdd9a042..955230b8a 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -538,10 +538,7 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the items.
         /// </summary>
-        /// <param name="query">The query.</param>
-        /// <param name="parentIds">The parent ids.</param>
-        /// <returns>List&lt;BaseItem&gt;.</returns>
-        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, IEnumerable<string> parentIds);
+        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
 
         /// <summary>
         /// Gets the items result.
diff --git a/MediaBrowser.Controller/TV/ITVSeriesManager.cs b/MediaBrowser.Controller/TV/ITVSeriesManager.cs
index 3d6e87474..771fa602a 100644
--- a/MediaBrowser.Controller/TV/ITVSeriesManager.cs
+++ b/MediaBrowser.Controller/TV/ITVSeriesManager.cs
@@ -19,6 +19,6 @@ namespace MediaBrowser.Controller.TV
         /// <param name="request">The request.</param>
         /// <param name="parentsFolders">The parents folders.</param>
         /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
-        QueryResult<BaseItem> GetNextUp(NextUpQuery request, IEnumerable<Folder> parentsFolders);
+        QueryResult<BaseItem> GetNextUp(NextUpQuery request, List<Folder> parentsFolders);
     }
 }
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index 7e7d81e30..f9795a568 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Model.System
         Architecture SystemArchitecture { get; }
         string GetEnvironmentVariable(string name);
         string GetUserId();
+        string StackTrace { get; }
     }
 
     public enum OperatingSystem
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 3046fc395..0491e800f 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -536,7 +536,7 @@ namespace MediaBrowser.Providers.Manager
                         refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport;
 
                         // Only one local provider allowed per item
-                        if (item.IsLocked || IsFullLocalMetadata(localItem.Item))
+                        if (item.IsLocked || localItem.Item.IsLocked || IsFullLocalMetadata(localItem.Item))
                         {
                             hasLocalMetadata = true;
                         }
@@ -573,14 +573,16 @@ namespace MediaBrowser.Providers.Manager
             {
                 if (refreshResult.UpdateType > ItemUpdateType.None)
                 {
-                    // If no local metadata, take data from item itself
-                    if (!hasLocalMetadata)
+                    if (hasLocalMetadata)
+                    {
+                        MergeData(temp, metadata, item.LockedFields, true, true);
+                    }
+                    else
                     {
                         // TODO: If the new metadata from above has some blank data, this can cause old data to get filled into those empty fields
-                        MergeData(metadata, temp, new List<MetadataFields>(), false, true);
+                        MergeData(metadata, temp, new List<MetadataFields>(), false, false);
+                        MergeData(temp, metadata, item.LockedFields, true, false);
                     }
-
-                    MergeData(temp, metadata, item.LockedFields, true, true);
                 }
             }
 
-- 
cgit v1.2.3


From 92cf390fb0d8cb23d56128591e15f496210fcc7e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 21 Nov 2016 15:22:43 -0500
Subject: update user data db

---
 Emby.Server.Core/ApplicationHost.cs                |  2 +-
 .../Data/BaseSqliteRepository.cs                   | 20 +++---
 .../Data/SqliteItemRepository.cs                   | 45 ++++--------
 .../Data/SqliteUserDataRepository.cs               | 81 ++++++++++++++++------
 4 files changed, 85 insertions(+), 63 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index d48138080..7e5d6e31c 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -694,7 +694,7 @@ namespace Emby.Server.Core
 
             displayPreferencesRepo.Initialize();
 
-            var userDataRepo = new SqliteUserDataRepository(LogManager.GetLogger("SqliteUserDataRepository"), ApplicationPaths);
+            var userDataRepo = new SqliteUserDataRepository(LogManager.GetLogger("SqliteUserDataRepository"), ApplicationPaths, FileSystemManager);
 
             ((UserDataManager)UserDataManager).Repository = userDataRepo;
             itemRepo.Initialize(userDataRepo);
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index d4226ec25..5c60a6f86 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.Data
 
         private string _defaultWal;
 
-        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action<SQLiteDatabaseConnection> onConnect = null)
+        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
         {
             if (!_versionLogged)
             {
@@ -88,9 +88,8 @@ namespace Emby.Server.Implementations.Data
 
             var queries = new List<string>
             {
-                "PRAGMA default_temp_store=memory",
-                "pragma temp_store = memory",
-                "PRAGMA journal_mode=WAL"
+                "PRAGMA temp_store = memory",
+                //"PRAGMA journal_mode=WAL"
                 //"PRAGMA cache size=-10000"
             };
 
@@ -108,18 +107,19 @@ namespace Emby.Server.Implementations.Data
             //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
             //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
 
-            //if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase) || onConnect != null)
+            if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase))
             {
+                queries.Add("PRAGMA journal_mode=WAL");
+
                 using (WriteLock.Write())
                 {
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
-
-                    if (onConnect != null)
-                    {
-                        onConnect(db);
-                    }
                 }
             }
+            else
+            {
+                db.ExecuteAll(string.Join(";", queries.ToArray()));
+            }
 
             return db;
         }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index bc1eca06a..5c24c9ac4 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -357,23 +357,6 @@ namespace Emby.Server.Implementations.Data
             //await Vacuum(_connection).ConfigureAwait(false);
         }
 
-
-        private SQLiteDatabaseConnection CreateConnection(bool readOnly, bool attachUserdata)
-        {
-            Action<SQLiteDatabaseConnection> onConnect = null;
-
-            if (attachUserdata)
-            {
-                onConnect =
-                    c => SqliteExtensions.Attach(c, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"),
-                            "UserDataDb");
-            }
-
-            var conn = CreateConnection(readOnly, onConnect);
-
-            return conn;
-        }
-
         private readonly string[] _retriveItemColumns =
         {
             "type",
@@ -2265,13 +2248,13 @@ namespace Emby.Server.Implementations.Data
 
             if (EnableJoinUserData(query))
             {
-                list.Add("UserDataDb.UserData.UserId");
-                list.Add("UserDataDb.UserData.lastPlayedDate");
-                list.Add("UserDataDb.UserData.playbackPositionTicks");
-                list.Add("UserDataDb.UserData.playcount");
-                list.Add("UserDataDb.UserData.isFavorite");
-                list.Add("UserDataDb.UserData.played");
-                list.Add("UserDataDb.UserData.rating");
+                list.Add("UserData.UserId");
+                list.Add("UserData.lastPlayedDate");
+                list.Add("UserData.playbackPositionTicks");
+                list.Add("UserData.playcount");
+                list.Add("UserData.isFavorite");
+                list.Add("UserData.played");
+                list.Add("UserData.rating");
             }
 
             if (query.SimilarTo != null)
@@ -2336,7 +2319,7 @@ namespace Emby.Server.Implementations.Data
                 return string.Empty;
             }
 
-            return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)";
+            return " left join UserData on UserDataKey=UserData.Key And (UserId=@UserId)";
         }
 
         private string GetGroupBy(InternalItemsQuery query)
@@ -2412,7 +2395,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
@@ -2581,7 +2564,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
@@ -2811,7 +2794,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
@@ -2882,7 +2865,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Tuple<Guid, string>>();
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
@@ -2972,7 +2955,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
@@ -4880,7 +4863,7 @@ namespace Emby.Server.Implementations.Data
             var list = new List<Tuple<BaseItem, ItemCounts>>();
             var count = 0;
 
-            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            using (var connection = CreateConnection(true))
             {
                 using (WriteLock.Read())
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index feeb212f1..4c1b8fcd9 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using SQLitePCL.pretty;
 
@@ -14,10 +15,15 @@ namespace Emby.Server.Implementations.Data
 {
     public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
     {
-        public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths)
+        private readonly string _importFile;
+        private readonly IFileSystem _fileSystem;
+
+        public SqliteUserDataRepository(ILogger logger, IApplicationPaths appPaths, IFileSystem fileSystem)
             : base(logger)
         {
-            DbFilePath = Path.Combine(appPaths.DataPath, "userdata_v2.db");
+            _fileSystem = fileSystem;
+            DbFilePath = Path.Combine(appPaths.DataPath, "library.db");
+            _importFile = Path.Combine(appPaths.DataPath, "userdata_v2.db");
         }
 
         /// <summary>
@@ -43,31 +49,23 @@ namespace Emby.Server.Implementations.Data
 
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
-
                 string[] queries = {
 
-                                "PRAGMA locking_mode=NORMAL",
+                                "pragma temp_store = memory",
 
-                                "create table if not exists UserDataDb.userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
+                                "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
 
-                                "drop index if exists UserDataDb.idx_userdata",
-                                "drop index if exists UserDataDb.idx_userdata1",
-                                "drop index if exists UserDataDb.idx_userdata2",
-                                "drop index if exists UserDataDb.userdataindex1",
+                                "create table if not exists DataSettings (IsUserDataImported bit)",
 
-                                "create unique index if not exists UserDataDb.userdataindex on userdata (key, userId)",
-                                "create index if not exists UserDataDb.userdataindex2 on userdata (key, userId, played)",
-                                "create index if not exists UserDataDb.userdataindex3 on userdata (key, userId, playbackPositionTicks)",
-                                "create index if not exists UserDataDb.userdataindex4 on userdata (key, userId, isFavorite)",
+                                "drop index if exists idx_userdata",
+                                "drop index if exists idx_userdata1",
+                                "drop index if exists idx_userdata2",
+                                "drop index if exists userdataindex1",
 
-                                //pragmas
-                                "pragma temp_store = memory",
+                                "create unique index if not exists userdataindex on userdata (key, userId)",
+                                "create index if not exists userdataindex2 on userdata (key, userId, played)",
+                                "create index if not exists userdataindex3 on userdata (key, userId, playbackPositionTicks)",
+                                "create index if not exists userdataindex4 on userdata (key, userId, isFavorite)",
 
                                 "pragma shrink_memory"
                                };
@@ -81,7 +79,48 @@ namespace Emby.Server.Implementations.Data
                     AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames);
                     AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
                 });
+
+                ImportUserDataIfNeeded(connection);
+            }
+        }
+
+        private void ImportUserDataIfNeeded(IDatabaseConnection connection)
+        {
+            if (!_fileSystem.FileExists(_importFile))
+            {
+                return;
+            }
+
+            var fileToImport = _importFile;
+            var isImported = connection.Query("select IsUserDataImported from DataSettings").SelectScalarBool().FirstOrDefault();
+
+            if (isImported)
+            {
+                return;
             }
+
+            ImportUserData(connection, fileToImport);
+
+            connection.RunInTransaction(db =>
+            {
+                using (var statement = db.PrepareStatement("replace into DataSettings (IsUserDataImported) values (@IsUserDataImported)"))
+                {
+                    statement.TryBind("@IsUserDataImported", true);
+                    statement.MoveNext();
+                }
+            });
+        }
+
+        private void ImportUserData(IDatabaseConnection connection, string file)
+        {
+            SqliteExtensions.Attach(connection, file, "UserDataBackup");
+
+            var columns = "key, userId, rating, played, playCount, isFavorite, playbackPositionTicks, lastPlayedDate, AudioStreamIndex, SubtitleStreamIndex";
+
+            connection.RunInTransaction(db =>
+            {
+                db.Execute("REPLACE INTO userdata(" + columns + ") SELECT " + columns + " FROM UserDataBackup.userdata;");
+            });
         }
 
         /// <summary>
-- 
cgit v1.2.3


From 26ef23d628c6f84baca5491203e1fe2a9a82d6b9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 27 Nov 2016 14:36:56 -0500
Subject: update caching headers

---
 .../IO/ManagedFileSystem.cs                        | 30 +++++++++++---
 Emby.Server.Core/ApplicationHost.cs                |  2 +-
 .../Data/BaseSqliteRepository.cs                   | 17 ++++++--
 .../Data/SqliteDisplayPreferencesRepository.cs     | 10 ++---
 .../Data/SqliteItemRepository.cs                   | 46 ++++++++++++++++++++--
 .../Data/SqliteUserDataRepository.cs               |  8 ++++
 .../HttpServer/HttpResultFactory.cs                | 13 ++++--
 Emby.Server.Implementations/Sync/SyncRepository.cs |  8 ++++
 MediaBrowser.Model/IO/IFileSystem.cs               | 13 +-----
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |  1 -
 MediaBrowser.Providers/Manager/MetadataService.cs  | 36 +++++++----------
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   | 22 ++++++-----
 12 files changed, 139 insertions(+), 67 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Common.Implementations/IO/ManagedFileSystem.cs b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
index 4fb70d4e2..b5943e17b 100644
--- a/Emby.Common.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Common.Implementations/IO/ManagedFileSystem.cs
@@ -397,16 +397,34 @@ namespace Emby.Common.Implementations.IO
 
         private FileAccess GetFileAccess(FileAccessMode mode)
         {
-            var val = (int)mode;
-
-            return (FileAccess)val;
+            switch (mode)
+            {
+                case FileAccessMode.ReadWrite:
+                    return FileAccess.ReadWrite;
+                case FileAccessMode.Write:
+                    return FileAccess.Write;
+                case FileAccessMode.Read:
+                    return FileAccess.Read;
+                default:
+                    throw new Exception("Unrecognized FileAccessMode");
+            }
         }
 
         private FileShare GetFileShare(FileShareMode mode)
         {
-            var val = (int)mode;
-
-            return (FileShare)val;
+            switch (mode)
+            {
+                case FileShareMode.ReadWrite:
+                    return FileShare.ReadWrite;
+                case FileShareMode.Write:
+                    return FileShare.Write;
+                case FileShareMode.Read:
+                    return FileShare.Read;
+                case FileShareMode.None:
+                    return FileShare.None;
+                default:
+                    throw new Exception("Unrecognized FileShareMode");
+            }
         }
 
         public void SetHidden(string path, bool isHidden)
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 7e5d6e31c..90848d930 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -551,7 +551,7 @@ namespace Emby.Server.Core
             DisplayPreferencesRepository = displayPreferencesRepo;
             RegisterSingleInstance(DisplayPreferencesRepository);
 
-            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo);
+            var itemRepo = new SqliteItemRepository(ServerConfigurationManager, JsonSerializer, LogManager.GetLogger("SqliteItemRepository"), MemoryStreamFactory, assemblyInfo, FileSystemManager, EnvironmentInfo, TimerFactory);
             ItemRepository = itemRepo;
             RegisterSingleInstance(ItemRepository);
 
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 5c60a6f86..308b8356f 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -88,11 +88,14 @@ namespace Emby.Server.Implementations.Data
 
             var queries = new List<string>
             {
-                "PRAGMA temp_store = memory",
-                //"PRAGMA journal_mode=WAL"
                 //"PRAGMA cache size=-10000"
             };
 
+            if (EnableTempStoreMemory)
+            {
+                queries.Add("PRAGMA temp_store = memory");
+            }
+
             //var cacheSize = CacheSize;
             //if (cacheSize.HasValue)
             //{
@@ -116,7 +119,7 @@ namespace Emby.Server.Implementations.Data
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
                 }
             }
-            else
+            else if (queries.Count > 0)
             {
                 db.ExecuteAll(string.Join(";", queries.ToArray()));
             }
@@ -124,6 +127,14 @@ namespace Emby.Server.Implementations.Data
             return db;
         }
 
+        protected virtual bool EnableTempStoreMemory
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         protected virtual int? CacheSize
         {
             get
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 17afbcfa9..1bd64b21d 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -63,8 +63,8 @@ namespace Emby.Server.Implementations.Data
 
                 string[] queries = {
 
-                               "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
-                                "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
+                    "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
+                    "create unique index if not exists userdisplaypreferencesindex on userdisplaypreferences (id, userId, client)"
                                };
 
                 connection.RunQueries(queries);
@@ -107,10 +107,10 @@ namespace Emby.Server.Implementations.Data
 
         private void SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, IDatabaseConnection connection)
         {
-            using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userid, @client, @data)"))
-            {
-                var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
+            var serialized = _jsonSerializer.SerializeToBytes(displayPreferences, _memoryStreamProvider);
 
+            using (var statement = connection.PrepareStatement("replace into userdisplaypreferences (id, userid, client, data) values (@id, @userId, @client, @data)"))
+            {
                 statement.TryBind("@id", displayPreferences.Id.ToGuidParamValue());
                 statement.TryBind("@userId", userId.ToGuidParamValue());
                 statement.TryBind("@client", client);
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c6e5a6dcf..29aacc059 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -30,6 +30,7 @@ using MediaBrowser.Server.Implementations.Playlists;
 using MediaBrowser.Model.Reflection;
 using SQLitePCL.pretty;
 using MediaBrowser.Model.System;
+using MediaBrowser.Model.Threading;
 
 namespace Emby.Server.Implementations.Data
 {
@@ -68,11 +69,13 @@ namespace Emby.Server.Implementations.Data
         private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly IFileSystem _fileSystem;
         private readonly IEnvironmentInfo _environmentInfo;
+        private readonly ITimerFactory _timerFactory;
+        private ITimer _shrinkMemoryTimer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
-        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo)
+        public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogger logger, IMemoryStreamFactory memoryStreamProvider, IAssemblyInfo assemblyInfo, IFileSystem fileSystem, IEnvironmentInfo environmentInfo, ITimerFactory timerFactory)
             : base(logger)
         {
             if (config == null)
@@ -89,6 +92,7 @@ namespace Emby.Server.Implementations.Data
             _memoryStreamProvider = memoryStreamProvider;
             _fileSystem = fileSystem;
             _environmentInfo = environmentInfo;
+            _timerFactory = timerFactory;
             _typeMapper = new TypeMapper(assemblyInfo);
 
             _criticReviewsPath = Path.Combine(_config.ApplicationPaths.DataPath, "critic-reviews");
@@ -119,6 +123,14 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private SQLiteDatabaseConnection _backgroundConnection;
         protected override void CloseConnection()
         {
@@ -129,6 +141,12 @@ namespace Emby.Server.Implementations.Data
                 _backgroundConnection.Dispose();
                 _backgroundConnection = null;
             }
+
+            if (_shrinkMemoryTimer != null)
+            {
+                _shrinkMemoryTimer.Dispose();
+                _shrinkMemoryTimer = null;
+            }
         }
 
         /// <summary>
@@ -364,13 +382,35 @@ namespace Emby.Server.Implementations.Data
 
                 connection.RunQueries(postQueries);
 
-                //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
                 //await Vacuum(_connection).ConfigureAwait(false);
             }
 
             userDataRepo.Initialize(WriteLock);
 
             _backgroundConnection = CreateConnection(true);
+
+            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
+        }
+
+        private void OnShrinkMemoryTimerCallback(object state)
+        {
+            try
+            {
+                using (WriteLock.Write())
+                {
+                    using (var connection = CreateConnection())
+                    {
+                        connection.RunQueries(new string[]
+                        {
+                            "pragma shrink_memory"
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error running shrink memory", ex);
+            }
         }
 
         private readonly string[] _retriveItemColumns =
@@ -666,7 +706,7 @@ namespace Emby.Server.Implementations.Data
         {
             var requiresReset = false;
 
-            var statements = db.PrepareAll(string.Join(";",  new string[]
+            var statements = db.PrepareAll(string.Join(";", new string[]
             {
                 GetSaveItemCommandText(),
                 "delete from AncestorIds where ItemId=@ItemId",
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 4c1b8fcd9..b01f215e0 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -84,6 +84,14 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private void ImportUserDataIfNeeded(IDatabaseConnection connection)
         {
             if (!_fileSystem.FileExists(_importFile))
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index 313db6a75..995dc7b7b 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -735,7 +735,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// <returns><c>true</c> if [is not modified] [the specified cache key]; otherwise, <c>false</c>.</returns>
         private bool IsNotModified(IRequest requestContext, Guid? cacheKey, DateTime? lastDateModified, TimeSpan? cacheDuration)
         {
-            var isNotModified = true;
+            //var isNotModified = true;
 
             var ifModifiedSinceHeader = requestContext.Headers.Get("If-Modified-Since");
 
@@ -745,18 +745,23 @@ namespace Emby.Server.Implementations.HttpServer
 
                 if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince))
                 {
-                    isNotModified = IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified);
+                    if (IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified))
+                    {
+                        return true;
+                    }
                 }
             }
 
             var ifNoneMatchHeader = requestContext.Headers.Get("If-None-Match");
 
             // Validate If-None-Match
-            if (isNotModified && (cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
+            if ((cacheKey.HasValue || !string.IsNullOrEmpty(ifNoneMatchHeader)))
             {
                 Guid ifNoneMatch;
 
-                if (Guid.TryParse(ifNoneMatchHeader ?? string.Empty, out ifNoneMatch))
+                ifNoneMatchHeader = (ifNoneMatchHeader ?? string.Empty).Trim('\"');
+
+                if (Guid.TryParse(ifNoneMatchHeader, out ifNoneMatch))
                 {
                     if (cacheKey.HasValue && cacheKey.Value == ifNoneMatch)
                     {
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index 8cce7a8bf..b2d9fbcc9 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -83,6 +83,14 @@ namespace Emby.Server.Implementations.Sync
             }
         }
 
+        protected override bool EnableTempStoreMemory
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private const string BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Bitrate, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
         private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex, ItemDateModifiedTicks from SyncJobItems";
 
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 22e1e7758..62bb66ea8 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -369,7 +369,6 @@ namespace MediaBrowser.Model.IO
         Append = 6
     }
 
-    [Flags]
     public enum FileAccessMode
     {
         //
@@ -388,7 +387,6 @@ namespace MediaBrowser.Model.IO
         ReadWrite = 3
     }
 
-    [Flags]
     public enum FileShareMode
     {
         //
@@ -417,16 +415,7 @@ namespace MediaBrowser.Model.IO
         //     or another process) will fail until the file is closed. However, even if this
         //     flag is specified, additional permissions might still be needed to access the
         //     file.
-        ReadWrite = 3,
-        //
-        // Summary:
-        //     Allows subsequent deleting of a file.
-        Delete = 4,
-        //
-        // Summary:
-        //     Makes the file handle inheritable by child processes. This is not directly supported
-        //     by Win32.
-        Inheritable = 16
+        ReadWrite = 3
     }
 
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 8f7e94cf0..c5e140032 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -32,7 +32,6 @@ namespace MediaBrowser.Model.LiveTv
         public LiveTvOptions()
         {
             EnableMovieProviders = true;
-            EnableRecordingSubfolders = true;
             TunerHosts = new List<TunerHostInfo>();
             ListingProviders = new List<ListingsProviderInfo>();
             MediaLocationsCreated = new string[] { };
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 9f8dca434..9c6d6a482 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -78,16 +78,15 @@ namespace MediaBrowser.Providers.Manager
 
             bool hasRefreshedMetadata = true;
             bool hasRefreshedImages = true;
+            var isFirstRefresh = item.DateLastRefreshed == default(DateTime);
 
             // Next run metadata providers
             if (refreshOptions.MetadataRefreshMode != MetadataRefreshMode.None)
             {
-                var providers = GetProviders(item, refreshOptions, requiresRefresh)
+                var providers = GetProviders(item, refreshOptions, isFirstRefresh, requiresRefresh)
                     .ToList();
 
-                var dateLastRefresh = item.DateLastRefreshed;
-
-                if (providers.Count > 0 || dateLastRefresh == default(DateTime))
+                if (providers.Count > 0 || isFirstRefresh)
                 {
                     if (item.BeforeMetadataRefresh())
                     {
@@ -110,11 +109,7 @@ namespace MediaBrowser.Providers.Manager
                     var result = await RefreshWithProviders(metadataResult, id, refreshOptions, providers, itemImageProvider, cancellationToken).ConfigureAwait(false);
 
                     updateType = updateType | result.UpdateType;
-                    if (result.Failures == 0)
-                    {
-                        hasRefreshedMetadata = true;
-                    }
-                    else
+                    if (result.Failures > 0)
                     {
                         hasRefreshedMetadata = false;
                     }
@@ -138,19 +133,13 @@ namespace MediaBrowser.Providers.Manager
                     var result = await itemImageProvider.RefreshImages(itemOfType, libraryOptions, providers, refreshOptions, config, cancellationToken).ConfigureAwait(false);
 
                     updateType = updateType | result.UpdateType;
-                    if (result.Failures == 0)
-                    {
-                        hasRefreshedImages = true;
-                    }
-                    else
+                    if (result.Failures > 0)
                     {
                         hasRefreshedImages = false;
                     }
                 }
             }
 
-            var isFirstRefresh = item.DateLastRefreshed == default(DateTime);
-
             var beforeSaveResult = await BeforeSave(itemOfType, isFirstRefresh || refreshOptions.ReplaceAllMetadata || refreshOptions.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || requiresRefresh, updateType).ConfigureAwait(false);
             updateType = updateType | beforeSaveResult;
 
@@ -373,15 +362,18 @@ namespace MediaBrowser.Providers.Manager
         /// Gets the providers.
         /// </summary>
         /// <returns>IEnumerable{`0}.</returns>
-        protected IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool requiresRefresh)
+        protected IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, MetadataRefreshOptions options, bool isFirstRefresh, bool requiresRefresh)
         {
             // Get providers to refresh
             var providers = ((ProviderManager)ProviderManager).GetMetadataProviders<TItemType>(item).ToList();
 
-            var dateLastRefresh = item.DateLastRefreshed;
+            var metadataRefreshMode = options.MetadataRefreshMode;
 
             // Run all if either of these flags are true
-            var runAllProviders = options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || dateLastRefresh == default(DateTime) || requiresRefresh;
+            var runAllProviders = options.ReplaceAllMetadata ||
+                metadataRefreshMode == MetadataRefreshMode.FullRefresh || 
+                (isFirstRefresh && metadataRefreshMode >= MetadataRefreshMode.Default) ||
+                (requiresRefresh && metadataRefreshMode >= MetadataRefreshMode.Default);
 
             if (!runAllProviders)
             {
@@ -404,6 +396,9 @@ namespace MediaBrowser.Providers.Manager
                 }
                 else
                 {
+                    var anyRemoteProvidersChanged = providersWithChanges.OfType<IRemoteMetadataProvider>()
+                        .Any();
+
                     providers = providers.Where(i =>
                     {
                         // If any provider reports a change, always run local ones as well
@@ -412,9 +407,6 @@ namespace MediaBrowser.Providers.Manager
                             return true;
                         }
 
-                        var anyRemoteProvidersChanged = providersWithChanges.OfType<IRemoteMetadataProvider>()
-                            .Any();
-
                         // If any remote providers changed, run them all so that priorities can be honored
                         if (i is IRemoteMetadataProvider)
                         {
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 84dd095cd..125ac5291 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -911,17 +911,14 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             var image = item.GetImageInfo(ImageType.Primary, 0);
 
-            if (image != null && image.IsLocalFile)
+            if (image != null)
             {
-                writer.WriteElementString("poster", GetPathToSave(image.Path, libraryManager, config));
+                writer.WriteElementString("poster", GetImagePathToSave(image, libraryManager, config));
             }
 
             foreach (var backdrop in item.GetImages(ImageType.Backdrop))
             {
-                if (backdrop.IsLocalFile)
-                {
-                    writer.WriteElementString("fanart", GetPathToSave(backdrop.Path, libraryManager, config));
-                }
+                writer.WriteElementString("fanart", GetImagePathToSave(backdrop, libraryManager, config));
             }
 
             writer.WriteEndElement();
@@ -1012,9 +1009,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
                     var personEntity = libraryManager.GetPerson(person.Name);
                     var image = personEntity.GetImageInfo(ImageType.Primary, 0);
 
-                    if (image != null && image.IsLocalFile)
+                    if (image != null)
                     {
-                        writer.WriteElementString("thumb", GetPathToSave(image.Path, libraryManager, config));
+                        writer.WriteElementString("thumb", GetImagePathToSave(image, libraryManager, config));
                     }
                 }
                 catch (Exception)
@@ -1026,9 +1023,14 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
-        private static string GetPathToSave(string path, ILibraryManager libraryManager, IServerConfigurationManager config)
+        private static string GetImagePathToSave(ItemImageInfo image, ILibraryManager libraryManager, IServerConfigurationManager config)
         {
-            return libraryManager.GetPathAfterNetworkSubstitution(path);
+            if (!image.IsLocalFile)
+            {
+                return image.Path;
+            }
+
+            return libraryManager.GetPathAfterNetworkSubstitution(image.Path);
         }
 
         private static bool IsPersonType(PersonInfo person, string type)
-- 
cgit v1.2.3


From 1c52e4f51b1a9732264203fb0d987cf9752ef45b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Nov 2016 14:26:48 -0500
Subject: update transaction modes

---
 .../Activity/ActivityRepository.cs                     |  2 +-
 .../Data/BaseSqliteRepository.cs                       |  5 +++++
 .../Data/SqliteDisplayPreferencesRepository.cs         |  4 ++--
 .../Data/SqliteFileOrganizationRepository.cs           |  6 +++---
 .../Data/SqliteItemRepository.cs                       |  8 ++++----
 .../Data/SqliteUserDataRepository.cs                   | 10 +++++-----
 .../Data/SqliteUserRepository.cs                       |  4 ++--
 .../Notifications/SqliteNotificationsRepository.cs     |  6 +++---
 .../Security/AuthenticationRepository.cs               | 18 ++++++++++--------
 .../Social/SharingRepository.cs                        |  2 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs     |  8 ++++----
 11 files changed, 40 insertions(+), 33 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index ba81992ac..f7419de80 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Activity
 
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 308b8356f..af8de0e84 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -30,6 +30,11 @@ namespace Emby.Server.Implementations.Data
             get { return false; }
         }
 
+        protected TransactionMode TransactionMode
+        {
+            get { return TransactionMode.Immediate; }
+        }
+
         static BaseSqliteRepository()
         {
             SQLite3.EnableSharedCache = false;
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 1bd64b21d..743186db2 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -100,7 +100,7 @@ namespace Emby.Server.Implementations.Data
                     connection.RunInTransaction(db =>
                     {
                         SaveDisplayPreferences(displayPreferences, userId, client, db);
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -147,7 +147,7 @@ namespace Emby.Server.Implementations.Data
                         {
                             SaveDisplayPreferences(displayPreference, userId, displayPreference.Client, db);
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
index 23bab883e..448d38c8c 100644
--- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
@@ -85,7 +85,7 @@ namespace Emby.Server.Implementations.Data
 
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.Data
                             statement.TryBind("@ResultId", id.ToGuidParamValue());
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -124,7 +124,7 @@ namespace Emby.Server.Implementations.Data
                         var commandText = "delete from FileOrganizerResults";
 
                         db.Execute(commandText);
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 29aacc059..54820ab53 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -316,7 +316,7 @@ namespace Emby.Server.Implementations.Data
                     AddColumn(db, "MediaStreams", "RefFrames", "INT", existingColumnNames);
                     AddColumn(db, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames);
                     AddColumn(db, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames);
-                });
+                }, TransactionMode);
 
                 string[] postQueries =
 
@@ -697,7 +697,7 @@ namespace Emby.Server.Implementations.Data
                     connection.RunInTransaction(db =>
                     {
                         SaveItemsInTranscation(db, tuples);
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -2211,7 +2211,7 @@ namespace Emby.Server.Implementations.Data
                                 index++;
                             }
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -4531,7 +4531,7 @@ namespace Emby.Server.Implementations.Data
 
                         // Delete the item
                         ExecuteWithSingleParam(db, "delete from TypedBaseItems where guid=@Id", id.ToGuidParamValue());
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index b01f215e0..f7184540a 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -78,7 +78,7 @@ namespace Emby.Server.Implementations.Data
 
                     AddColumn(db, "userdata", "AudioStreamIndex", "int", existingColumnNames);
                     AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
-                });
+                }, TransactionMode);
 
                 ImportUserDataIfNeeded(connection);
             }
@@ -116,7 +116,7 @@ namespace Emby.Server.Implementations.Data
                     statement.TryBind("@IsUserDataImported", true);
                     statement.MoveNext();
                 }
-            });
+            }, TransactionMode);
         }
 
         private void ImportUserData(IDatabaseConnection connection, string file)
@@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Data
             connection.RunInTransaction(db =>
             {
                 db.Execute("REPLACE INTO userdata(" + columns + ") SELECT " + columns + " FROM UserDataBackup.userdata;");
-            });
+            }, TransactionMode);
         }
 
         /// <summary>
@@ -197,7 +197,7 @@ namespace Emby.Server.Implementations.Data
                     connection.RunInTransaction(db =>
                     {
                         SaveUserData(db, userId, key, userData);
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -271,7 +271,7 @@ namespace Emby.Server.Implementations.Data
                         {
                             SaveUserData(db, userId, userItemData.Key, userItemData);
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index f902d981f..5fb27d081 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.Data
                             statement.TryBind("@data", serialized);
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -164,7 +164,7 @@ namespace Emby.Server.Implementations.Data
                             statement.TryBind("@id", user.Id.ToGuidParamValue());
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 66ef5d5d1..5f0d4d29a 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -249,7 +249,7 @@ namespace Emby.Server.Implementations.Notifications
 
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -304,7 +304,7 @@ namespace Emby.Server.Implementations.Notifications
 
                             statement.MoveNext();
                         }
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -334,7 +334,7 @@ namespace Emby.Server.Implementations.Notifications
                             }
                         }
 
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 2632b9666..e498253c3 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -50,7 +50,8 @@ namespace Emby.Server.Implementations.Security
                     var existingColumnNames = GetColumnNames(db, "AccessTokens");
 
                     AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames);
-                });
+
+                }, TransactionMode);
             }
         }
 
@@ -70,9 +71,9 @@ namespace Emby.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -100,7 +101,8 @@ namespace Emby.Server.Implementations.Security
 
                             statement.MoveNext();
                         }
-                    });
+
+                    }, TransactionMode);
                 }
             }
         }
@@ -137,9 +139,9 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("query");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseSelectText;
 
@@ -244,9 +246,9 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseSelectText + " where Id=@Id";
 
diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs
index 6dab54bc6..71f80a575 100644
--- a/Emby.Server.Implementations/Social/SharingRepository.cs
+++ b/Emby.Server.Implementations/Social/SharingRepository.cs
@@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Social
                             info.ItemId,
                             info.UserId,
                             info.ExpirationDate.ToDateTimeParamValue());
-                    });
+                    }, TransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index b2d9fbcc9..caf98e666 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Sync
 
                     existingColumnNames = GetColumnNames(db, "SyncJobItems");
                     AddColumn(db, "SyncJobItems", "ItemDateModifiedTicks", "BIGINT", existingColumnNames);
-                });
+                }, TransactionMode);
             }
         }
 
@@ -268,7 +268,7 @@ namespace Emby.Server.Implementations.Sync
                     connection.RunInTransaction(conn =>
                     {
                         conn.Execute(commandText, paramList.ToArray());
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Sync
                     {
                         conn.Execute("delete from SyncJobs where Id=?", id.ToGuidParamValue());
                         conn.Execute("delete from SyncJobItems where JobId=?", id);
-                    });
+                    }, TransactionMode);
                 }
             }
         }
@@ -743,7 +743,7 @@ namespace Emby.Server.Implementations.Sync
                     connection.RunInTransaction(conn =>
                     {
                         conn.Execute(commandText, paramList.ToArray());
-                    });
+                    }, TransactionMode);
                 }
             }
         }
-- 
cgit v1.2.3


From 61e195c096dfc2c5713bbbcbc0be73ddff99cb55 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 29 Nov 2016 14:12:37 -0500
Subject: update repositories

---
 .../Activity/ActivityRepository.cs                 |  20 ++--
 .../Data/BaseSqliteRepository.cs                   |  42 +++++---
 .../Data/SqliteDisplayPreferencesRepository.cs     |   7 +-
 .../Data/SqliteFileOrganizationRepository.cs       |   7 +-
 .../Data/SqliteItemRepository.cs                   |  11 +-
 .../Data/SqliteUserDataRepository.cs               |   2 -
 .../Data/SqliteUserRepository.cs                   |   7 +-
 .../Notifications/SqliteNotificationsRepository.cs |  11 +-
 .../Security/AuthenticationRepository.cs           | 119 ++++++++++-----------
 .../Social/SharingRepository.cs                    |   7 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs |   7 +-
 11 files changed, 101 insertions(+), 139 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index f7419de80..9513c224f 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -27,17 +27,11 @@ namespace Emby.Server.Implementations.Activity
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
-
-                                "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)",
-                                "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)"
+                    "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)",
+                    "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)"
                                };
 
                 connection.RunQueries(queries);
@@ -58,9 +52,9 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException("entry");
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -86,9 +80,9 @@ namespace Emby.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
+                using (WriteLock.Read())
                 {
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index af8de0e84..e066d02d3 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -67,20 +67,8 @@ namespace Emby.Server.Implementations.Data
                 //Logger.Info("Opening write connection");
             }
 
-            isReadOnly = false;
-
-            if (isReadOnly)
-            {
-                connectionFlags = ConnectionFlags.ReadOnly;
-                //connectionFlags = ConnectionFlags.Create;
-                //connectionFlags |= ConnectionFlags.ReadWrite;
-            }
-            else
-            {
-                connectionFlags = ConnectionFlags.Create;
-                connectionFlags |= ConnectionFlags.ReadWrite;
-            }
-
+            connectionFlags = ConnectionFlags.Create;
+            connectionFlags |= ConnectionFlags.ReadWrite;
             connectionFlags |= ConnectionFlags.SharedCached;
             connectionFlags |= ConnectionFlags.NoMutex;
 
@@ -89,6 +77,8 @@ namespace Emby.Server.Implementations.Data
             if (string.IsNullOrWhiteSpace(_defaultWal))
             {
                 _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First();
+
+                Logger.Info("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
             }
 
             var queries = new List<string>
@@ -115,7 +105,7 @@ namespace Emby.Server.Implementations.Data
             //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
             //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
 
-            if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase))
+            /*if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase))
             {
                 queries.Add("PRAGMA journal_mode=WAL");
 
@@ -124,7 +114,7 @@ namespace Emby.Server.Implementations.Data
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
                 }
             }
-            else if (queries.Count > 0)
+            else*/ if (queries.Count > 0)
             {
                 db.ExecuteAll(string.Join(";", queries.ToArray()));
             }
@@ -132,6 +122,26 @@ namespace Emby.Server.Implementations.Data
             return db;
         }
 
+        protected void RunDefaultInitialization(IDatabaseConnection db)
+        {
+            var queries = new List<string>
+            {
+                "PRAGMA journal_mode=WAL",
+                "PRAGMA page_size=4096",
+            };
+
+            if (EnableTempStoreMemory)
+            {
+                queries.AddRange(new List<string>
+                {
+                    "pragma default_temp_store = memory",
+                    "pragma temp_store = memory"
+                });
+            }
+
+            db.ExecuteAll(string.Join(";", queries.ToArray()));
+        }
+
         protected virtual bool EnableTempStoreMemory
         {
             get
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 743186db2..0197efb51 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -54,12 +54,7 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-               {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
index 448d38c8c..603437120 100644
--- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
@@ -31,12 +31,7 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 54820ab53..9c096916f 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -157,12 +157,7 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "PRAGMA default_temp_store=memory",
-                                "PRAGMA temp_store=memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 var createMediaStreamsTableCommand
                    = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
@@ -396,9 +391,9 @@ namespace Emby.Server.Implementations.Data
         {
             try
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
-                    using (var connection = CreateConnection())
+                    using (WriteLock.Write())
                     {
                         connection.RunQueries(new string[]
                         {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index f7184540a..b65e5d1b3 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -51,8 +51,6 @@ namespace Emby.Server.Implementations.Data
             {
                 string[] queries = {
 
-                                "pragma temp_store = memory",
-
                                 "create table if not exists userdata (key nvarchar, userId GUID, rating float null, played bit, playCount int, isFavorite bit, playbackPositionTicks bigint, lastPlayedDate datetime null)",
 
                                 "create table if not exists DataSettings (IsUserDataImported bit)",
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 5fb27d081..99d7563c7 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -50,12 +50,7 @@ namespace Emby.Server.Implementations.Data
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 5f0d4d29a..767ba5504 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -29,12 +29,7 @@ namespace Emby.Server.Implementations.Notifications
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
@@ -58,7 +53,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection(true))
             {
-                //using (WriteLock.Read())
+                using (WriteLock.Read())
                 {
                     var clauses = new List<string>();
                     var paramList = new List<object>();
@@ -113,7 +108,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection(true))
             {
-                //using (WriteLock.Read())
+                using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index e498253c3..dbda4a460 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -30,12 +30,7 @@ namespace Emby.Server.Implementations.Security
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
@@ -139,78 +134,78 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("query");
             }
 
-            using (var connection = CreateConnection(true))
-            {
-                using (WriteLock.Read())
-                {
-                    var commandText = BaseSelectText;
+            var commandText = BaseSelectText;
 
-                    var whereClauses = new List<string>();
+            var whereClauses = new List<string>();
 
-                    var startIndex = query.StartIndex ?? 0;
+            var startIndex = query.StartIndex ?? 0;
 
-                    if (!string.IsNullOrWhiteSpace(query.AccessToken))
-                    {
-                        whereClauses.Add("AccessToken=@AccessToken");
-                    }
+            if (!string.IsNullOrWhiteSpace(query.AccessToken))
+            {
+                whereClauses.Add("AccessToken=@AccessToken");
+            }
 
-                    if (!string.IsNullOrWhiteSpace(query.UserId))
-                    {
-                        whereClauses.Add("UserId=@UserId");
-                    }
+            if (!string.IsNullOrWhiteSpace(query.UserId))
+            {
+                whereClauses.Add("UserId=@UserId");
+            }
 
-                    if (!string.IsNullOrWhiteSpace(query.DeviceId))
-                    {
-                        whereClauses.Add("DeviceId=@DeviceId");
-                    }
+            if (!string.IsNullOrWhiteSpace(query.DeviceId))
+            {
+                whereClauses.Add("DeviceId=@DeviceId");
+            }
 
-                    if (query.IsActive.HasValue)
-                    {
-                        whereClauses.Add("IsActive=@IsActive");
-                    }
+            if (query.IsActive.HasValue)
+            {
+                whereClauses.Add("IsActive=@IsActive");
+            }
 
-                    if (query.HasUser.HasValue)
-                    {
-                        if (query.HasUser.Value)
-                        {
-                            whereClauses.Add("UserId not null");
-                        }
-                        else
-                        {
-                            whereClauses.Add("UserId is null");
-                        }
-                    }
+            if (query.HasUser.HasValue)
+            {
+                if (query.HasUser.Value)
+                {
+                    whereClauses.Add("UserId not null");
+                }
+                else
+                {
+                    whereClauses.Add("UserId is null");
+                }
+            }
 
-                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
+            var whereTextWithoutPaging = whereClauses.Count == 0 ?
+              string.Empty :
+              " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                    if (startIndex > 0)
-                    {
-                        var pagingWhereText = whereClauses.Count == 0 ?
-                            string.Empty :
-                            " where " + string.Join(" AND ", whereClauses.ToArray());
+            if (startIndex > 0)
+            {
+                var pagingWhereText = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
-                            pagingWhereText,
-                            startIndex.ToString(_usCulture)));
-                    }
+                whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
+                    pagingWhereText,
+                    startIndex.ToString(_usCulture)));
+            }
 
-                    var whereText = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
+            var whereText = whereClauses.Count == 0 ?
+                string.Empty :
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                    commandText += whereText;
+            commandText += whereText;
 
-                    commandText += " ORDER BY DateCreated";
+            commandText += " ORDER BY DateCreated";
 
-                    if (query.Limit.HasValue)
-                    {
-                        commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
-                    }
+            if (query.Limit.HasValue)
+            {
+                commandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+            }
 
-                    var list = new List<AuthenticationInfo>();
+            var list = new List<AuthenticationInfo>();
 
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
+                {
                     using (var statement = connection.PrepareStatement(commandText))
                     {
                         BindAuthenticationQueryParams(query, statement);
diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs
index 71f80a575..12d846e81 100644
--- a/Emby.Server.Implementations/Social/SharingRepository.cs
+++ b/Emby.Server.Implementations/Social/SharingRepository.cs
@@ -27,12 +27,7 @@ namespace Emby.Server.Implementations.Social
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index caf98e666..037507872 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -43,12 +43,7 @@ namespace Emby.Server.Implementations.Sync
         {
             using (var connection = CreateConnection())
             {
-                connection.ExecuteAll(string.Join(";", new[]
-                {
-                                "PRAGMA page_size=4096",
-                                "pragma default_temp_store = memory",
-                                "pragma temp_store = memory"
-                }));
+                RunDefaultInitialization(connection);
 
                 string[] queries = {
 
-- 
cgit v1.2.3


From e936f49518bcd6e28d44600d58205fee9c1e21fd Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 9 Dec 2016 20:58:52 -0500
Subject: update use of shellexecute

---
 Emby.Server.Implementations/Data/BaseSqliteRepository.cs             | 2 +-
 Emby.Server.Implementations/Emby.Server.Implementations.csproj       | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs                  | 2 +-
 Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs       | 2 +-
 Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs        | 4 ++--
 Emby.Server.Implementations/packages.config                          | 2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs                   | 4 ++--
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs              | 4 ++--
 MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj             | 4 ++--
 MediaBrowser.Server.Mono/Program.cs                                  | 2 +-
 MediaBrowser.Server.Mono/packages.config                             | 4 ++--
 MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 4 ++--
 MediaBrowser.ServerApplication/packages.config                       | 4 ++--
 13 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index e066d02d3..f132c9765 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Data
             connectionFlags = ConnectionFlags.Create;
             connectionFlags |= ConnectionFlags.ReadWrite;
             connectionFlags |= ConnectionFlags.SharedCached;
-            connectionFlags |= ConnectionFlags.NoMutex;
+            //connectionFlags |= ConnectionFlags.NoMutex;
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index eabf95fce..47f4e7ced 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -318,7 +318,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 4e2b3f661..f5bef058d 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1573,7 +1573,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     ErrorDialog = false,
                     FileName = options.RecordingPostProcessor,
                     IsHidden = true,
-                    UseShellExecute = true
+                    UseShellExecute = false
                 });
 
                 _logger.Info("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 7beaed338..04fc78c95 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -213,7 +213,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 {
                     ScheduleDirect.Station station;
 
-                    if (channelPair.TryGetValue(channelNumber, out station))
+                    if (!string.IsNullOrWhiteSpace(channelNumber) && channelPair.TryGetValue(channelNumber, out station))
                     {
                         return station;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index 19454abbc..8027ce2dd 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -149,8 +149,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
                         }
                     },
-                    RequiresOpening = false,
-                    RequiresClosing = false,
+                    RequiresOpening = true,
+                    RequiresClosing = true,
 
                     ReadAtNativeFramerate = false,
 
diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config
index c65b8734a..225d88dd1 100644
--- a/Emby.Server.Implementations/packages.config
+++ b/Emby.Server.Implementations/packages.config
@@ -3,6 +3,6 @@
   <package id="Emby.XmlTv" version="1.0.2" targetFramework="portable45-net45+win8" />
   <package id="MediaBrowser.Naming" version="1.0.3" targetFramework="portable45-net45+win8" />
   <package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
-  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="portable45-net45+win8" />
+  <package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="portable45-net45+win8" />
   <package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a8ab1a4c0..23e63dad0 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -989,7 +989,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var process = _processFactory.Create(new ProcessOptions
             {
                 CreateNoWindow = true,
-                UseShellExecute = true,
+                UseShellExecute = false,
                 FileName = FFMpegPath,
                 Arguments = args,
                 IsHidden = true,
@@ -1092,7 +1092,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var process = _processFactory.Create(new ProcessOptions
             {
                 CreateNoWindow = true,
-                UseShellExecute = true,
+                UseShellExecute = false,
                 FileName = FFMpegPath,
                 Arguments = args,
                 IsHidden = true,
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 30955c22c..0bbc2d916 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 = true,
+                UseShellExecute = false,
                 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 = true,
+                UseShellExecute = false,
 
                 FileName = _mediaEncoder.EncoderPath,
                 Arguments = processArgs,
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index 13d67ace5..24da2fd59 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -85,11 +85,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 88951c0f6..b3aeb2027 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Mono
             var logger = _logger = logManager.GetLogger("Main");
 
             ApplicationHost.LogEnvironmentInfo(logger, appPaths, true);
-
+            
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
             try
diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config
index e82ef0ed0..465a05c08 100644
--- a/MediaBrowser.Server.Mono/packages.config
+++ b/MediaBrowser.Server.Mono/packages.config
@@ -5,6 +5,6 @@
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net46" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
-  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net46" />
-  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net46" />
+  <package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="net46" />
+  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 9e5de25e4..7badccef3 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -91,11 +91,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
+      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config
index 7385ba374..2cebb9aea 100644
--- a/MediaBrowser.ServerApplication/packages.config
+++ b/MediaBrowser.ServerApplication/packages.config
@@ -5,6 +5,6 @@
   <package id="ServiceStack.Text" version="4.5.4" targetFramework="net462" />
   <package id="SharpCompress" version="0.14.0" targetFramework="net462" />
   <package id="SimpleInjector" version="3.2.4" targetFramework="net462" />
-  <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net462" />
-  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net462" />
+  <package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="net462" />
+  <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1" targetFramework="net462" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From a9a808a9c407a14af9e041cff20e7fe6af3e5061 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 11 Dec 2016 00:12:00 -0500
Subject: fix db locking errors

---
 .../Activity/ActivityRepository.cs                 |   8 +-
 .../Data/BaseSqliteRepository.cs                   | 114 ++++++++++--
 .../Data/SqliteDisplayPreferencesRepository.cs     |  16 +-
 .../Data/SqliteFileOrganizationRepository.cs       |  20 +--
 .../Data/SqliteItemRepository.cs                   | 197 +++++++++++----------
 .../Data/SqliteUserDataRepository.cs               |  16 +-
 .../Data/SqliteUserRepository.cs                   |  12 +-
 .../Notifications/SqliteNotificationsRepository.cs |  36 ++--
 .../Security/AuthenticationRepository.cs           |  12 +-
 .../Social/SharingRepository.cs                    |   8 +-
 Emby.Server.Implementations/Sync/SyncRepository.cs |  74 ++++----
 MediaBrowser.Controller/Entities/TV/Season.cs      |   6 +-
 12 files changed, 306 insertions(+), 213 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 9513c224f..17aef7268 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException("entry");
             }
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -80,9 +80,9 @@ namespace Emby.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index f132c9765..bef2ce149 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -20,27 +20,34 @@ namespace Emby.Server.Implementations.Data
         {
             Logger = logger;
 
-            WriteLock = AllowLockRecursion ?
-              new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion) :
-              new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+            WriteLock = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
         }
 
-        protected virtual bool AllowLockRecursion
+        protected TransactionMode TransactionMode
         {
-            get { return false; }
+            get { return TransactionMode.Immediate; }
         }
 
-        protected TransactionMode TransactionMode
+        protected TransactionMode ReadTransactionMode
         {
-            get { return TransactionMode.Immediate; }
+            get { return TransactionMode.Deferred; }
         }
 
+        internal static int ThreadSafeMode { get; set; }
+
         static BaseSqliteRepository()
         {
             SQLite3.EnableSharedCache = false;
 
             int rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MEMSTATUS, 0);
             //CheckOk(rc);
+
+            rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1);
+            //CheckOk(rc);
+
+            rc = raw.sqlite3_enable_shared_cache(1);
+
+            ThreadSafeMode = raw.sqlite3_threadsafe();
         }
 
         private static bool _versionLogged;
@@ -61,16 +68,19 @@ namespace Emby.Server.Implementations.Data
             if (isReadOnly)
             {
                 //Logger.Info("Opening read connection");
+                //connectionFlags = ConnectionFlags.ReadOnly;
+                connectionFlags = ConnectionFlags.Create;
+                connectionFlags |= ConnectionFlags.ReadWrite;
             }
             else
             {
                 //Logger.Info("Opening write connection");
+                connectionFlags = ConnectionFlags.Create;
+                connectionFlags |= ConnectionFlags.ReadWrite;
             }
 
-            connectionFlags = ConnectionFlags.Create;
-            connectionFlags |= ConnectionFlags.ReadWrite;
-            connectionFlags |= ConnectionFlags.SharedCached;
-            //connectionFlags |= ConnectionFlags.NoMutex;
+            //connectionFlags |= ConnectionFlags.SharedCached;
+            connectionFlags |= ConnectionFlags.NoMutex;
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
@@ -114,7 +124,8 @@ namespace Emby.Server.Implementations.Data
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
                 }
             }
-            else*/ if (queries.Count > 0)
+            else*/
+            if (queries.Count > 0)
             {
                 db.ExecuteAll(string.Join(";", queries.ToArray()));
             }
@@ -122,6 +133,26 @@ namespace Emby.Server.Implementations.Data
             return db;
         }
 
+        public IStatement PrepareStatement(IDatabaseConnection connection, string sql)
+        {
+            return connection.PrepareStatement(sql);
+        }
+
+        public IStatement PrepareStatementSafe(IDatabaseConnection connection, string sql)
+        {
+            return connection.PrepareStatement(sql);
+        }
+
+        public List<IStatement> PrepareAll(IDatabaseConnection connection, string sql)
+        {
+            return connection.PrepareAll(sql).ToList();
+        }
+
+        public List<IStatement> PrepareAllSafe(IDatabaseConnection connection, string sql)
+        {
+            return connection.PrepareAll(sql).ToList();
+        }
+
         protected void RunDefaultInitialization(IDatabaseConnection db)
         {
             var queries = new List<string>
@@ -288,12 +319,69 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        public class DummyToken : IDisposable
+        {
+            public void Dispose()
+            {
+            }
+        }
+
         public static IDisposable Read(this ReaderWriterLockSlim obj)
         {
-            return new ReadLockToken(obj);
+            //if (BaseSqliteRepository.ThreadSafeMode > 0)
+            //{
+            //    return new DummyToken();
+            //}
+            return new WriteLockToken(obj);
         }
         public static IDisposable Write(this ReaderWriterLockSlim obj)
         {
+            //if (BaseSqliteRepository.ThreadSafeMode > 0)
+            //{
+            //    return new DummyToken();
+            //}
+            return new WriteLockToken(obj);
+        }
+    }
+
+    public static class SemaphpreSlimExtensions
+    {
+        private sealed class WriteLockToken : IDisposable
+        {
+            private SemaphoreSlim _sync;
+            public WriteLockToken(SemaphoreSlim sync)
+            {
+                _sync = sync;
+                var task = sync.WaitAsync();
+                Task.WaitAll(task);
+            }
+            public void Dispose()
+            {
+                if (_sync != null)
+                {
+                    _sync.Release();
+                    _sync = null;
+                }
+            }
+        }
+
+        public class DummyToken : IDisposable
+        {
+            public void Dispose()
+            {
+            }
+        }
+
+        public static IDisposable Read(this SemaphoreSlim obj)
+        {
+            return Write(obj);
+        }
+        public static IDisposable Write(this SemaphoreSlim obj)
+        {
+            //if (BaseSqliteRepository.ThreadSafeMode > 0)
+            //{
+            //    return new DummyToken();
+            //}
             return new WriteLockToken(obj);
         }
     }
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 0197efb51..f3d84315e 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -88,9 +88,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -132,9 +132,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -164,9 +164,9 @@ namespace Emby.Server.Implementations.Data
 
             var guidId = displayPreferencesId.GetMD5();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where id = @id and userId=@userId and client=@client"))
                     {
@@ -198,9 +198,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<DisplayPreferences>();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId"))
                     {
diff --git a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
index 603437120..9fbe8669d 100644
--- a/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs
@@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -92,9 +92,9 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -110,9 +110,9 @@ namespace Emby.Server.Implementations.Data
 
         public async Task DeleteAll()
         {
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -131,9 +131,9 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("query");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = "SELECT ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults";
 
@@ -182,9 +182,9 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select ResultId, OriginalPath, TargetPath, FileLength, OrganizationDate, Status, OrganizationType, StatusMessage, ExtractedName, ExtractedYear, ExtractedSeasonNumber, ExtractedEpisodeNumber, ExtractedEndingEpisodeNumber, DuplicatePaths from FileOrganizerResults where ResultId=@ResultId"))
                     {
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 14723c0a7..1d9cec87e 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -99,14 +99,6 @@ namespace Emby.Server.Implementations.Data
             DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
         }
 
-        protected override bool AllowLockRecursion
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         private const string ChaptersTableName = "Chapters2";
 
         protected override int? CacheSize
@@ -387,7 +379,7 @@ namespace Emby.Server.Implementations.Data
 
             userDataRepo.Initialize(WriteLock);
 
-            _backgroundConnection = CreateConnection(true);
+            //_backgroundConnection = CreateConnection(true);
 
             _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
         }
@@ -396,9 +388,9 @@ namespace Emby.Server.Implementations.Data
         {
             try
             {
-                using (var connection = CreateConnection())
+                lock (WriteLock)
                 {
-                    using (WriteLock.Write())
+                    using (var connection = CreateConnection())
                     {
                         connection.RunQueries(new string[]
                         {
@@ -682,19 +674,23 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            var tuples = new List<Tuple<BaseItem, List<Guid>>>();
+            var tuples = new List<Tuple<BaseItem, List<Guid>, BaseItem, string>>();
             foreach (var item in items)
             {
                 var ancestorIds = item.SupportsAncestors ?
                     item.GetAncestorIds().Distinct().ToList() :
                     null;
 
-                tuples.Add(new Tuple<BaseItem, List<Guid>>(item, ancestorIds));
+                var topParent = item.GetTopParent();
+
+                var userdataKey = item.GetUserDataKeys().FirstOrDefault();
+
+                tuples.Add(new Tuple<BaseItem, List<Guid>, BaseItem, string>(item, ancestorIds, topParent, userdataKey));
             }
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -704,11 +700,11 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void SaveItemsInTranscation(IDatabaseConnection db, List<Tuple<BaseItem, List<Guid>>> tuples)
+        private void SaveItemsInTranscation(IDatabaseConnection db, List<Tuple<BaseItem, List<Guid>, BaseItem, string>> tuples)
         {
             var requiresReset = false;
 
-            var statements = db.PrepareAll(string.Join(";", new string[]
+            var statements = PrepareAll(db, string.Join(";", new string[]
             {
                 GetSaveItemCommandText(),
                 "delete from AncestorIds where ItemId=@ItemId",
@@ -729,8 +725,10 @@ namespace Emby.Server.Implementations.Data
                             }
 
                             var item = tuple.Item1;
+                            var topParent = tuple.Item3;
+                            var userDataKey = tuple.Item4;
 
-                            SaveItem(item, saveItemStatement);
+                            SaveItem(item, topParent, userDataKey, saveItemStatement);
                             //Logger.Debug(_saveItemCommand.CommandText);
 
                             if (item.SupportsAncestors)
@@ -747,7 +745,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void SaveItem(BaseItem item, IStatement saveItemStatement)
+        private void SaveItem(BaseItem item, BaseItem topParent, string userDataKey, IStatement saveItemStatement)
         {
             saveItemStatement.TryBind("@guid", item.Id);
             saveItemStatement.TryBind("@type", item.GetType().FullName);
@@ -840,7 +838,7 @@ namespace Emby.Server.Implementations.Data
                 saveItemStatement.TryBindNull("@Genres");
             }
 
-            saveItemStatement.TryBind("@InheritedParentalRatingValue", item.GetInheritedParentalRatingValue() ?? 0);
+            saveItemStatement.TryBind("@InheritedParentalRatingValue", item.InheritedParentalRatingValue);
 
             saveItemStatement.TryBind("@SortName", item.SortName);
             saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks);
@@ -922,7 +920,6 @@ namespace Emby.Server.Implementations.Data
 
             saveItemStatement.TryBind("@UnratedType", item.GetBlockUnratedType().ToString());
 
-            var topParent = item.GetTopParent();
             if (topParent != null)
             {
                 //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id);
@@ -957,7 +954,7 @@ namespace Emby.Server.Implementations.Data
             saveItemStatement.TryBind("@CriticRating", item.CriticRating);
             saveItemStatement.TryBind("@CriticRatingSummary", item.CriticRatingSummary);
 
-            var inheritedTags = item.GetInheritedTags();
+            var inheritedTags = item.InheritedTags;
             if (inheritedTags.Count > 0)
             {
                 saveItemStatement.TryBind("@InheritedTags", string.Join("|", inheritedTags.ToArray()));
@@ -976,7 +973,7 @@ namespace Emby.Server.Implementations.Data
                 saveItemStatement.TryBind("@CleanName", GetCleanValue(item.Name));
             }
 
-            saveItemStatement.TryBind("@PresentationUniqueKey", item.GetPresentationUniqueKey());
+            saveItemStatement.TryBind("@PresentationUniqueKey", item.PresentationUniqueKey);
             saveItemStatement.TryBind("@SlugName", item.SlugName);
             saveItemStatement.TryBind("@OriginalTitle", item.OriginalTitle);
 
@@ -1013,7 +1010,14 @@ namespace Emby.Server.Implementations.Data
                 saveItemStatement.TryBindNull("@SeriesName");
             }
 
-            saveItemStatement.TryBind("@UserDataKey", item.GetUserDataKeys().FirstOrDefault());
+            if (string.IsNullOrWhiteSpace(userDataKey))
+            {
+                saveItemStatement.TryBindNull("@UserDataKey");
+            }
+            else
+            {
+                saveItemStatement.TryBind("@UserDataKey", userDataKey);
+            }
 
             var episode = item as Episode;
             if (episode != null)
@@ -1253,11 +1257,11 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
             //Logger.Info("Retrieving item {0}", id.ToString("N"));
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
+                    using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                     {
                         statement.TryBind("@guid", id);
 
@@ -2079,11 +2083,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<ChapterInfo>();
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
+                    using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                     {
                         statement.TryBind("@ItemId", id);
 
@@ -2113,11 +2117,11 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
+                    using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
                     {
                         statement.TryBind("@ItemId", id);
                         statement.TryBind("@ChapterIndex", index);
@@ -2194,16 +2198,16 @@ namespace Emby.Server.Implementations.Data
 
             var index = 0;
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
                         // First delete chapters
                         db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue());
 
-                        using (var saveChapterStatement = db.PrepareStatement("replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)"))
+                        using (var saveChapterStatement = PrepareStatement(db, "replace into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath, @ImageDateModified)"))
                         {
                             foreach (var chapter in chapters)
                             {
@@ -2488,11 +2492,11 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2513,9 +2517,9 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
                     }
-
-                    LogQueryTime("GetItemList", commandText, now);
                 }
+
+                LogQueryTime("GetItemList", commandText, now);
             }
 
             // Hack for right now since we currently don't support filtering out these duplicates within a query
@@ -2683,11 +2687,11 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray()))
+                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray()))
                         .ToList();
 
                     if (!isReturningZeroItems)
@@ -2902,11 +2906,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2923,11 +2927,11 @@ namespace Emby.Server.Implementations.Data
                             list.Add(row[0].ReadGuid());
                         }
                     }
+                }
 
-                    LogQueryTime("GetItemList", commandText, now);
+                LogQueryTime("GetItemList", commandText, now);
 
-                    return list;
-                }
+                return list;
             }
         }
 
@@ -2973,11 +2977,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Tuple<Guid, string>>();
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2999,11 +3003,11 @@ namespace Emby.Server.Implementations.Data
                             list.Add(new Tuple<Guid, string>(id, path));
                         }
                     }
+                }
 
-                    LogQueryTime("GetItemIdsWithPath", commandText, now);
+                LogQueryTime("GetItemIdsWithPath", commandText, now);
 
-                    return list;
-                }
+                return list;
             }
         }
 
@@ -3087,13 +3091,13 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray()))
-                    .ToList();
-
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
+                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray()))
+                        .ToList();
+
                     var totalRecordCount = 0;
 
                     if (!isReturningZeroItems)
@@ -4457,9 +4461,9 @@ namespace Emby.Server.Implementations.Data
 
             var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags";
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     foreach (var row in connection.Query(commandText))
                     {
@@ -4476,7 +4480,7 @@ namespace Emby.Server.Implementations.Data
                     }
 
                     // write lock here
-                    using (var statement = connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"))
+                    using (var statement = PrepareStatement(connection, "Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"))
                     {
                         foreach (var item in newValues)
                         {
@@ -4531,9 +4535,9 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -4561,7 +4565,7 @@ namespace Emby.Server.Implementations.Data
 
         private void ExecuteWithSingleParam(IDatabaseConnection db, string query, byte[] value)
         {
-            using (var statement = db.PrepareStatement(query))
+            using (var statement = PrepareStatement(db, query))
             {
                 statement.TryBind("@Id", value);
 
@@ -4591,11 +4595,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<string>();
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
                         // Run this again to bind the params
                         GetPeopleWhereClauses(query, statement);
@@ -4605,8 +4609,8 @@ namespace Emby.Server.Implementations.Data
                             list.Add(row.GetString(0));
                         }
                     }
-                    return list;
                 }
+                return list;
             }
         }
 
@@ -4632,11 +4636,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<PersonInfo>();
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
                         // Run this again to bind the params
                         GetPeopleWhereClauses(query, statement);
@@ -4847,15 +4851,18 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " Group By CleanValue";
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    foreach (var row in connection.Query(commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
-                        if (!row.IsDBNull(0))
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            list.Add(row.GetString(0));
+                            if (!row.IsDBNull(0))
+                            {
+                                list.Add(row.GetString(0));
+                            }
                         }
                     }
                 }
@@ -5023,11 +5030,11 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(countText);
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray())).ToList();
+                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())).ToList();
 
                     if (!isReturningZeroItems)
                     {
@@ -5208,7 +5215,7 @@ namespace Emby.Server.Implementations.Data
             // First delete 
             db.Execute("delete from ItemValues where ItemId=@Id", itemId.ToGuidParamValue());
 
-            using (var statement = db.PrepareStatement("insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)"))
+            using (var statement = PrepareStatement(db, "insert into ItemValues (ItemId, Type, Value, CleanValue) values (@ItemId, @Type, @Value, @CleanValue)"))
             {
                 foreach (var pair in values)
                 {
@@ -5246,16 +5253,17 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
-                { // First delete 
+                using (var connection = CreateConnection())
+                {
+                    // First delete 
                     // "delete from People where ItemId=?"
                     connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue());
 
                     var listIndex = 0;
 
-                    using (var statement = connection.PrepareStatement(
+                    using (var statement = PrepareStatement(connection,
                                 "insert into People (ItemId, Name, Role, PersonType, SortOrder, ListOrder) values (@ItemId, @Name, @Role, @PersonType, @SortOrder, @ListOrder)"))
                     {
                         foreach (var person in people)
@@ -5332,11 +5340,11 @@ namespace Emby.Server.Implementations.Data
 
             cmdText += " order by StreamIndex ASC";
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(cmdText))
+                    using (var statement = PrepareStatementSafe(connection, cmdText))
                     {
                         statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
 
@@ -5377,13 +5385,14 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
-                {     // First delete chapters
+                using (var connection = CreateConnection())
+                {
+                    // First delete chapters
                     connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue());
 
-                    using (var statement = connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})",
+                    using (var statement = PrepareStatement(connection, string.Format("replace into mediastreams ({0}) values ({1})",
                                 string.Join(",", _mediaStreamSaveColumns),
                                 string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray()))))
                     {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index b65e5d1b3..8acbd0bb8 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -188,9 +188,9 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -259,9 +259,9 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -296,9 +296,9 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("key");
             }
 
-            using (var connection = CreateConnection(true))
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                     {
@@ -349,9 +349,9 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<UserItemData>();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection())
                 {
                     using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId"))
                     {
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 99d7563c7..b2b917e5e 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -85,9 +85,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -110,9 +110,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     foreach (var row in connection.Query("select guid,data from users"))
                     {
@@ -148,9 +148,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index aae41da19..43e19da65 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -51,24 +51,24 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationResult();
 
-            using (var connection = CreateConnection(true))
-            {
-                using (WriteLock.Read())
-                {
-                    var clauses = new List<string>();
-                    var paramList = new List<object>();
+            var clauses = new List<string>();
+            var paramList = new List<object>();
 
-                    if (query.IsRead.HasValue)
-                    {
-                        clauses.Add("IsRead=?");
-                        paramList.Add(query.IsRead.Value);
-                    }
+            if (query.IsRead.HasValue)
+            {
+                clauses.Add("IsRead=?");
+                paramList.Add(query.IsRead.Value);
+            }
 
-                    clauses.Add("UserId=?");
-                    paramList.Add(query.UserId.ToGuidParamValue());
+            clauses.Add("UserId=?");
+            paramList.Add(query.UserId.ToGuidParamValue());
 
-                    var whereClause = " where " + string.Join(" And ", clauses.ToArray());
+            var whereClause = " where " + string.Join(" And ", clauses.ToArray());
 
+            using (var connection = CreateConnection(true))
+            {
+                lock (WriteLock)
+                {
                     result.TotalRecordCount = connection.Query("select count(Id) from Notifications" + whereClause, paramList.ToArray()).SelectScalarInt().First();
 
                     var commandText = string.Format("select Id,UserId,Date,Name,Description,Url,Level,IsRead,Category,RelatedId from Notifications{0} order by IsRead asc, Date desc", whereClause);
@@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection(true))
             {
-                using (WriteLock.Read())
+                lock (WriteLock)
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
@@ -225,7 +225,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection())
             {
-                using (WriteLock.Write())
+                lock (WriteLock)
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -288,7 +288,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection())
             {
-                using (WriteLock.Write())
+                lock (WriteLock)
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -310,7 +310,7 @@ namespace Emby.Server.Implementations.Notifications
 
             using (var connection = CreateConnection())
             {
-                using (WriteLock.Write())
+                lock (WriteLock)
                 {
                     connection.RunInTransaction(conn =>
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index dbda4a460..dbca4931b 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -66,9 +66,9 @@ namespace Emby.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -202,9 +202,9 @@ namespace Emby.Server.Implementations.Security
 
             var list = new List<AuthenticationInfo>();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement(commandText))
                     {
@@ -241,9 +241,9 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = BaseSelectText + " where Id=@Id";
 
diff --git a/Emby.Server.Implementations/Social/SharingRepository.cs b/Emby.Server.Implementations/Social/SharingRepository.cs
index 12d846e81..e8230947e 100644
--- a/Emby.Server.Implementations/Social/SharingRepository.cs
+++ b/Emby.Server.Implementations/Social/SharingRepository.cs
@@ -52,9 +52,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("info.Id");
             }
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -77,9 +77,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = ?";
 
diff --git a/Emby.Server.Implementations/Sync/SyncRepository.cs b/Emby.Server.Implementations/Sync/SyncRepository.cs
index 037507872..885f8e64a 100644
--- a/Emby.Server.Implementations/Sync/SyncRepository.cs
+++ b/Emby.Server.Implementations/Sync/SyncRepository.cs
@@ -105,9 +105,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("id");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = BaseJobSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -216,9 +216,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     string commandText;
                     var paramList = new List<object>();
@@ -277,9 +277,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -299,9 +299,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = BaseJobSelectText;
                     var paramList = new List<object>();
@@ -399,9 +399,9 @@ namespace Emby.Server.Implementations.Sync
 
             var guid = new Guid(id);
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = BaseJobItemSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -425,9 +425,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("query");
             }
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                using (WriteLock.Read())
+                using (var connection = CreateConnection(true))
                 {
                     var commandText = baseSelectText;
                     var paramList = new List<object>();
@@ -505,41 +505,41 @@ namespace Emby.Server.Implementations.Sync
 
             var now = DateTime.UtcNow;
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                var commandText = "select ItemId,Status,Progress from SyncJobItems";
-                var whereClauses = new List<string>();
-
-                if (!string.IsNullOrWhiteSpace(query.TargetId))
+                using (var connection = CreateConnection(true))
                 {
-                    whereClauses.Add("TargetId=@TargetId");
-                }
+                    var commandText = "select ItemId,Status,Progress from SyncJobItems";
+                    var whereClauses = new List<string>();
 
-                if (query.Statuses.Length > 0)
-                {
-                    var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
+                    if (!string.IsNullOrWhiteSpace(query.TargetId))
+                    {
+                        whereClauses.Add("TargetId=@TargetId");
+                    }
 
-                    whereClauses.Add(string.Format("Status in ({0})", statuses));
-                }
+                    if (query.Statuses.Length > 0)
+                    {
+                        var statuses = string.Join(",", query.Statuses.Select(i => "'" + i.ToString() + "'").ToArray());
 
-                if (whereClauses.Count > 0)
-                {
-                    commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
-                }
+                        whereClauses.Add(string.Format("Status in ({0})", statuses));
+                    }
+
+                    if (whereClauses.Count > 0)
+                    {
+                        commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    }
 
-                var statementTexts = new List<string>
+                    var statementTexts = new List<string>
                 {
                     commandText
                 };
 
-                commandText = commandText
-                    .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs")
-                    .Replace("'Synced'", "'Completed','CompletedWithError'");
+                    commandText = commandText
+                        .Replace("select ItemId,Status,Progress from SyncJobItems", "select ItemIds,Status,Progress from SyncJobs")
+                        .Replace("'Synced'", "'Completed','CompletedWithError'");
 
-                statementTexts.Add(commandText);
+                    statementTexts.Add(commandText);
 
-                using (WriteLock.Read())
-                {
                     var statements = connection.PrepareAll(string.Join(";", statementTexts.ToArray()))
                         .ToList();
 
@@ -692,9 +692,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                using (WriteLock.Write())
+                using (var connection = CreateConnection())
                 {
                     string commandText;
 
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index e0cc496a1..f2a6586e2 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -48,11 +48,7 @@ namespace MediaBrowser.Controller.Entities.TV
         [IgnoreDataMember]
         public override Guid? DisplayParentId
         {
-            get
-            {
-                var series = Series;
-                return series == null ? ParentId : series.Id;
-            }
+            get { return SeriesId; }
         }
 
         [IgnoreDataMember]
-- 
cgit v1.2.3


From 7669e821f19101aa1202c2e0a1e00c7e29f46f4b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 11 Dec 2016 00:17:04 -0500
Subject: update db locks

---
 .../Data/BaseSqliteRepository.cs                   |  2 +-
 .../Data/SqliteItemRepository.cs                   | 40 +++++++++++-----------
 .../Data/SqliteUserDataRepository.cs               |  8 ++---
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index bef2ce149..be5b4d006 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -332,7 +332,7 @@ namespace Emby.Server.Implementations.Data
             //{
             //    return new DummyToken();
             //}
-            return new WriteLockToken(obj);
+            return new ReadLockToken(obj);
         }
         public static IDisposable Write(this ReaderWriterLockSlim obj)
         {
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 1d9cec87e..58fcf62d9 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -388,7 +388,7 @@ namespace Emby.Server.Implementations.Data
         {
             try
             {
-                lock (WriteLock)
+                using (WriteLock.Write())
                 {
                     using (var connection = CreateConnection())
                     {
@@ -688,7 +688,7 @@ namespace Emby.Server.Implementations.Data
                 tuples.Add(new Tuple<BaseItem, List<Guid>, BaseItem, string>(item, ancestorIds, topParent, userdataKey));
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -1257,7 +1257,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
             //Logger.Info("Retrieving item {0}", id.ToString("N"));
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2083,7 +2083,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<ChapterInfo>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2117,7 +2117,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2198,7 +2198,7 @@ namespace Emby.Server.Implementations.Data
 
             var index = 0;
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -2492,7 +2492,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2687,7 +2687,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2906,7 +2906,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2977,7 +2977,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Tuple<Guid, string>>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -3091,7 +3091,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4461,7 +4461,7 @@ namespace Emby.Server.Implementations.Data
 
             var commandText = "select Guid,InheritedTags,(select group_concat(Tags, '|') from TypedBaseItems where (guid=outer.guid) OR (guid in (Select AncestorId from AncestorIds where ItemId=Outer.guid))) as NewInheritedTags from typedbaseitems as Outer where NewInheritedTags <> InheritedTags";
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -4535,7 +4535,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -4595,7 +4595,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<string>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4636,7 +4636,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<PersonInfo>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4851,7 +4851,7 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " Group By CleanValue";
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -5030,7 +5030,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(countText);
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -5253,7 +5253,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -5340,7 +5340,7 @@ namespace Emby.Server.Implementations.Data
 
             cmdText += " order by StreamIndex ASC";
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -5385,7 +5385,7 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 8acbd0bb8..b113582ed 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -259,7 +259,7 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
@@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("key");
             }
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -349,7 +349,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<UserItemData>();
 
-            lock (WriteLock)
+            using (WriteLock.Write())
             {
                 using (var connection = CreateConnection())
                 {
-- 
cgit v1.2.3


From 71919dcc055b8ecb64aa18ff7dbdd1eaa4621649 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 11 Dec 2016 00:27:08 -0500
Subject: update components

---
 .../Data/BaseSqliteRepository.cs                   | 42 ----------------------
 .../Data/SqliteItemRepository.cs                   | 26 +++++++-------
 .../Data/SqliteUserDataRepository.cs               |  4 +--
 3 files changed, 15 insertions(+), 57 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index be5b4d006..8f2bb2cea 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -343,46 +343,4 @@ namespace Emby.Server.Implementations.Data
             return new WriteLockToken(obj);
         }
     }
-
-    public static class SemaphpreSlimExtensions
-    {
-        private sealed class WriteLockToken : IDisposable
-        {
-            private SemaphoreSlim _sync;
-            public WriteLockToken(SemaphoreSlim sync)
-            {
-                _sync = sync;
-                var task = sync.WaitAsync();
-                Task.WaitAll(task);
-            }
-            public void Dispose()
-            {
-                if (_sync != null)
-                {
-                    _sync.Release();
-                    _sync = null;
-                }
-            }
-        }
-
-        public class DummyToken : IDisposable
-        {
-            public void Dispose()
-            {
-            }
-        }
-
-        public static IDisposable Read(this SemaphoreSlim obj)
-        {
-            return Write(obj);
-        }
-        public static IDisposable Write(this SemaphoreSlim obj)
-        {
-            //if (BaseSqliteRepository.ThreadSafeMode > 0)
-            //{
-            //    return new DummyToken();
-            //}
-            return new WriteLockToken(obj);
-        }
-    }
 }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 58fcf62d9..e3dd3f884 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1257,7 +1257,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
             //Logger.Info("Retrieving item {0}", id.ToString("N"));
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2083,7 +2083,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<ChapterInfo>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2117,7 +2117,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2492,7 +2492,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2687,7 +2687,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2906,7 +2906,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -2977,7 +2977,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Tuple<Guid, string>>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -3091,7 +3091,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(commandText);
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4595,7 +4595,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<string>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4636,7 +4636,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<PersonInfo>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -4851,7 +4851,7 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " Group By CleanValue";
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -5030,7 +5030,7 @@ namespace Emby.Server.Implementations.Data
                 statementTexts.Add(countText);
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -5340,7 +5340,7 @@ namespace Emby.Server.Implementations.Data
 
             cmdText += " order by StreamIndex ASC";
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index b113582ed..be59d71b3 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("key");
             }
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
@@ -349,7 +349,7 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<UserItemData>();
 
-            using (WriteLock.Write())
+            using (WriteLock.Read())
             {
                 using (var connection = CreateConnection())
                 {
-- 
cgit v1.2.3


From 1aff48b93b72fe7d418b4798f504bd0d145f44e8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 12 Dec 2016 00:49:19 -0500
Subject: move book support into the core

---
 Emby.Server.Core/ApplicationHost.cs                |   1 +
 .../Activity/ActivityRepository.cs                 |  44 +--
 .../Data/BaseSqliteRepository.cs                   |   2 +-
 .../Data/SqliteItemRepository.cs                   | 306 +++++++++++----------
 .../Data/SqliteUserDataRepository.cs               |  24 +-
 .../Emby.Server.Implementations.csproj             |   1 +
 .../Library/Resolvers/Audio/AudioResolver.cs       |   6 +
 .../Library/Resolvers/Books/BookResolver.cs        |  77 ++++++
 .../Library/UserDataManager.cs                     |   2 +-
 .../Security/AuthenticationRepository.cs           |  44 +--
 Emby.Server.Implementations/TV/TVSeriesManager.cs  |  70 +++--
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |   3 +-
 .../Entities/Audio/AudioPodcast.cs                 |  12 +-
 MediaBrowser.Controller/Entities/AudioBook.cs      |  64 +++++
 MediaBrowser.Controller/Entities/BaseItem.cs       |   9 +
 .../Entities/CollectionFolder.cs                   |   1 +
 MediaBrowser.Controller/Entities/TV/Episode.cs     |   3 +-
 MediaBrowser.Controller/Entities/Video.cs          |   9 +
 .../LiveTv/LiveTvAudioRecording.cs                 |   9 +
 MediaBrowser.Controller/LiveTv/LiveTvChannel.cs    |   9 +
 .../MediaBrowser.Controller.csproj                 |   1 +
 .../Books/AudioBookMetadataService.cs              |  41 +++
 .../Books/AudioPodcastMetadataService.cs           |  41 +++
 .../MediaBrowser.Providers.csproj                  |   2 +
 .../MediaBrowser.WebDashboard.csproj               |   3 -
 25 files changed, 567 insertions(+), 217 deletions(-)
 create mode 100644 Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
 create mode 100644 MediaBrowser.Controller/Entities/AudioBook.cs
 create mode 100644 MediaBrowser.Providers/Books/AudioBookMetadataService.cs
 create mode 100644 MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 2074b5ae4..a6d2d32c0 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -424,6 +424,7 @@ namespace Emby.Server.Core
             ServiceStack.Text.JsConfig<Movie>.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
             ServiceStack.Text.JsConfig<Playlist>.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
             ServiceStack.Text.JsConfig<AudioPodcast>.ExcludePropertyNames = new[] { "Artists", "AlbumArtists", "ChannelMediaSources", "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
+            ServiceStack.Text.JsConfig<AudioBook>.ExcludePropertyNames = new[] { "Artists", "AlbumArtists", "ChannelMediaSources", "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
             ServiceStack.Text.JsConfig<Trailer>.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
             ServiceStack.Text.JsConfig<BoxSet>.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
             ServiceStack.Text.JsConfig<Episode>.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" };
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 17aef7268..fda8b949b 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -84,6 +84,9 @@ namespace Emby.Server.Implementations.Activity
             {
                 using (var connection = CreateConnection(true))
                 {
+                    var list = new List<ActivityLogEntry>();
+                    int totalRecordCount = 0;
+
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
 
@@ -120,32 +123,37 @@ namespace Emby.Server.Implementations.Activity
                         commandText += " LIMIT " + limit.Value.ToString(_usCulture);
                     }
 
-                    var list = new List<ActivityLogEntry>();
+                    var statementTexts = new List<string>();
+                    statementTexts.Add(commandText);
+                    statementTexts.Add("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging);
 
-                    using (var statement = connection.PrepareStatement(commandText))
+                    connection.RunInTransaction(db =>
                     {
-                        if (minDate.HasValue)
-                        {
-                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                        }
+                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
 
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = statements[0])
                         {
-                            list.Add(GetEntry(row));
+                            if (minDate.HasValue)
+                            {
+                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                            }
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetEntry(row));
+                            }
                         }
-                    }
-
-                    int totalRecordCount;
 
-                    using (var statement = connection.PrepareStatement("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging))
-                    {
-                        if (minDate.HasValue)
+                        using (var statement = statements[1])
                         {
-                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                        }
+                            if (minDate.HasValue)
+                            {
+                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                            }
 
-                        totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
-                    }
+                            totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                        }
+                    }, ReadTransactionMode);
 
                     return new QueryResult<ActivityLogEntry>()
                     {
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 8f2bb2cea..9e60a43aa 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Data
                 connectionFlags |= ConnectionFlags.ReadWrite;
             }
 
-            //connectionFlags |= ConnectionFlags.SharedCached;
+            connectionFlags |= ConnectionFlags.SharedCached;
             connectionFlags |= ConnectionFlags.NoMutex;
 
             var db = SQLite3.Open(DbFilePath, connectionFlags, null);
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index e3dd3f884..768f5b5a0 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -123,17 +123,10 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private SQLiteDatabaseConnection _backgroundConnection;
         protected override void CloseConnection()
         {
             base.CloseConnection();
 
-            if (_backgroundConnection != null)
-            {
-                _backgroundConnection.Dispose();
-                _backgroundConnection = null;
-            }
-
             if (_shrinkMemoryTimer != null)
             {
                 _shrinkMemoryTimer.Dispose();
@@ -379,8 +372,6 @@ namespace Emby.Server.Implementations.Data
 
             userDataRepo.Initialize(WriteLock);
 
-            //_backgroundConnection = CreateConnection(true);
-
             _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
         }
 
@@ -1370,6 +1361,10 @@ namespace Emby.Server.Implementations.Data
                 {
                     return false;
                 }
+                if (type == typeof(AudioBook))
+                {
+                    return false;
+                }
                 if (type == typeof(MusicAlbum))
                 {
                     return false;
@@ -2691,51 +2686,55 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray()))
-                        .ToList();
-
-                    if (!isReturningZeroItems)
+                    connection.RunInTransaction(db =>
                     {
-                        using (var statement = statements[0])
+                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                            .ToList();
+
+                        if (!isReturningZeroItems)
                         {
-                            if (EnableJoinUserData(query))
+                            using (var statement = statements[0])
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                if (EnableJoinUserData(query))
+                                {
+                                    statement.TryBind("@UserId", query.User.Id);
+                                }
 
-                            BindSimilarParams(query, statement);
+                                BindSimilarParams(query, statement);
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                                // Running this again will bind the params
+                                GetWhereClauses(query, statement);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                var item = GetItem(row, query);
-                                if (item != null)
+                                foreach (var row in statement.ExecuteQuery())
                                 {
-                                    list.Add(item);
+                                    var item = GetItem(row, query);
+                                    if (item != null)
+                                    {
+                                        list.Add(item);
+                                    }
                                 }
                             }
-                        }
-                    }
 
-                    if (query.EnableTotalRecordCount)
-                    {
-                        using (var statement = statements[statements.Count - 1])
-                        {
-                            if (EnableJoinUserData(query))
+                            if (query.EnableTotalRecordCount)
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                using (var statement = statements[statements.Count - 1])
+                                {
+                                    if (EnableJoinUserData(query))
+                                    {
+                                        statement.TryBind("@UserId", query.User.Id);
+                                    }
 
-                            BindSimilarParams(query, statement);
+                                    BindSimilarParams(query, statement);
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                                    // Running this again will bind the params
+                                    GetWhereClauses(query, statement);
 
-                            totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                                    totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                                }
+                            }
                         }
-                    }
+
+                    }, ReadTransactionMode);
 
                     LogQueryTime("GetItems", commandText, now);
 
@@ -3095,49 +3094,53 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray()))
-                        .ToList();
-
                     var totalRecordCount = 0;
 
-                    if (!isReturningZeroItems)
+                    connection.RunInTransaction(db =>
                     {
-                        using (var statement = statements[0])
+                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                            .ToList();
+
+                        if (!isReturningZeroItems)
                         {
-                            if (EnableJoinUserData(query))
+                            using (var statement = statements[0])
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                if (EnableJoinUserData(query))
+                                {
+                                    statement.TryBind("@UserId", query.User.Id);
+                                }
 
-                            BindSimilarParams(query, statement);
+                                BindSimilarParams(query, statement);
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                                // Running this again will bind the params
+                                GetWhereClauses(query, statement);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(row[0].ReadGuid());
+                                foreach (var row in statement.ExecuteQuery())
+                                {
+                                    list.Add(row[0].ReadGuid());
+                                }
                             }
                         }
-                    }
 
-                    if (query.EnableTotalRecordCount)
-                    {
-                        using (var statement = statements[statements.Count - 1])
+                        if (query.EnableTotalRecordCount)
                         {
-                            if (EnableJoinUserData(query))
+                            using (var statement = statements[statements.Count - 1])
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                if (EnableJoinUserData(query))
+                                {
+                                    statement.TryBind("@UserId", query.User.Id);
+                                }
 
-                            BindSimilarParams(query, statement);
+                                BindSimilarParams(query, statement);
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                                // Running this again will bind the params
+                                GetWhereClauses(query, statement);
 
-                            totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                                totalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                            }
                         }
-                    }
+
+                    }, ReadTransactionMode);
 
                     LogQueryTime("GetItemIds", commandText, now);
 
@@ -4426,6 +4429,7 @@ namespace Emby.Server.Implementations.Data
             typeof(Movie),
             typeof(Playlist),
             typeof(AudioPodcast),
+            typeof(AudioBook),
             typeof(Trailer),
             typeof(BoxSet),
             typeof(Episode),
@@ -4594,21 +4598,23 @@ namespace Emby.Server.Implementations.Data
             commandText += " order by ListOrder";
 
             var list = new List<string>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    connection.RunInTransaction(db =>
                     {
-                        // Run this again to bind the params
-                        GetPeopleWhereClauses(query, statement);
-
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            list.Add(row.GetString(0));
+                            // Run this again to bind the params
+                            GetPeopleWhereClauses(query, statement);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(row.GetString(0));
+                            }
                         }
-                    }
+                    }, ReadTransactionMode);
                 }
                 return list;
             }
@@ -4640,16 +4646,19 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    connection.RunInTransaction(db =>
                     {
-                        // Run this again to bind the params
-                        GetPeopleWhereClauses(query, statement);
-
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            list.Add(GetPerson(row));
+                            // Run this again to bind the params
+                            GetPeopleWhereClauses(query, statement);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetPerson(row));
+                            }
                         }
-                    }
+                    }, ReadTransactionMode);
                 }
             }
 
@@ -4855,16 +4864,19 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    connection.RunInTransaction(db =>
                     {
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            if (!row.IsDBNull(0))
+                            foreach (var row in statement.ExecuteQuery())
                             {
-                                list.Add(row.GetString(0));
+                                if (!row.IsDBNull(0))
+                                {
+                                    list.Add(row.GetString(0));
+                                }
                             }
                         }
-                    }
+                    }, ReadTransactionMode);
                 }
             }
             LogQueryTime("GetItemValueNames", commandText, now);
@@ -5034,69 +5046,72 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var statements = PrepareAllSafe(connection, string.Join(";", statementTexts.ToArray())).ToList();
-
-                    if (!isReturningZeroItems)
+                    connection.RunInTransaction(db =>
                     {
-                        using (var statement = statements[0])
+                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
+
+                        if (!isReturningZeroItems)
                         {
-                            statement.TryBind("@SelectType", returnType);
-                            if (EnableJoinUserData(query))
+                            using (var statement = statements[0])
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                statement.TryBind("@SelectType", returnType);
+                                if (EnableJoinUserData(query))
+                                {
+                                    statement.TryBind("@UserId", query.User.Id);
+                                }
 
-                            if (typeSubQuery != null)
-                            {
-                                GetWhereClauses(typeSubQuery, null, "itemTypes");
-                            }
-                            BindSimilarParams(query, statement);
-                            GetWhereClauses(innerQuery, statement);
-                            GetWhereClauses(outerQuery, statement);
+                                if (typeSubQuery != null)
+                                {
+                                    GetWhereClauses(typeSubQuery, null, "itemTypes");
+                                }
+                                BindSimilarParams(query, statement);
+                                GetWhereClauses(innerQuery, statement);
+                                GetWhereClauses(outerQuery, statement);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                var item = GetItem(row);
-                                if (item != null)
+                                foreach (var row in statement.ExecuteQuery())
                                 {
-                                    var countStartColumn = columns.Count - 1;
+                                    var item = GetItem(row);
+                                    if (item != null)
+                                    {
+                                        var countStartColumn = columns.Count - 1;
 
-                                    list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(row, countStartColumn, typesToCount)));
+                                        list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(row, countStartColumn, typesToCount)));
+                                    }
                                 }
-                            }
 
-                            LogQueryTime("GetItemValues", commandText, now);
+                                LogQueryTime("GetItemValues", commandText, now);
+                            }
                         }
-                    }
 
-                    if (query.EnableTotalRecordCount)
-                    {
-                        commandText = "select count (distinct PresentationUniqueKey)" + GetFromText();
+                        if (query.EnableTotalRecordCount)
+                        {
+                            commandText = "select count (distinct PresentationUniqueKey)" + GetFromText();
 
-                        commandText += GetJoinUserDataText(query);
-                        commandText += whereText;
+                            commandText += GetJoinUserDataText(query);
+                            commandText += whereText;
 
-                        using (var statement = statements[statements.Count - 1])
-                        {
-                            statement.TryBind("@SelectType", returnType);
-                            if (EnableJoinUserData(query))
+                            using (var statement = statements[statements.Count - 1])
                             {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                                statement.TryBind("@SelectType", returnType);
+                                if (EnableJoinUserData(query))
+                                {
+                                    statement.TryBind("@UserId", query.User.Id);
+                                }
 
-                            if (typeSubQuery != null)
-                            {
-                                GetWhereClauses(typeSubQuery, null, "itemTypes");
-                            }
-                            BindSimilarParams(query, statement);
-                            GetWhereClauses(innerQuery, statement);
-                            GetWhereClauses(outerQuery, statement);
+                                if (typeSubQuery != null)
+                                {
+                                    GetWhereClauses(typeSubQuery, null, "itemTypes");
+                                }
+                                BindSimilarParams(query, statement);
+                                GetWhereClauses(innerQuery, statement);
+                                GetWhereClauses(outerQuery, statement);
 
-                            count = statement.ExecuteQuery().SelectScalarInt().First();
+                                count = statement.ExecuteQuery().SelectScalarInt().First();
 
-                            LogQueryTime("GetItemValues", commandText, now);
+                                LogQueryTime("GetItemValues", commandText, now);
+                            }
                         }
-                    }
+                    }, ReadTransactionMode);
                 }
             }
 
@@ -5344,25 +5359,28 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, cmdText))
+                    connection.RunInTransaction(db =>
                     {
-                        statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
-
-                        if (query.Type.HasValue)
+                        using (var statement = PrepareStatementSafe(db, cmdText))
                         {
-                            statement.TryBind("@StreamType", query.Type.Value.ToString());
-                        }
+                            statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
 
-                        if (query.Index.HasValue)
-                        {
-                            statement.TryBind("@StreamIndex", query.Index.Value);
-                        }
+                            if (query.Type.HasValue)
+                            {
+                                statement.TryBind("@StreamType", query.Type.Value.ToString());
+                            }
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            list.Add(GetMediaStream(row));
+                            if (query.Index.HasValue)
+                            {
+                                statement.TryBind("@StreamIndex", query.Index.Value);
+                            }
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetMediaStream(row));
+                            }
                         }
-                    }
+                    }, ReadTransactionMode);
                 }
             }
 
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index be59d71b3..7afb5720e 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -300,20 +300,26 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
-                    {
-                        statement.TryBind("@UserId", userId.ToGuidParamValue());
-                        statement.TryBind("@Key", key);
+                    UserItemData result = null;
 
-                        foreach (var row in statement.ExecuteQuery())
+                    connection.RunInTransaction(db =>
+                    {
+                        using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                         {
-                            return ReadRow(row);
+                            statement.TryBind("@UserId", userId.ToGuidParamValue());
+                            statement.TryBind("@Key", key);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                result = ReadRow(row);
+                                break;
+                            }
                         }
-                    }
+                    }, ReadTransactionMode);
+
+                    return result;
                 }
             }
-
-            return null;
         }
 
         public UserItemData GetUserData(Guid userId, List<string> keys)
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 47f4e7ced..e478b9d81 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -119,6 +119,7 @@
     <Compile Include="Library\Resolvers\Audio\MusicAlbumResolver.cs" />
     <Compile Include="Library\Resolvers\Audio\MusicArtistResolver.cs" />
     <Compile Include="Library\Resolvers\BaseVideoResolver.cs" />
+    <Compile Include="Library\Resolvers\Books\BookResolver.cs" />
     <Compile Include="Library\Resolvers\FolderResolver.cs" />
     <Compile Include="Library\Resolvers\ItemResolver.cs" />
     <Compile Include="Library\Resolvers\Movies\BoxSetResolver.cs" />
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index d8805355a..2e3d81474 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
 using System;
+using MediaBrowser.Controller.Entities;
 
 namespace Emby.Server.Implementations.Library.Resolvers.Audio
 {
@@ -59,6 +60,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     {
                         return new MediaBrowser.Controller.Entities.Audio.Audio();
                     }
+
+                    if (string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return new AudioBook();
+                    }
                 }
             }
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
new file mode 100644
index 000000000..4852c3c6a
--- /dev/null
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -0,0 +1,77 @@
+using System;
+using System.IO;
+using System.Linq;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
+
+namespace Emby.Server.Implementations.Library.Resolvers.Books
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class BookResolver : MediaBrowser.Controller.Resolvers.ItemResolver<Book>
+    {
+        private readonly string[] _validExtensions = {".pdf", ".epub", ".mobi", ".cbr", ".cbz"};
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        protected override Book Resolve(ItemResolveArgs args)
+        {
+            var collectionType = args.GetCollectionType();
+
+            // Only process items that are in a collection folder containing books
+            if (!string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase))
+                return null;
+            
+            if (args.IsDirectory)
+            {
+                return GetBook(args);
+            }
+
+            var extension = Path.GetExtension(args.Path);
+
+            if (extension != null && _validExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
+            {
+                // It's a book
+                return new Book
+                {
+                    Path = args.Path,
+                    IsInMixedFolder = true
+                };
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private Book GetBook(ItemResolveArgs args)
+        {
+            var bookFiles = args.FileSystemChildren.Where(f =>
+            {
+                var fileExtension = Path.GetExtension(f.FullName) ??
+                                    string.Empty;
+
+                return _validExtensions.Contains(fileExtension,
+                                                StringComparer
+                                                    .OrdinalIgnoreCase);
+            }).ToList();
+
+            // Don't return a Book if there is more (or less) than one document in the directory
+            if (bookFiles.Count != 1)
+                return null;
+
+            return new Book
+                       {
+                           Path = bookFiles[0].FullName
+                       };
+        }
+    }
+}
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index c8dde1287..f4a30fc00 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -274,7 +274,7 @@ namespace Emby.Server.Implementations.Library
                 positionTicks = 0;
                 data.Played = false;
             }
-            if (item is Audio)
+            if (!item.SupportsPositionTicksResume)
             {
                 positionTicks = 0;
             }
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index dbca4931b..a136701da 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -201,35 +201,47 @@ namespace Emby.Server.Implementations.Security
             }
 
             var list = new List<AuthenticationInfo>();
+            int totalRecordCount = 0;
 
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = connection.PrepareStatement(commandText))
+                    connection.RunInTransaction(db =>
                     {
-                        BindAuthenticationQueryParams(query, statement);
+                        var statementTexts = new List<string>();
+                        statementTexts.Add(commandText);
+                        statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            list.Add(Get(row));
-                        }
+                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                            .ToList();
 
-                        using (var totalCountStatement = connection.PrepareStatement("select count (Id) from AccessTokens" + whereTextWithoutPaging))
+                        using (var statement = statements[0])
                         {
-                            BindAuthenticationQueryParams(query, totalCountStatement);
+                            BindAuthenticationQueryParams(query, statement);
 
-                            var count = totalCountStatement.ExecuteQuery()
-                                .SelectScalarInt()
-                                .First();
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(Get(row));
+                            }
 
-                            return new QueryResult<AuthenticationInfo>()
+                            using (var totalCountStatement = statements[1])
                             {
-                                Items = list.ToArray(),
-                                TotalRecordCount = count
-                            };
+                                BindAuthenticationQueryParams(query, totalCountStatement);
+
+                                totalRecordCount = totalCountStatement.ExecuteQuery()
+                                    .SelectScalarInt()
+                                    .First();
+                            }
                         }
-                    }
+
+                    }, ReadTransactionMode);
+
+                    return new QueryResult<AuthenticationInfo>()
+                    {
+                        Items = list.ToArray(),
+                        TotalRecordCount = totalRecordCount
+                    };
                 }
             }
         }
diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index 4f876f6a3..88d224525 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -62,7 +62,14 @@ namespace Emby.Server.Implementations.TV
                 PresentationUniqueKey = presentationUniqueKey,
                 Limit = limit,
                 ParentId = parentIdGuid,
-                Recursive = true
+                Recursive = true,
+                DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions
+                {
+                    Fields = new List<ItemFields>
+                    {
+
+                    }
+                }
 
             }).Cast<Series>();
 
@@ -104,7 +111,15 @@ namespace Emby.Server.Implementations.TV
                 IncludeItemTypes = new[] { typeof(Series).Name },
                 SortOrder = SortOrder.Ascending,
                 PresentationUniqueKey = presentationUniqueKey,
-                Limit = limit
+                Limit = limit,
+                DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions
+                {
+                    Fields = new List<ItemFields>
+                    {
+                        
+                    },
+                    EnableImages = false
+                }
 
             }, parentsFolders.Cast<BaseItem>().ToList()).Cast<Series>();
 
@@ -120,26 +135,32 @@ namespace Emby.Server.Implementations.TV
             var currentUser = user;
 
             var allNextUp = series
-                .Select(i => GetNextUp(i, currentUser))
+                .Select(i => GetNextUp(GetUniqueSeriesKey(i), currentUser))
                 // Include if an episode was found, and either the series is not unwatched or the specific series was requested
-                .OrderByDescending(i => i.Item1)
-                .ToList();
+                .OrderByDescending(i => i.Item1);
 
             // If viewing all next up for all series, remove first episodes
-            if (string.IsNullOrWhiteSpace(request.SeriesId))
-            {
-                var withoutFirstEpisode = allNextUp
-                    .Where(i => i.Item1 != DateTime.MinValue)
-                    .ToList();
-
-                // But if that returns empty, keep those first episodes (avoid completely empty view)
-                if (withoutFirstEpisode.Count > 0)
-                {
-                    allNextUp = withoutFirstEpisode;
-                }
-            }
+            // But if that returns empty, keep those first episodes (avoid completely empty view)
+            var alwaysEnableFirstEpisode = string.IsNullOrWhiteSpace(request.SeriesId);
+            var isFirstItemAFirstEpisode = true;
 
             return allNextUp
+                .Where(i =>
+                {
+                    if (alwaysEnableFirstEpisode || i.Item1 != DateTime.MinValue)
+                    {
+                        isFirstItemAFirstEpisode = false;
+                        return true;
+                    }
+
+                    if (isFirstItemAFirstEpisode)
+                    {
+                        return false;
+                    }
+
+                    return true;
+                })
+                .Take(request.Limit.HasValue ? (request.Limit.Value * 2) : int.MaxValue)
                 .Select(i => i.Item2())
                 .Where(i => i != null)
                 .Take(request.Limit ?? int.MaxValue);
@@ -153,13 +174,10 @@ namespace Emby.Server.Implementations.TV
         /// <summary>
         /// Gets the next up.
         /// </summary>
-        /// <param name="series">The series.</param>
-        /// <param name="user">The user.</param>
         /// <returns>Task{Episode}.</returns>
-        private Tuple<DateTime, Func<Episode>> GetNextUp(Series series, User user)
+        private Tuple<DateTime, Func<Episode>> GetNextUp(string seriesKey, User user)
         {
             var enableSeriesPresentationKey = _config.Configuration.EnableSeriesPresentationUniqueKey;
-            var seriesKey = GetUniqueSeriesKey(series);
 
             var lastWatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -170,7 +188,15 @@ namespace Emby.Server.Implementations.TV
                 SortOrder = SortOrder.Descending,
                 IsPlayed = true,
                 Limit = 1,
-                ParentIndexNumberNotEquals = 0
+                ParentIndexNumberNotEquals = 0,
+                DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions
+                {
+                    Fields = new List<ItemFields>
+                    {
+
+                    },
+                    EnableImages = false
+                }
 
             }).FirstOrDefault();
 
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 4121cc295..1ac98d165 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -12,6 +12,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Providers;
@@ -324,7 +325,7 @@ namespace MediaBrowser.Api.UserLibrary
                 var item = i.Item2[0];
                 var childCount = 0;
 
-                if (i.Item1 != null && i.Item2.Count > 1)
+                if (i.Item1 != null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum))
                 {
                     item = i.Item1;
                     childCount = i.Item2.Count;
diff --git a/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs b/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs
index 9072e1094..8c820d367 100644
--- a/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs
+++ b/MediaBrowser.Controller/Entities/Audio/AudioPodcast.cs
@@ -1,6 +1,16 @@
-namespace MediaBrowser.Controller.Entities.Audio
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Controller.Entities.Audio
 {
     public class AudioPodcast : Audio
     {
+        [IgnoreDataMember]
+        public override bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return true;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/AudioBook.cs b/MediaBrowser.Controller/Entities/AudioBook.cs
new file mode 100644
index 000000000..efeb9b497
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/AudioBook.cs
@@ -0,0 +1,64 @@
+using System;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Entities
+{
+    public class AudioBook : Audio.Audio, IHasSeries
+    {
+        [IgnoreDataMember]
+        public override bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        [IgnoreDataMember]
+        public string SeriesPresentationUniqueKey { get; set; }
+        [IgnoreDataMember]
+        public string SeriesName { get; set; }
+        [IgnoreDataMember]
+        public Guid? SeriesId { get; set; }
+        [IgnoreDataMember]
+        public string SeriesSortName { get; set; }
+
+        public string FindSeriesSortName()
+        {
+            return SeriesSortName;
+        }
+        public string FindSeriesName()
+        {
+            return SeriesName;
+        }
+        public string FindSeriesPresentationUniqueKey()
+        {
+            return SeriesPresentationUniqueKey;
+        }
+
+        [IgnoreDataMember]
+        public override bool EnableRefreshOnDateModifiedChange
+        {
+            get { return true; }
+        }
+
+        public Guid? FindSeriesId()
+        {
+            return SeriesId;
+        }
+
+        public override bool CanDownload()
+        {
+            var locationType = LocationType;
+            return locationType != LocationType.Remote &&
+                   locationType != LocationType.Virtual;
+        }
+
+        public override UnratedItem GetBlockUnratedType()
+        {
+            return UnratedItem.Book;
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index b7ea7a92d..9f4503466 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -142,6 +142,15 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public virtual bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         public bool DetectIsInMixedFolder()
         {
             if (SupportsIsInMixedFolderDetection)
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 68dd055f3..ebc55ca8a 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -264,6 +264,7 @@ namespace MediaBrowser.Controller.Entities
         /// Our children are actually just references to the ones in the physical root...
         /// </summary>
         /// <value>The linked children.</value>
+        [IgnoreDataMember]
         public override List<LinkedChild> LinkedChildren
         {
             get { return GetLinkedChildrenInternal(); }
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 737257898..e6ebcb7fd 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -193,9 +193,10 @@ namespace MediaBrowser.Controller.Entities.TV
                 {
                     return "Season " + ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture);
                 }
+                return "Season Unknown";
             }
 
-            return season == null ? SeasonName : season.Name;
+            return season.Name;
         }
 
         public string FindSeriesName()
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 2dd134334..7ba59df4f 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -44,6 +44,15 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         [IgnoreDataMember]
         protected override bool SupportsIsInMixedFolderDetection
         {
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
index 88e5b2802..e67fc5759 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
@@ -46,6 +46,15 @@ namespace MediaBrowser.Controller.LiveTv
             set { }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         /// <summary>
         /// Gets a value indicating whether this instance is owned item.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
index f568ae6ae..d164b5e0d 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -38,6 +38,15 @@ namespace MediaBrowser.Controller.LiveTv
             }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsPositionTicksResume
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         [IgnoreDataMember]
         public override SourceType SourceType
         {
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 2f96088ab..28229f8a7 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -96,6 +96,7 @@
     <Compile Include="Drawing\ImageStream.cs" />
     <Compile Include="Dto\DtoOptions.cs" />
     <Compile Include="Dto\IDtoService.cs" />
+    <Compile Include="Entities\AudioBook.cs" />
     <Compile Include="Entities\Audio\AudioPodcast.cs" />
     <Compile Include="Entities\Audio\IHasAlbumArtist.cs" />
     <Compile Include="Entities\Audio\IHasMusicGenres.cs" />
diff --git a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
new file mode 100644
index 000000000..696619a8c
--- /dev/null
+++ b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
@@ -0,0 +1,41 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Providers.Manager;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.IO;
+
+namespace MediaBrowser.Providers.Books
+{
+    public class AudioBookMetadataService : MetadataService<AudioBook, SongInfo>
+    {
+        protected override void MergeData(MetadataResult<AudioBook> source, MetadataResult<AudioBook> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
+        {
+            ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
+
+            var sourceItem = source.Item;
+            var targetItem = target.Item;
+
+            if (replaceData || targetItem.Artists.Count == 0)
+            {
+                targetItem.Artists = sourceItem.Artists.ToList();
+            }
+
+            if (replaceData || string.IsNullOrEmpty(targetItem.Album))
+            {
+                targetItem.Album = sourceItem.Album;
+            }
+        }
+
+        public AudioBookMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs b/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs
new file mode 100644
index 000000000..86b2cf1b1
--- /dev/null
+++ b/MediaBrowser.Providers/Books/AudioPodcastMetadataService.cs
@@ -0,0 +1,41 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Providers.Manager;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.IO;
+using MediaBrowser.Model.IO;
+
+namespace MediaBrowser.Providers.Books
+{
+    public class AudioPodcastMetadataService : MetadataService<AudioPodcast, SongInfo>
+    {
+        protected override void MergeData(MetadataResult<AudioPodcast> source, MetadataResult<AudioPodcast> target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
+        {
+            ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
+
+            var sourceItem = source.Item;
+            var targetItem = target.Item;
+
+            if (replaceData || targetItem.Artists.Count == 0)
+            {
+                targetItem.Artists = sourceItem.Artists.ToList();
+            }
+
+            if (replaceData || string.IsNullOrEmpty(targetItem.Album))
+            {
+                targetItem.Album = sourceItem.Album;
+            }
+        }
+
+        public AudioPodcastMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IFileSystem fileSystem, IUserDataManager userDataManager, ILibraryManager libraryManager) : base(serverConfigurationManager, logger, providerManager, fileSystem, userDataManager, libraryManager)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index dcb21612f..fe554545f 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -46,6 +46,8 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Books\AudioBookMetadataService.cs" />
+    <Compile Include="Books\AudioPodcastMetadataService.cs" />
     <Compile Include="Books\BookMetadataService.cs" />
     <Compile Include="BoxSets\BoxSetMetadataService.cs" />
     <Compile Include="BoxSets\MovieDbBoxSetImageProvider.cs" />
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 3cf7e54c0..be5db5a0e 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1400,9 +1400,6 @@
     <Content Include="dashboard-ui\css\images\clients\dlna.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\about.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\mediaplayer.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From e1b880a5a072764cabace79cd6d1d65315ec65e4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 13 Dec 2016 02:36:30 -0500
Subject: update series queries

---
 .../Activity/ActivityRepository.cs                 |  15 +-
 .../Data/BaseSqliteRepository.cs                   |   2 +
 .../Data/SqliteItemRepository.cs                   | 261 +++++++++++----------
 .../Data/SqliteUserDataRepository.cs               |  12 +-
 Emby.Server.Implementations/Dto/DtoService.cs      | 105 ++++++---
 .../FileOrganization/EpisodeFileOrganizer.cs       |   6 +
 .../SocketSharp/WebSocketSharpListener.cs          |   3 +-
 .../Library/LibraryManager.cs                      |  58 +++--
 .../Library/UserDataManager.cs                     |   7 +-
 .../Notifications/SqliteNotificationsRepository.cs |  20 +-
 .../Security/AuthenticationRepository.cs           |  12 +-
 MediaBrowser.Api/BaseApiService.cs                 |  32 ++-
 MediaBrowser.Api/ItemLookupService.cs              |  15 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   3 +-
 .../Entities/CollectionFolder.cs                   |  68 ++++--
 MediaBrowser.Controller/Entities/Folder.cs         |  36 +--
 MediaBrowser.Controller/Entities/IHasUserData.cs   |   6 +-
 MediaBrowser.Controller/Library/ILibraryManager.cs |   2 +
 .../Library/IUserDataManager.cs                    |   6 +-
 MediaBrowser.Model/Querying/ItemFields.cs          |   2 +
 RSSDP/SsdpDevicePublisherBase.cs                   |   8 +-
 21 files changed, 418 insertions(+), 261 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 7ac0e680c..5f6518a14 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -84,9 +84,6 @@ namespace Emby.Server.Implementations.Activity
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var list = new List<ActivityLogEntry>();
-                    var result = new QueryResult<ActivityLogEntry>();
-
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();
 
@@ -127,8 +124,11 @@ namespace Emby.Server.Implementations.Activity
                     statementTexts.Add(commandText);
                     statementTexts.Add("select count (Id) from ActivityLogEntries" + whereTextWithoutPaging);
 
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<ActivityLogEntry>();
+                        var result = new QueryResult<ActivityLogEntry>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
 
                         using (var statement = statements[0])
@@ -153,10 +153,11 @@ namespace Emby.Server.Implementations.Activity
 
                             result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
                         }
-                    }, ReadTransactionMode);
 
-                    result.Items = list.ToArray();
-                    return result;
+                        result.Items = list.ToArray();
+                        return result;
+
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 9e60a43aa..2fc721f83 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -43,6 +43,7 @@ namespace Emby.Server.Implementations.Data
             //CheckOk(rc);
 
             rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1);
+            //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SERIALIZED, 1);
             //CheckOk(rc);
 
             rc = raw.sqlite3_enable_shared_cache(1);
@@ -94,6 +95,7 @@ namespace Emby.Server.Implementations.Data
             var queries = new List<string>
             {
                 //"PRAGMA cache size=-10000"
+                //"PRAGMA read_uncommitted = true"
             };
 
             if (EnableTempStoreMemory)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 42cbf1965..803ebeca0 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -328,6 +328,8 @@ namespace Emby.Server.Implementations.Data
                 "drop table if exists Images",
                 "drop index if exists idx_Images",
                 "drop index if exists idx_TypeSeriesPresentationUniqueKey",
+                "drop index if exists idx_SeriesPresentationUniqueKey",
+                "drop index if exists idx_TypeSeriesPresentationUniqueKey2",
 
                 "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
                 "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
@@ -343,8 +345,9 @@ namespace Emby.Server.Implementations.Data
                 // series
                 "create index if not exists idx_TypeSeriesPresentationUniqueKey1 on TypedBaseItems(Type,SeriesPresentationUniqueKey,PresentationUniqueKey,SortName)",
 
-                // series next up
-                "create index if not exists idx_SeriesPresentationUniqueKey on TypedBaseItems(SeriesPresentationUniqueKey)",
+                // series counts
+                // seriesdateplayed sort order
+                "create index if not exists idx_TypeSeriesPresentationUniqueKey3 on TypedBaseItems(SeriesPresentationUniqueKey,Type,IsFolder,IsVirtualItem)",
 
                 // live tv programs
                 "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)",
@@ -2079,25 +2082,29 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("id");
             }
 
-            var list = new List<ChapterInfo>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
+                    return connection.RunInTransaction(db =>
                     {
-                        statement.TryBind("@ItemId", id);
+                        var list = new List<ChapterInfo>();
 
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                         {
-                            list.Add(GetChapter(row));
+                            statement.TryBind("@ItemId", id);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetChapter(row));
+                            }
                         }
-                    }
+
+                        return list;
+
+                    }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         /// <summary>
@@ -2470,32 +2477,33 @@ namespace Emby.Server.Implementations.Data
 
             //commandText += GetGroupBy(query);
 
-            int count = 0;
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        count = statement.ExecuteQuery().SelectScalarInt().First();
-                    }
+                            var count = statement.ExecuteQuery().SelectScalarInt().First();
+                            LogQueryTime("GetCount", commandText, now);
+                            return count;
+                        }
+
+                    }, ReadTransactionMode);
                 }
 
-                LogQueryTime("GetCount", commandText, now);
             }
-
-            return count;
         }
 
         public List<BaseItem> GetItemList(InternalItemsQuery query)
@@ -2511,8 +2519,6 @@ namespace Emby.Server.Implementations.Data
 
             var now = DateTime.UtcNow;
 
-            var list = new List<BaseItem>();
-
             // Hack for right now since we currently don't support filtering out these duplicates within a query
             if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
             {
@@ -2553,53 +2559,59 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        var list = new List<BaseItem>();
+
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            var item = GetItem(row, query);
-                            if (item != null)
+                            foreach (var row in statement.ExecuteQuery())
                             {
-                                list.Add(item);
+                                var item = GetItem(row, query);
+                                if (item != null)
+                                {
+                                    list.Add(item);
+                                }
                             }
                         }
-                    }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
-            }
+                        // Hack for right now since we currently don't support filtering out these duplicates within a query
+                        if (query.EnableGroupByMetadataKey)
+                        {
+                            var limit = query.Limit ?? int.MaxValue;
+                            limit -= 4;
+                            var newList = new List<BaseItem>();
 
-            // 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<BaseItem>();
+                            foreach (var item in list)
+                            {
+                                AddItem(newList, item);
 
-                foreach (var item in list)
-                {
-                    AddItem(newList, item);
+                                if (newList.Count >= limit)
+                                {
+                                    break;
+                                }
+                            }
 
-                    if (newList.Count >= limit)
-                    {
-                        break;
-                    }
-                }
+                            list = newList;
+                        }
 
-                list = newList;
-            }
+                        LogQueryTime("GetItemList", commandText, now);
 
-            return list;
+                        return list;
+
+                    }, ReadTransactionMode);
+                }
+            }
         }
 
         private void AddItem(List<BaseItem> items, BaseItem newItem)
@@ -2637,7 +2649,7 @@ namespace Emby.Server.Implementations.Data
             var slowThreshold = 1000;
 
 #if DEBUG
-            slowThreshold = 50;
+            slowThreshold = 2;
 #endif
 
             if (elapsed >= slowThreshold)
@@ -2718,7 +2730,6 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            var result = new QueryResult<BaseItem>();
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
             var statementTexts = new List<string>();
@@ -2748,8 +2759,9 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<BaseItem>();
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
                             .ToList();
 
@@ -2796,12 +2808,12 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        LogQueryTime("GetItems", commandText, now);
 
-                    LogQueryTime("GetItems", commandText, now);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
@@ -2962,34 +2974,38 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            var list = new List<Guid>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    return connection.RunInTransaction(db =>
                     {
-                        if (EnableJoinUserData(query))
+                        var list = new List<Guid>();
+
+                        using (var statement = PrepareStatementSafe(db, commandText))
                         {
-                            statement.TryBind("@UserId", query.User.Id);
-                        }
+                            if (EnableJoinUserData(query))
+                            {
+                                statement.TryBind("@UserId", query.User.Id);
+                            }
 
-                        BindSimilarParams(query, statement);
+                            BindSimilarParams(query, statement);
 
-                        // Running this again will bind the params
-                        GetWhereClauses(query, statement);
+                            // Running this again will bind the params
+                            GetWhereClauses(query, statement);
 
-                        foreach (var row in statement.ExecuteQuery())
-                        {
-                            list.Add(row[0].ReadGuid());
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(row[0].ReadGuid());
+                            }
                         }
-                    }
-                }
 
-                LogQueryTime("GetItemList", commandText, now);
+                        LogQueryTime("GetItemList", commandText, now);
 
-                return list;
+                        return list;
+
+                    }, ReadTransactionMode);
+                }
             }
         }
 
@@ -3153,10 +3169,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var result = new QueryResult<Guid>();
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<Guid>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
                             .ToList();
 
@@ -3199,12 +3215,12 @@ namespace Emby.Server.Implementations.Data
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        LogQueryTime("GetItemIds", commandText, now);
 
-                    LogQueryTime("GetItemIds", commandText, now);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
@@ -4653,13 +4669,13 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " order by ListOrder";
 
-            var list = new List<string>();
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<string>();
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             // Run this again to bind the params
@@ -4670,9 +4686,9 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(row.GetString(0));
                             }
                         }
+                        return list;
                     }, ReadTransactionMode);
                 }
-                return list;
             }
         }
 
@@ -4696,14 +4712,14 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " order by ListOrder";
 
-            var list = new List<PersonInfo>();
-
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<PersonInfo>();
+
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             // Run this again to bind the params
@@ -4714,11 +4730,11 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(GetPerson(row));
                             }
                         }
+
+                        return list;
                     }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         private List<string> GetPeopleWhereClauses(InternalPeopleQuery query, IStatement statement)
@@ -4899,8 +4915,6 @@ namespace Emby.Server.Implementations.Data
                 ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) :
                 ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")");
 
-            var list = new List<string>();
-
             var commandText = "Select Value From ItemValues where " + typeClause;
 
             if (withItemTypes.Count > 0)
@@ -4920,8 +4934,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<string>();
+
                         using (var statement = PrepareStatementSafe(db, commandText))
                         {
                             foreach (var row in statement.ExecuteQuery())
@@ -4932,12 +4948,13 @@ namespace Emby.Server.Implementations.Data
                                 }
                             }
                         }
+
+                        LogQueryTime("GetItemValueNames", commandText, now);
+
+                        return list;
                     }, ReadTransactionMode);
                 }
             }
-            LogQueryTime("GetItemValueNames", commandText, now);
-
-            return list;
         }
 
         private QueryResult<Tuple<BaseItem, ItemCounts>> GetItemValues(InternalItemsQuery query, int[] itemValueTypes, string returnType)
@@ -5081,9 +5098,6 @@ namespace Emby.Server.Implementations.Data
 
             var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
-            var list = new List<Tuple<BaseItem, ItemCounts>>();
-            var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
-
             var statementTexts = new List<string>();
             if (!isReturningZeroItems)
             {
@@ -5102,8 +5116,11 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<Tuple<BaseItem, ItemCounts>>();
+                        var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
+
                         var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
 
                         if (!isReturningZeroItems)
@@ -5167,17 +5184,18 @@ namespace Emby.Server.Implementations.Data
                                 LogQueryTime("GetItemValues", commandText, now);
                             }
                         }
+
+                        if (result.TotalRecordCount == 0)
+                        {
+                            result.TotalRecordCount = list.Count;
+                        }
+                        result.Items = list.ToArray();
+
+                        return result;
+
                     }, ReadTransactionMode);
                 }
             }
-
-            if (result.TotalRecordCount == 0)
-            {
-                result.TotalRecordCount = list.Count;
-            }
-            result.Items = list.ToArray();
-
-            return result;
         }
 
         private ItemCounts GetItemCounts(IReadOnlyList<IResultSetValue> reader, int countStartColumn, List<string> typesToCount)
@@ -5390,8 +5408,6 @@ namespace Emby.Server.Implementations.Data
                 throw new ArgumentNullException("query");
             }
 
-            var list = new List<MediaStream>();
-
             var cmdText = "select " + string.Join(",", _mediaStreamSaveColumns) + " from mediastreams where";
 
             cmdText += " ItemId=@ItemId";
@@ -5412,8 +5428,10 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var list = new List<MediaStream>();
+
                         using (var statement = PrepareStatementSafe(db, cmdText))
                         {
                             statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
@@ -5433,11 +5451,12 @@ namespace Emby.Server.Implementations.Data
                                 list.Add(GetMediaStream(row));
                             }
                         }
+
+                        return list;
+
                     }, ReadTransactionMode);
                 }
             }
-
-            return list;
         }
 
         public async Task SaveMediaStreams(Guid id, List<MediaStream> streams, CancellationToken cancellationToken)
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 7afb5720e..7767ae892 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -300,9 +300,7 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    UserItemData result = null;
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
                         using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                         {
@@ -311,13 +309,13 @@ namespace Emby.Server.Implementations.Data
 
                             foreach (var row in statement.ExecuteQuery())
                             {
-                                result = ReadRow(row);
-                                break;
+                                return ReadRow(row);
                             }
                         }
-                    }, ReadTransactionMode);
 
-                    return result;
+                        return null;
+
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 2b2c3e000..d0c473777 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -459,12 +459,21 @@ namespace Emby.Server.Implementations.Dto
 
                 if (dtoOptions.EnableUserData)
                 {
-                    dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user).ConfigureAwait(false);
+                    dto.UserData = await _userDataRepository.GetUserDataDto(item, dto, user, dtoOptions.Fields).ConfigureAwait(false);
                 }
 
                 if (!dto.ChildCount.HasValue && item.SourceType == SourceType.Library)
                 {
-                    dto.ChildCount = GetChildCount(folder, user);
+                    // For these types we can try to optimize and assume these values will be equal
+                    if (item is MusicAlbum || item is Season)
+                    {
+                        dto.ChildCount = dto.RecursiveItemCount;
+                    }
+
+                    if (dtoOptions.Fields.Contains(ItemFields.ChildCount))
+                    {
+                        dto.ChildCount = dto.ChildCount ?? GetChildCount(folder, user);
+                    }
                 }
 
                 if (fields.Contains(ItemFields.CumulativeRunTimeTicks))
@@ -1151,28 +1160,29 @@ namespace Emby.Server.Implementations.Dto
             {
                 dto.Artists = hasArtist.Artists;
 
-                var artistItems = _libraryManager.GetArtists(new InternalItemsQuery
-                {
-                    EnableTotalRecordCount = false,
-                    ItemIds = new[] { item.Id.ToString("N") }
-                });
-
-                dto.ArtistItems = artistItems.Items
-                    .Select(i =>
-                    {
-                        var artist = i.Item1;
-                        return new NameIdPair
-                        {
-                            Name = artist.Name,
-                            Id = artist.Id.ToString("N")
-                        };
-                    })
-                    .ToList();
+                //var artistItems = _libraryManager.GetArtists(new InternalItemsQuery
+                //{
+                //    EnableTotalRecordCount = false,
+                //    ItemIds = new[] { item.Id.ToString("N") }
+                //});
+
+                //dto.ArtistItems = artistItems.Items
+                //    .Select(i =>
+                //    {
+                //        var artist = i.Item1;
+                //        return new NameIdPair
+                //        {
+                //            Name = artist.Name,
+                //            Id = artist.Id.ToString("N")
+                //        };
+                //    })
+                //    .ToList();
 
                 // Include artists that are not in the database yet, e.g., just added via metadata editor
-                var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList();
+                //var foundArtists = artistItems.Items.Select(i => i.Item1.Name).ToList();
+                dto.ArtistItems = new List<NameIdPair>();
                 dto.ArtistItems.AddRange(hasArtist.Artists
-                    .Except(foundArtists, new DistinctNameComparer())
+                    //.Except(foundArtists, new DistinctNameComparer())
                     .Select(i =>
                     {
                         // This should not be necessary but we're seeing some cases of it
@@ -1201,23 +1211,48 @@ namespace Emby.Server.Implementations.Dto
             {
                 dto.AlbumArtist = hasAlbumArtist.AlbumArtists.FirstOrDefault();
 
-                var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery
-                {
-                    EnableTotalRecordCount = false,
-                    ItemIds = new[] { item.Id.ToString("N") }
-                });
-
-                dto.AlbumArtists = artistItems.Items
+                //var artistItems = _libraryManager.GetAlbumArtists(new InternalItemsQuery
+                //{
+                //    EnableTotalRecordCount = false,
+                //    ItemIds = new[] { item.Id.ToString("N") }
+                //});
+
+                //dto.AlbumArtists = artistItems.Items
+                //    .Select(i =>
+                //    {
+                //        var artist = i.Item1;
+                //        return new NameIdPair
+                //        {
+                //            Name = artist.Name,
+                //            Id = artist.Id.ToString("N")
+                //        };
+                //    })
+                //    .ToList();
+
+                dto.AlbumArtists = new List<NameIdPair>();
+                dto.AlbumArtists.AddRange(hasAlbumArtist.AlbumArtists
+                    //.Except(foundArtists, new DistinctNameComparer())
                     .Select(i =>
                     {
-                        var artist = i.Item1;
-                        return new NameIdPair
+                        // This should not be necessary but we're seeing some cases of it
+                        if (string.IsNullOrWhiteSpace(i))
                         {
-                            Name = artist.Name,
-                            Id = artist.Id.ToString("N")
-                        };
-                    })
-                    .ToList();
+                            return null;
+                        }
+
+                        var artist = _libraryManager.GetArtist(i);
+                        if (artist != null)
+                        {
+                            return new NameIdPair
+                            {
+                                Name = artist.Name,
+                                Id = artist.Id.ToString("N")
+                            };
+                        }
+
+                        return null;
+
+                    }).Where(i => i != null));
             }
 
             // Add video info
diff --git a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index cc2dcb6fd..5bb21d02a 100644
--- a/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/Emby.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -519,6 +519,12 @@ namespace Emby.Server.Implementations.FileOrganization
 
         private void PerformFileSorting(TvFileOrganizationOptions options, FileOrganizationResult result)
         {
+            // We should probably handle this earlier so that we never even make it this far
+            if (string.Equals(result.OriginalPath, result.TargetPath, StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
             _libraryMonitor.ReportFileSystemChangeBeginning(result.TargetPath);
 
             _fileSystem.CreateDirectory(Path.GetDirectoryName(result.TargetPath));
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 94cc383a7..4606d0e31 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -76,7 +76,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
 
         private void ProcessContext(HttpListenerContext context)
         {
-            Task.Factory.StartNew(() => InitTask(context));
+            //Task.Factory.StartNew(() => InitTask(context), TaskCreationOptions.DenyChildAttach | TaskCreationOptions.PreferFairness);
+            Task.Run(() => InitTask(context));
         }
 
         private Task InitTask(HttpListenerContext context)
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index ad91988e5..1ff61286f 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -817,7 +817,31 @@ namespace Emby.Server.Implementations.Library
 
             return _userRootFolder;
         }
-        
+
+        public Guid? FindIdByPath(string path, bool? isFolder)
+        {
+            // If this returns multiple items it could be tricky figuring out which one is correct. 
+            // In most cases, the newest one will be and the others obsolete but not yet cleaned up
+
+            var query = new InternalItemsQuery
+            {
+                Path = path,
+                IsFolder = isFolder,
+                SortBy = new[] { ItemSortBy.DateCreated },
+                SortOrder = SortOrder.Descending,
+                Limit = 1
+            };
+
+            var id = GetItemIds(query);
+
+            if (id.Count == 0)
+            {
+                return null;
+            }
+
+            return id[0];
+        }
+
         public BaseItem FindByPath(string path, bool? isFolder)
         {
             // If this returns multiple items it could be tricky figuring out which one is correct. 
@@ -1430,7 +1454,7 @@ namespace Emby.Server.Implementations.Library
             }))
             {
                 // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray();
                 query.AncestorIds = new string[] { };
             }
         }
@@ -1489,7 +1513,7 @@ namespace Emby.Server.Implementations.Library
             }))
             {
                 // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentsForQuery(i, query.User)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).Select(i => i.ToString("N")).ToArray();
             }
             else
             {
@@ -1515,11 +1539,11 @@ namespace Emby.Server.Implementations.Library
 
                 }, CancellationToken.None).Result.ToList();
 
-                query.TopParentIds = userViews.SelectMany(i => GetTopParentsForQuery(i, user)).Select(i => i.Id.ToString("N")).ToArray();
+                query.TopParentIds = userViews.SelectMany(i => GetTopParentIdsForQuery(i, user)).Select(i => i.ToString("N")).ToArray();
             }
         }
 
-        private IEnumerable<BaseItem> GetTopParentsForQuery(BaseItem item, User user)
+        private IEnumerable<Guid> GetTopParentIdsForQuery(BaseItem item, User user)
         {
             var view = item as UserView;
 
@@ -1527,7 +1551,7 @@ namespace Emby.Server.Implementations.Library
             {
                 if (string.Equals(view.ViewType, CollectionType.LiveTv))
                 {
-                    return new[] { view };
+                    return new[] { view.Id };
                 }
                 if (string.Equals(view.ViewType, CollectionType.Channels))
                 {
@@ -1537,7 +1561,7 @@ namespace Emby.Server.Implementations.Library
 
                     }, CancellationToken.None).Result;
 
-                    return channelResult.Items;
+                    return channelResult.Items.Select(i =>  i.Id);
                 }
 
                 // Translate view into folders
@@ -1546,18 +1570,18 @@ namespace Emby.Server.Implementations.Library
                     var displayParent = GetItemById(view.DisplayParentId);
                     if (displayParent != null)
                     {
-                        return GetTopParentsForQuery(displayParent, user);
+                        return GetTopParentIdsForQuery(displayParent, user);
                     }
-                    return new BaseItem[] { };
+                    return new Guid[] { };
                 }
                 if (view.ParentId != Guid.Empty)
                 {
                     var displayParent = GetItemById(view.ParentId);
                     if (displayParent != null)
                     {
-                        return GetTopParentsForQuery(displayParent, user);
+                        return GetTopParentIdsForQuery(displayParent, user);
                     }
-                    return new BaseItem[] { };
+                    return new Guid[] { };
                 }
 
                 // Handle grouping
@@ -1568,23 +1592,23 @@ namespace Emby.Server.Implementations.Library
                         .OfType<CollectionFolder>()
                         .Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase))
                         .Where(i => user.IsFolderGrouped(i.Id))
-                        .SelectMany(i => GetTopParentsForQuery(i, user));
+                        .SelectMany(i => GetTopParentIdsForQuery(i, user));
                 }
-                return new BaseItem[] { };
+                return new Guid[] { };
             }
 
             var collectionFolder = item as CollectionFolder;
             if (collectionFolder != null)
             {
-                return collectionFolder.GetPhysicalParents();
+                return collectionFolder.PhysicalFolderIds;
             }
-
+            
             var topParent = item.GetTopParent();
             if (topParent != null)
             {
-                return new[] { topParent };
+                return new[] { topParent.Id };
             }
-            return new BaseItem[] { };
+            return new Guid[] { };
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index f4a30fc00..5a14edf13 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -12,6 +12,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 
 namespace Emby.Server.Implementations.Library
 {
@@ -186,16 +187,16 @@ namespace Emby.Server.Implementations.Library
             var userData = GetUserData(user.Id, item);
             var dto = GetUserItemDataDto(userData);
 
-            await item.FillUserDataDtoValues(dto, userData, null, user).ConfigureAwait(false);
+            await item.FillUserDataDtoValues(dto, userData, null, user, new List<ItemFields>()).ConfigureAwait(false);
             return dto;
         }
 
-        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user)
+        public async Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List<ItemFields> fields)
         {
             var userData = GetUserData(user.Id, item);
             var dto = GetUserItemDataDto(userData);
 
-            await item.FillUserDataDtoValues(dto, userData, itemDto, user).ConfigureAwait(false);
+            await item.FillUserDataDtoValues(dto, userData, itemDto, user, fields).ConfigureAwait(false);
             return dto;
         }
 
diff --git a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 43e19da65..f18278cb2 100644
--- a/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -65,9 +65,9 @@ namespace Emby.Server.Implementations.Notifications
 
             var whereClause = " where " + string.Join(" And ", clauses.ToArray());
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection(true))
                 {
                     result.TotalRecordCount = connection.Query("select count(Id) from Notifications" + whereClause, paramList.ToArray()).SelectScalarInt().First();
 
@@ -106,9 +106,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationsSummary();
 
-            using (var connection = CreateConnection(true))
+            using (WriteLock.Read())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection(true))
                 {
                     using (var statement = connection.PrepareStatement("select Level from Notifications where UserId=@UserId and IsRead=@IsRead"))
                     {
@@ -223,9 +223,9 @@ namespace Emby.Server.Implementations.Notifications
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            lock (WriteLock)
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -286,9 +286,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -308,9 +308,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (var connection = CreateConnection())
+            using (WriteLock.Write())
             {
-                lock (WriteLock)
+                using (var connection = CreateConnection())
                 {
                     connection.RunInTransaction(conn =>
                     {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 392db6935..7199f4f4d 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -206,10 +206,10 @@ namespace Emby.Server.Implementations.Security
             {
                 using (var connection = CreateConnection(true))
                 {
-                    var result = new QueryResult<AuthenticationInfo>();
-
-                    connection.RunInTransaction(db =>
+                    return connection.RunInTransaction(db =>
                     {
+                        var result = new QueryResult<AuthenticationInfo>();
+
                         var statementTexts = new List<string>();
                         statementTexts.Add(commandText);
                         statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging);
@@ -236,10 +236,10 @@ namespace Emby.Server.Implementations.Security
                             }
                         }
 
-                    }, ReadTransactionMode);
+                        result.Items = list.ToArray();
+                        return result;
 
-                    result.Items = list.ToArray();
-                    return result;
+                    }, ReadTransactionMode);
                 }
             }
         }
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 73a2bedb9..7a8951396 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -121,7 +121,9 @@ namespace MediaBrowser.Api
         {
             var options = new DtoOptions();
 
-            options.DeviceId = authContext.GetAuthorizationInfo(Request).DeviceId;
+            var authInfo = authContext.GetAuthorizationInfo(Request);
+
+            options.DeviceId = authInfo.DeviceId;
 
             var hasFields = request as IHasItemFields;
             if (hasFields != null)
@@ -129,6 +131,34 @@ namespace MediaBrowser.Api
                 options.Fields = hasFields.GetItemFields().ToList();
             }
 
+            var client = authInfo.Client ?? string.Empty;
+            if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 ||
+                client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.RecursiveItemCount);
+            }
+
+            if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("wmc", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("media center", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("classic", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1 ||
+               client.IndexOf("samsung", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.ChildCount);
+            }
+
+            if (client.IndexOf("web", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("mobile", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("ios", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("android", StringComparison.OrdinalIgnoreCase) == -1 &&
+                client.IndexOf("theater", StringComparison.OrdinalIgnoreCase) == -1)
+            {
+                options.Fields.Add(Model.Querying.ItemFields.ChildCount);
+            }
+
             var hasDtoOptions = request as IHasDtoOptions;
             if (hasDtoOptions != null)
             {
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 0ae1fbff4..b5c51bfef 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -14,8 +14,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
@@ -88,6 +86,12 @@ namespace MediaBrowser.Api
     {
     }
 
+    [Route("/Items/RemoteSearch/Book", "POST")]
+    [Authenticated]
+    public class GetBookRemoteSearchResults : RemoteSearchQuery<BookInfo>, IReturn<List<RemoteSearchResult>>
+    {
+    }
+
     [Route("/Items/RemoteSearch/Image", "GET", Summary = "Gets a remote image")]
     public class GetRemoteSearchImage
     {
@@ -147,6 +151,13 @@ namespace MediaBrowser.Api
             return ToOptimizedResult(result);
         }
 
+        public async Task<object> Post(GetBookRemoteSearchResults request)
+        {
+            var result = await _providerManager.GetRemoteSearchResults<Book, BookInfo>(request, CancellationToken.None).ConfigureAwait(false);
+
+            return ToOptimizedResult(result);
+        }
+
         public async Task<object> Post(GetMovieRemoteSearchResults request)
         {
             var result = await _providerManager.GetRemoteSearchResults<Movie, MovieInfo>(request, CancellationToken.None).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 9f4503466..2aa53d651 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -30,6 +30,7 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Providers;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Entities
@@ -2191,7 +2192,7 @@ namespace MediaBrowser.Controller.Entities
             return path;
         }
 
-        public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user)
+        public virtual Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> itemFields)
         {
             if (RunTimeTicks.HasValue)
             {
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index ebc55ca8a..c505aefb3 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -27,6 +27,7 @@ namespace MediaBrowser.Controller.Entities
         public CollectionFolder()
         {
             PhysicalLocationsList = new List<string>();
+            PhysicalFolderIds = new List<Guid>();
         }
 
         [IgnoreDataMember]
@@ -153,6 +154,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         public List<string> PhysicalLocationsList { get; set; }
+        public List<Guid> PhysicalFolderIds { get; set; }
 
         protected override IEnumerable<FileSystemMetadata> GetFileSystemChildren(IDirectoryService directoryService)
         {
@@ -176,6 +178,18 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
+            if (!changed)
+            {
+                var folderIds = PhysicalFolderIds.ToList();
+
+                var newFolderIds = GetPhysicalFolders(false).Select(i => i.Id).ToList();
+
+                if (!folderIds.SequenceEqual(newFolderIds))
+                {
+                    changed = true;
+                }
+            }
+
             return changed;
         }
 
@@ -186,6 +200,31 @@ namespace MediaBrowser.Controller.Entities
             return changed;
         }
 
+        protected override bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
+        {
+            var physicalFolders = GetPhysicalFolders(false)
+                .ToList();
+
+            var linkedChildren = physicalFolders
+                .SelectMany(c => c.LinkedChildren)
+                .ToList();
+
+            var changed = !linkedChildren.SequenceEqual(LinkedChildren, new LinkedChildComparer());
+
+            LinkedChildren = linkedChildren;
+
+            var folderIds = PhysicalFolderIds.ToList();
+            var newFolderIds = physicalFolders.Select(i => i.Id).ToList();
+
+            if (!folderIds.SequenceEqual(newFolderIds))
+            {
+                changed = true;
+                PhysicalFolderIds = newFolderIds.ToList();
+            }
+
+            return changed;
+        }
+
         internal override bool IsValidFromResolver(BaseItem newItem)
         {
             var newCollectionFolder = newItem as CollectionFolder;
@@ -260,26 +299,6 @@ namespace MediaBrowser.Controller.Entities
             return Task.FromResult(true);
         }
 
-        /// <summary>
-        /// Our children are actually just references to the ones in the physical root...
-        /// </summary>
-        /// <value>The linked children.</value>
-        [IgnoreDataMember]
-        public override List<LinkedChild> LinkedChildren
-        {
-            get { return GetLinkedChildrenInternal(); }
-            set
-            {
-                base.LinkedChildren = value;
-            }
-        }
-        private List<LinkedChild> GetLinkedChildrenInternal()
-        {
-            return GetPhysicalParents()
-                .SelectMany(c => c.LinkedChildren)
-                .ToList();
-        }
-
         /// <summary>
         /// Our children are actually just references to the ones in the physical root...
         /// </summary>
@@ -292,11 +311,16 @@ namespace MediaBrowser.Controller.Entities
 
         private IEnumerable<BaseItem> GetActualChildren()
         {
-            return GetPhysicalParents().SelectMany(c => c.Children);
+            return GetPhysicalFolders(true).SelectMany(c => c.Children);
         }
 
-        public IEnumerable<Folder> GetPhysicalParents()
+        private IEnumerable<Folder> GetPhysicalFolders(bool enableCache)
         {
+            if (enableCache)
+            {
+                return PhysicalFolderIds.Select(i => LibraryManager.GetItemById(i)).OfType<Folder>();
+            }
+
             var rootChildren = LibraryManager.RootFolder.Children
                 .OfType<Folder>()
                 .ToList();
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 4705f03fa..a84e9a5d2 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1222,7 +1222,7 @@ namespace MediaBrowser.Controller.Entities
         /// Refreshes the linked children.
         /// </summary>
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        private bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
+        protected virtual bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
         {
             var currentManualLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Manual).ToList();
             var currentShortcutLinks = LinkedChildren.Where(i => i.Type == LinkedChildType.Shortcut).ToList();
@@ -1410,23 +1410,24 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user)
+        public override async Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> itemFields)
         {
             if (!SupportsUserDataFromChildren)
             {
                 return;
             }
 
-            var recursiveItemCount = GetRecursiveChildCount(user);
-
             if (itemDto != null)
             {
-                itemDto.RecursiveItemCount = recursiveItemCount;
+                if (itemFields.Contains(ItemFields.RecursiveItemCount))
+                {
+                    itemDto.RecursiveItemCount = GetRecursiveChildCount(user);
+                }
             }
 
-            if (recursiveItemCount > 0 && SupportsPlayedStatus)
+            if (SupportsPlayedStatus)
             {
-                var unplayedQueryResult = recursiveItemCount > 0 ? await GetItems(new InternalItemsQuery(user)
+                var unplayedQueryResult = await GetItems(new InternalItemsQuery(user)
                 {
                     Recursive = true,
                     IsFolder = false,
@@ -1435,21 +1436,24 @@ namespace MediaBrowser.Controller.Entities
                     Limit = 0,
                     IsPlayed = false
 
-                }).ConfigureAwait(false) : new QueryResult<BaseItem>();
+                }).ConfigureAwait(false);
 
                 double unplayedCount = unplayedQueryResult.TotalRecordCount;
 
-                var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100;
-                dto.PlayedPercentage = 100 - unplayedPercentage;
-                dto.Played = dto.PlayedPercentage.Value >= 100;
                 dto.UnplayedItemCount = unplayedQueryResult.TotalRecordCount;
-            }
 
-            if (itemDto != null)
-            {
-                if (this is Season || this is MusicAlbum)
+                if (itemDto != null && itemDto.RecursiveItemCount.HasValue)
+                {
+                    if (itemDto.RecursiveItemCount.Value > 0)
+                    {
+                        var unplayedPercentage = (unplayedCount/itemDto.RecursiveItemCount.Value)*100;
+                        dto.PlayedPercentage = 100 - unplayedPercentage;
+                        dto.Played = dto.PlayedPercentage.Value >= 100;
+                    }
+                }
+                else
                 {
-                    itemDto.ChildCount = recursiveItemCount;
+                    dto.Played = (dto.UnplayedItemCount ?? 0) == 0;
                 }
             }
         }
diff --git a/MediaBrowser.Controller/Entities/IHasUserData.cs b/MediaBrowser.Controller/Entities/IHasUserData.cs
index c21e170ae..0b3b7dc8d 100644
--- a/MediaBrowser.Controller/Entities/IHasUserData.cs
+++ b/MediaBrowser.Controller/Entities/IHasUserData.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -14,10 +15,7 @@ namespace MediaBrowser.Controller.Entities
         /// <summary>
         /// Fills the user data dto values.
         /// </summary>
-        /// <param name="dto">The dto.</param>
-        /// <param name="userData">The user data.</param>
-        /// <param name="user">The user.</param>
-        Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user);
+        Task FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, BaseItemDto itemDto, User user, List<ItemFields> fields);
 
         bool EnableRememberingTrackSelections { get; }
 
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index d297fd006..bf9a07626 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -62,6 +62,8 @@ namespace MediaBrowser.Controller.Library
         /// <returns>BaseItem.</returns>
         BaseItem FindByPath(string path, bool? isFolder);
 
+        Guid? FindIdByPath(string path, bool? isFolder);
+
         /// <summary>
         /// Gets the artist.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs
index 86c52c4c3..5940c7e29 100644
--- a/MediaBrowser.Controller/Library/IUserDataManager.cs
+++ b/MediaBrowser.Controller/Library/IUserDataManager.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Model.Entities;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Library
 {
@@ -37,12 +38,9 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the user data dto.
         /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>UserItemDataDto.</returns>
         Task<UserItemDataDto> GetUserDataDto(IHasUserData item, User user);
 
-        Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user);
+        Task<UserItemDataDto> GetUserDataDto(IHasUserData item, BaseItemDto itemDto, User user, List<ItemFields> fields);
 
         /// <summary>
         /// Get all user data for the given user
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index bf1d4991c..e36abf16e 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -171,6 +171,8 @@
         /// </summary>
         PrimaryImageAspectRatio,
 
+        RecursiveItemCount,
+
         /// <summary>
         /// The revenue
         /// </summary>
diff --git a/RSSDP/SsdpDevicePublisherBase.cs b/RSSDP/SsdpDevicePublisherBase.cs
index 260c00896..8ab35d661 100644
--- a/RSSDP/SsdpDevicePublisherBase.cs
+++ b/RSSDP/SsdpDevicePublisherBase.cs
@@ -291,7 +291,7 @@ namespace Rssdp.Infrastructure
                 if (devices != null)
                 {
                     var deviceList = devices.ToList();
-                    WriteTrace(String.Format("Sending {0} search responses", deviceList.Count));
+                    //WriteTrace(String.Format("Sending {0} search responses", deviceList.Count));
 
                     foreach (var device in deviceList)
                     {
@@ -300,7 +300,7 @@ namespace Rssdp.Infrastructure
                 }
                 else
                 {
-                    WriteTrace(String.Format("Sending 0 search responses."));
+                    //WriteTrace(String.Format("Sending 0 search responses."));
                 }
             });
         }
@@ -413,7 +413,7 @@ namespace Rssdp.Infrastructure
 
                 //DisposeRebroadcastTimer();
 
-                WriteTrace("Begin Sending Alive Notifications For All Devices");
+                //WriteTrace("Begin Sending Alive Notifications For All Devices");
 
                 _LastNotificationTime = DateTime.Now;
 
@@ -430,7 +430,7 @@ namespace Rssdp.Infrastructure
                     SendAliveNotifications(device, true);
                 }
 
-                WriteTrace("Completed Sending Alive Notifications For All Devices");
+                //WriteTrace("Completed Sending Alive Notifications For All Devices");
             }
             catch (ObjectDisposedException ex)
             {
-- 
cgit v1.2.3


From 71854c1a09bb820c181485cf0601959461bca852 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 13 Dec 2016 03:45:04 -0500
Subject: update connection process

---
 .../Activity/ActivityRepository.cs                 |   2 +-
 .../Data/BaseSqliteRepository.cs                   | 126 +++++++++++----------
 .../Data/SqliteItemRepository.cs                   |  30 +++--
 .../Security/AuthenticationRepository.cs           |   2 +-
 4 files changed, 86 insertions(+), 74 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 5f6518a14..bf8835846 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -129,7 +129,7 @@ namespace Emby.Server.Implementations.Activity
                         var list = new List<ActivityLogEntry>();
                         var result = new QueryResult<ActivityLogEntry>();
 
-                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
+                        var statements = PrepareAllSafe(db, statementTexts).ToList();
 
                         using (var statement = statements[0])
                         {
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 2fc721f83..b29309ef2 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.Data
 
         protected TransactionMode TransactionMode
         {
-            get { return TransactionMode.Immediate; }
+            get { return TransactionMode.Deferred; }
         }
 
         protected TransactionMode ReadTransactionMode
@@ -57,82 +57,86 @@ namespace Emby.Server.Implementations.Data
 
         protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
         {
-            if (!_versionLogged)
+            lock (WriteLock)
             {
-                _versionLogged = true;
-                Logger.Info("Sqlite version: " + SQLite3.Version);
-                Logger.Info("Sqlite compiler options: " + string.Join(",", SQLite3.CompilerOptions.ToArray()));
-            }
+                if (!_versionLogged)
+                {
+                    _versionLogged = true;
+                    Logger.Info("Sqlite version: " + SQLite3.Version);
+                    Logger.Info("Sqlite compiler options: " + string.Join(",", SQLite3.CompilerOptions.ToArray()));
+                }
 
-            ConnectionFlags connectionFlags;
+                ConnectionFlags connectionFlags;
 
-            if (isReadOnly)
-            {
-                //Logger.Info("Opening read connection");
-                //connectionFlags = ConnectionFlags.ReadOnly;
-                connectionFlags = ConnectionFlags.Create;
-                connectionFlags |= ConnectionFlags.ReadWrite;
-            }
-            else
-            {
-                //Logger.Info("Opening write connection");
-                connectionFlags = ConnectionFlags.Create;
-                connectionFlags |= ConnectionFlags.ReadWrite;
-            }
+                if (isReadOnly)
+                {
+                    //Logger.Info("Opening read connection");
+                    //connectionFlags = ConnectionFlags.ReadOnly;
+                    connectionFlags = ConnectionFlags.Create;
+                    connectionFlags |= ConnectionFlags.ReadWrite;
+                }
+                else
+                {
+                    //Logger.Info("Opening write connection");
+                    connectionFlags = ConnectionFlags.Create;
+                    connectionFlags |= ConnectionFlags.ReadWrite;
+                }
 
-            connectionFlags |= ConnectionFlags.SharedCached;
-            connectionFlags |= ConnectionFlags.NoMutex;
+                connectionFlags |= ConnectionFlags.SharedCached;
+                connectionFlags |= ConnectionFlags.NoMutex;
 
-            var db = SQLite3.Open(DbFilePath, connectionFlags, null);
+                var db = SQLite3.Open(DbFilePath, connectionFlags, null);
 
-            if (string.IsNullOrWhiteSpace(_defaultWal))
-            {
-                _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First();
+                if (string.IsNullOrWhiteSpace(_defaultWal))
+                {
+                    _defaultWal = db.Query("PRAGMA journal_mode").SelectScalarString().First();
 
-                Logger.Info("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
-            }
+                    Logger.Info("Default journal_mode for {0} is {1}", DbFilePath, _defaultWal);
+                }
 
-            var queries = new List<string>
+                var queries = new List<string>
             {
                 //"PRAGMA cache size=-10000"
-                //"PRAGMA read_uncommitted = true"
+                //"PRAGMA read_uncommitted = true",
+                "PRAGMA synchronous=Normal"
             };
 
-            if (EnableTempStoreMemory)
-            {
-                queries.Add("PRAGMA temp_store = memory");
-            }
+                if (EnableTempStoreMemory)
+                {
+                    queries.Add("PRAGMA temp_store = memory");
+                }
 
-            //var cacheSize = CacheSize;
-            //if (cacheSize.HasValue)
-            //{
+                //var cacheSize = CacheSize;
+                //if (cacheSize.HasValue)
+                //{
 
-            //}
+                //}
 
-            ////foreach (var query in queries)
-            ////{
-            ////    db.Execute(query);
-            ////}
+                ////foreach (var query in queries)
+                ////{
+                ////    db.Execute(query);
+                ////}
 
-            //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
-            //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
+                //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
+                //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
 
-            /*if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase))
-            {
-                queries.Add("PRAGMA journal_mode=WAL");
+                /*if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase))
+                {
+                    queries.Add("PRAGMA journal_mode=WAL");
 
-                using (WriteLock.Write())
+                    using (WriteLock.Write())
+                    {
+                        db.ExecuteAll(string.Join(";", queries.ToArray()));
+                    }
+                }
+                else*/
+                foreach (var query in queries)
                 {
-                    db.ExecuteAll(string.Join(";", queries.ToArray()));
+                    db.Execute(query);
                 }
-            }
-            else*/
-            if (queries.Count > 0)
-            {
-                db.ExecuteAll(string.Join(";", queries.ToArray()));
-            }
 
-            return db;
+                return db;
+            }
         }
 
         public IStatement PrepareStatement(IDatabaseConnection connection, string sql)
@@ -145,14 +149,14 @@ namespace Emby.Server.Implementations.Data
             return connection.PrepareStatement(sql);
         }
 
-        public List<IStatement> PrepareAll(IDatabaseConnection connection, string sql)
+        public List<IStatement> PrepareAll(IDatabaseConnection connection, IEnumerable<string> sql)
         {
-            return connection.PrepareAll(sql).ToList();
+            return PrepareAllSafe(connection, sql);
         }
 
-        public List<IStatement> PrepareAllSafe(IDatabaseConnection connection, string sql)
+        public List<IStatement> PrepareAllSafe(IDatabaseConnection connection, IEnumerable<string> sql)
         {
-            return connection.PrepareAll(sql).ToList();
+            return sql.Select(connection.PrepareStatement).ToList();
         }
 
         protected void RunDefaultInitialization(IDatabaseConnection db)
@@ -161,6 +165,7 @@ namespace Emby.Server.Implementations.Data
             {
                 "PRAGMA journal_mode=WAL",
                 "PRAGMA page_size=4096",
+                "PRAGMA synchronous=Normal"
             };
 
             if (EnableTempStoreMemory)
@@ -173,6 +178,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             db.ExecuteAll(string.Join(";", queries.ToArray()));
+            Logger.Info("PRAGMA synchronous=" + db.Query("PRAGMA synchronous").SelectScalarString().First());
         }
 
         protected virtual bool EnableTempStoreMemory
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 803ebeca0..f93819322 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -701,12 +701,12 @@ namespace Emby.Server.Implementations.Data
         {
             var requiresReset = false;
 
-            var statements = PrepareAll(db, string.Join(";", new string[]
+            var statements = PrepareAllSafe(db, new string[]
             {
                 GetSaveItemCommandText(),
                 "delete from AncestorIds where ItemId=@ItemId",
                 "insert into AncestorIds (ItemId, AncestorId, AncestorIdText) values (@ItemId, @AncestorId, @AncestorIdText)"
-            })).ToList();
+            }).ToList();
 
             using (var saveItemStatement = statements[0])
             {
@@ -1258,18 +1258,23 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
+                    return connection.RunInTransaction(db =>
                     {
-                        statement.TryBind("@guid", id);
-
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = PrepareStatementSafe(db, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                         {
-                            return GetItem(row);
+                            statement.TryBind("@guid", id);
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                return GetItem(row);
+                            }
                         }
-                    }
+
+                        return null;
+
+                    }, ReadTransactionMode);
                 }
             }
-            return null;
         }
 
         private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader)
@@ -2762,7 +2767,7 @@ namespace Emby.Server.Implementations.Data
                     return connection.RunInTransaction(db =>
                     {
                         var result = new QueryResult<BaseItem>();
-                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                        var statements = PrepareAllSafe(db, statementTexts)
                             .ToList();
 
                         if (!isReturningZeroItems)
@@ -3173,7 +3178,7 @@ namespace Emby.Server.Implementations.Data
                     {
                         var result = new QueryResult<Guid>();
 
-                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                        var statements = PrepareAllSafe(db, statementTexts)
                             .ToList();
 
                         if (!isReturningZeroItems)
@@ -5121,7 +5126,8 @@ namespace Emby.Server.Implementations.Data
                         var list = new List<Tuple<BaseItem, ItemCounts>>();
                         var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
 
-                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray())).ToList();
+                        var statements = PrepareAllSafe(db, statementTexts)
+                            .ToList();
 
                         if (!isReturningZeroItems)
                         {
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index 7199f4f4d..a2d61873b 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -214,7 +214,7 @@ namespace Emby.Server.Implementations.Security
                         statementTexts.Add(commandText);
                         statementTexts.Add("select count (Id) from AccessTokens" + whereTextWithoutPaging);
 
-                        var statements = PrepareAllSafe(db, string.Join(";", statementTexts.ToArray()))
+                        var statements = PrepareAllSafe(db, statementTexts)
                             .ToList();
 
                         using (var statement = statements[0])
-- 
cgit v1.2.3


From 81d685b882de369cd42ed8f3dbf78fc6bc0f36df Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 13 Dec 2016 10:44:34 -0500
Subject: update db connections

---
 .../ScheduledTasks/ScheduledTaskWorker.cs          |   1 +
 .../Data/BaseSqliteRepository.cs                   |  64 ++++++-
 .../Data/SqliteExtensions.cs                       |   2 +-
 .../Data/SqliteItemRepository.cs                   | 209 +++++++++------------
 .../Data/SqliteUserDataRepository.cs               |  28 ++-
 .../Emby.Server.Implementations.csproj             |   1 +
 .../Configuration/ServerConfiguration.cs           |   2 -
 7 files changed, 157 insertions(+), 150 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index f288c5c0f..cbc7c7c2d 100644
--- a/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -387,6 +387,7 @@ namespace Emby.Common.Implementations.ScheduledTasks
             finally
             {
                 _currentTask = null;
+                GC.Collect();
             }
         }
 
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index b29309ef2..206422176 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Logging;
@@ -43,6 +44,7 @@ namespace Emby.Server.Implementations.Data
             //CheckOk(rc);
 
             rc = raw.sqlite3_config(raw.SQLITE_CONFIG_MULTITHREAD, 1);
+            //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SINGLETHREAD, 1);
             //rc = raw.sqlite3_config(raw.SQLITE_CONFIG_SERIALIZED, 1);
             //CheckOk(rc);
 
@@ -54,9 +56,20 @@ namespace Emby.Server.Implementations.Data
         private static bool _versionLogged;
 
         private string _defaultWal;
+        protected ManagedConnection _connection;
 
-        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
+        protected virtual bool EnableSingleConnection
         {
+            get { return true; }
+        }
+
+        protected ManagedConnection CreateConnection(bool isReadOnly = false)
+        {
+            if (_connection != null)
+            {
+                return _connection;
+            }
+
             lock (WriteLock)
             {
                 if (!_versionLogged)
@@ -82,7 +95,15 @@ namespace Emby.Server.Implementations.Data
                     connectionFlags |= ConnectionFlags.ReadWrite;
                 }
 
-                connectionFlags |= ConnectionFlags.SharedCached;
+                if (EnableSingleConnection)
+                {
+                    connectionFlags |= ConnectionFlags.PrivateCache;
+                }
+                else
+                {
+                    connectionFlags |= ConnectionFlags.SharedCached;
+                }
+
                 connectionFlags |= ConnectionFlags.NoMutex;
 
                 var db = SQLite3.Open(DbFilePath, connectionFlags, null);
@@ -95,11 +116,16 @@ namespace Emby.Server.Implementations.Data
                 }
 
                 var queries = new List<string>
-            {
-                //"PRAGMA cache size=-10000"
-                //"PRAGMA read_uncommitted = true",
-                "PRAGMA synchronous=Normal"
-            };
+                {
+                    //"PRAGMA cache size=-10000"
+                    //"PRAGMA read_uncommitted = true",
+                    "PRAGMA synchronous=Normal"
+                };
+
+                if (CacheSize.HasValue)
+                {
+                    queries.Add("PRAGMA cache_size=-" + CacheSize.Value.ToString(CultureInfo.InvariantCulture));
+                }
 
                 if (EnableTempStoreMemory)
                 {
@@ -135,10 +161,22 @@ namespace Emby.Server.Implementations.Data
                     db.Execute(query);
                 }
 
-                return db;
+                _connection = new ManagedConnection(db, false);
+
+                return _connection;
             }
         }
 
+        public IStatement PrepareStatement(ManagedConnection connection, string sql)
+        {
+            return connection.PrepareStatement(sql);
+        }
+
+        public IStatement PrepareStatementSafe(ManagedConnection connection, string sql)
+        {
+            return connection.PrepareStatement(sql);
+        }
+
         public IStatement PrepareStatement(IDatabaseConnection connection, string sql)
         {
             return connection.PrepareStatement(sql);
@@ -159,7 +197,7 @@ namespace Emby.Server.Implementations.Data
             return sql.Select(connection.PrepareStatement).ToList();
         }
 
-        protected void RunDefaultInitialization(IDatabaseConnection db)
+        protected void RunDefaultInitialization(ManagedConnection db)
         {
             var queries = new List<string>
             {
@@ -246,6 +284,12 @@ namespace Emby.Server.Implementations.Data
                     {
                         using (WriteLock.Write())
                         {
+                            if (_connection != null)
+                            {
+                                _connection.Close();
+                                _connection = null;
+                            }
+
                             CloseConnection();
                         }
                     }
@@ -340,7 +384,7 @@ namespace Emby.Server.Implementations.Data
             //{
             //    return new DummyToken();
             //}
-            return new ReadLockToken(obj);
+            return new WriteLockToken(obj);
         }
         public static IDisposable Write(this ReaderWriterLockSlim obj)
         {
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 5b2549087..d6ad0ba8a 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -129,7 +129,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        public static void Attach(IDatabaseConnection db, string path, string alias)
+        public static void Attach(ManagedConnection db, string path, string alias)
         {
             var commandText = string.Format("attach @path as {0};", alias);
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index f93819322..5f2a314f9 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -105,13 +105,7 @@ namespace Emby.Server.Implementations.Data
         {
             get
             {
-                var cacheSize = _config.Configuration.SqliteCacheSize;
-                if (cacheSize <= 0)
-                {
-                    cacheSize = Math.Min(Environment.ProcessorCount * 50000, 100000);
-                }
-
-                return 0 - cacheSize;
+                return 20000;
             }
         }
 
@@ -376,9 +370,9 @@ namespace Emby.Server.Implementations.Data
                 //await Vacuum(_connection).ConfigureAwait(false);
             }
 
-            userDataRepo.Initialize(WriteLock);
+            userDataRepo.Initialize(WriteLock, _connection);
 
-            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
+            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(15));
         }
 
         private void OnShrinkMemoryTimerCallback(object state)
@@ -1258,21 +1252,17 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    using (var statement = PrepareStatementSafe(connection, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                     {
-                        using (var statement = PrepareStatementSafe(db, "select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
-                        {
-                            statement.TryBind("@guid", id);
+                        statement.TryBind("@guid", id);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                return GetItem(row);
-                            }
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            return GetItem(row);
                         }
+                    }
 
-                        return null;
-
-                    }, ReadTransactionMode);
+                    return null;
                 }
             }
         }
@@ -2091,23 +2081,19 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    var list = new List<ChapterInfo>();
+
+                    using (var statement = PrepareStatementSafe(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                     {
-                        var list = new List<ChapterInfo>();
+                        statement.TryBind("@ItemId", id);
 
-                        using (var statement = PrepareStatementSafe(db, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            statement.TryBind("@ItemId", id);
-
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(GetChapter(row));
-                            }
+                            list.Add(GetChapter(row));
                         }
+                    }
 
-                        return list;
-
-                    }, ReadTransactionMode);
+                    return list;
                 }
             }
         }
@@ -2486,26 +2472,22 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
-                        using (var statement = PrepareStatementSafe(db, commandText))
+                        if (EnableJoinUserData(query))
                         {
-                            if (EnableJoinUserData(query))
-                            {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
-
-                            BindSimilarParams(query, statement);
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                        BindSimilarParams(query, statement);
 
-                            var count = statement.ExecuteQuery().SelectScalarInt().First();
-                            LogQueryTime("GetCount", commandText, now);
-                            return count;
-                        }
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                    }, ReadTransactionMode);
+                        var count = statement.ExecuteQuery().SelectScalarInt().First();
+                        LogQueryTime("GetCount", commandText, now);
+                        return count;
+                    }
                 }
 
             }
@@ -2983,33 +2965,29 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
-                    {
-                        var list = new List<Guid>();
+                    var list = new List<Guid>();
 
-                        using (var statement = PrepareStatementSafe(db, commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    {
+                        if (EnableJoinUserData(query))
                         {
-                            if (EnableJoinUserData(query))
-                            {
-                                statement.TryBind("@UserId", query.User.Id);
-                            }
+                            statement.TryBind("@UserId", query.User.Id);
+                        }
 
-                            BindSimilarParams(query, statement);
+                        BindSimilarParams(query, statement);
 
-                            // Running this again will bind the params
-                            GetWhereClauses(query, statement);
+                        // Running this again will bind the params
+                        GetWhereClauses(query, statement);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(row[0].ReadGuid());
-                            }
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(row[0].ReadGuid());
                         }
+                    }
 
-                        LogQueryTime("GetItemList", commandText, now);
-
-                        return list;
+                    LogQueryTime("GetItemList", commandText, now);
 
-                    }, ReadTransactionMode);
+                    return list;
                 }
             }
         }
@@ -4678,21 +4656,18 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    var list = new List<string>();
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
-                        var list = new List<string>();
-                        using (var statement = PrepareStatementSafe(db, commandText))
-                        {
-                            // Run this again to bind the params
-                            GetPeopleWhereClauses(query, statement);
+                        // Run this again to bind the params
+                        GetPeopleWhereClauses(query, statement);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(row.GetString(0));
-                            }
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(row.GetString(0));
                         }
-                        return list;
-                    }, ReadTransactionMode);
+                    }
+                    return list;
                 }
             }
         }
@@ -4721,23 +4696,20 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    var list = new List<PersonInfo>();
+
+                    using (var statement = PrepareStatementSafe(connection, commandText))
                     {
-                        var list = new List<PersonInfo>();
+                        // Run this again to bind the params
+                        GetPeopleWhereClauses(query, statement);
 
-                        using (var statement = PrepareStatementSafe(db, commandText))
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            // Run this again to bind the params
-                            GetPeopleWhereClauses(query, statement);
-
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(GetPerson(row));
-                            }
+                            list.Add(GetPerson(row));
                         }
+                    }
 
-                        return list;
-                    }, ReadTransactionMode);
+                    return list;
                 }
             }
         }
@@ -4939,25 +4911,22 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
-                    {
-                        var list = new List<string>();
+                    var list = new List<string>();
 
-                        using (var statement = PrepareStatementSafe(db, commandText))
+                    using (var statement = PrepareStatementSafe(connection, commandText))
+                    {
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            foreach (var row in statement.ExecuteQuery())
+                            if (!row.IsDBNull(0))
                             {
-                                if (!row.IsDBNull(0))
-                                {
-                                    list.Add(row.GetString(0));
-                                }
+                                list.Add(row.GetString(0));
                             }
                         }
+                    }
 
-                        LogQueryTime("GetItemValueNames", commandText, now);
+                    LogQueryTime("GetItemValueNames", commandText, now);
 
-                        return list;
-                    }, ReadTransactionMode);
+                    return list;
                 }
             }
         }
@@ -5434,33 +5403,29 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    var list = new List<MediaStream>();
+
+                    using (var statement = PrepareStatementSafe(connection, cmdText))
                     {
-                        var list = new List<MediaStream>();
+                        statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
 
-                        using (var statement = PrepareStatementSafe(db, cmdText))
+                        if (query.Type.HasValue)
                         {
-                            statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
-
-                            if (query.Type.HasValue)
-                            {
-                                statement.TryBind("@StreamType", query.Type.Value.ToString());
-                            }
-
-                            if (query.Index.HasValue)
-                            {
-                                statement.TryBind("@StreamIndex", query.Index.Value);
-                            }
+                            statement.TryBind("@StreamType", query.Type.Value.ToString());
+                        }
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(GetMediaStream(row));
-                            }
+                        if (query.Index.HasValue)
+                        {
+                            statement.TryBind("@StreamIndex", query.Index.Value);
                         }
 
-                        return list;
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            list.Add(GetMediaStream(row));
+                        }
+                    }
 
-                    }, ReadTransactionMode);
+                    return list;
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 7767ae892..2e39b038a 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -42,8 +42,10 @@ namespace Emby.Server.Implementations.Data
         /// Opens the connection to the database
         /// </summary>
         /// <returns>Task.</returns>
-        public void Initialize(ReaderWriterLockSlim writeLock)
+        public void Initialize(ReaderWriterLockSlim writeLock, ManagedConnection managedConnection)
         {
+            _connection = managedConnection;
+
             WriteLock.Dispose();
             WriteLock = writeLock;
 
@@ -90,7 +92,7 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        private void ImportUserDataIfNeeded(IDatabaseConnection connection)
+        private void ImportUserDataIfNeeded(ManagedConnection connection)
         {
             if (!_fileSystem.FileExists(_importFile))
             {
@@ -117,7 +119,7 @@ namespace Emby.Server.Implementations.Data
             }, TransactionMode);
         }
 
-        private void ImportUserData(IDatabaseConnection connection, string file)
+        private void ImportUserData(ManagedConnection connection, string file)
         {
             SqliteExtensions.Attach(connection, file, "UserDataBackup");
 
@@ -300,22 +302,18 @@ namespace Emby.Server.Implementations.Data
             {
                 using (var connection = CreateConnection(true))
                 {
-                    return connection.RunInTransaction(db =>
+                    using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
                     {
-                        using (var statement = db.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key =@Key and userId=@UserId"))
-                        {
-                            statement.TryBind("@UserId", userId.ToGuidParamValue());
-                            statement.TryBind("@Key", key);
+                        statement.TryBind("@UserId", userId.ToGuidParamValue());
+                        statement.TryBind("@Key", key);
 
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                return ReadRow(row);
-                            }
+                        foreach (var row in statement.ExecuteQuery())
+                        {
+                            return ReadRow(row);
                         }
+                    }
 
-                        return null;
-
-                    }, ReadTransactionMode);
+                    return null;
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index e478b9d81..92e83f05b 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -51,6 +51,7 @@
     <Compile Include="Connect\ConnectManager.cs" />
     <Compile Include="Connect\Responses.cs" />
     <Compile Include="Connect\Validator.cs" />
+    <Compile Include="Data\ManagedConnection.cs" />
     <Compile Include="Data\SqliteDisplayPreferencesRepository.cs" />
     <Compile Include="Data\SqliteFileOrganizationRepository.cs" />
     <Compile Include="Data\SqliteItemRepository.cs" />
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 35677813d..f5c4bba50 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -191,7 +191,6 @@ namespace MediaBrowser.Model.Configuration
         public int SharingExpirationDays { get; set; }
 
         public int SchemaVersion { get; set; }
-        public int SqliteCacheSize { get; set; }
 
         public bool EnableAnonymousUsageReporting { get; set; }
         public bool EnableStandaloneMusicKeys { get; set; }
@@ -214,7 +213,6 @@ namespace MediaBrowser.Model.Configuration
         {
             LocalNetworkAddresses = new string[] { };
             CodecsUsed = new string[] { };
-            SqliteCacheSize = 0;
             ImageExtractionTimeoutMs = 0;
 
             EnableLocalizedGuids = true;
-- 
cgit v1.2.3


From cc73830cd6df7049281df6e43615096a5b47ccb4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 17 Dec 2016 03:27:41 -0500
Subject: fix music album image inheritance

---
 Emby.Server.Core/ApplicationHost.cs                    |  4 ++++
 .../Data/BaseSqliteRepository.cs                       |  5 ++++-
 Emby.Server.Implementations/Dto/DtoService.cs          | 18 ++++++++++++++++--
 MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs   |  6 ++++++
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs      |  5 +++++
 .../Updates/ApplicationUpdater.cs                      | 12 +++++++++++-
 6 files changed, 46 insertions(+), 4 deletions(-)

(limited to 'Emby.Server.Implementations/Data/BaseSqliteRepository.cs')

diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 3b3313169..a0a7416e7 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -548,6 +548,8 @@ namespace Emby.Server.Core
             RegisterSingleInstance(UserDataManager);
 
             UserRepository = GetUserRepository();
+            // This is only needed for disposal purposes. If removing this, make sure to have the manager handle disposing it
+            RegisterSingleInstance(UserRepository);
 
             var displayPreferencesRepo = new SqliteDisplayPreferencesRepository(LogManager.GetLogger("SqliteDisplayPreferencesRepository"), JsonSerializer, ApplicationPaths, MemoryStreamFactory);
             DisplayPreferencesRepository = displayPreferencesRepo;
@@ -678,6 +680,8 @@ namespace Emby.Server.Core
 
             var sharingRepo = new SharingRepository(LogManager.GetLogger("SharingRepository"), ApplicationPaths);
             sharingRepo.Initialize();
+            // This is only needed for disposal purposes. If removing this, make sure to have the manager handle disposing it
+            RegisterSingleInstance<ISharingRepository>(sharingRepo);
             RegisterSingleInstance<ISharingManager>(new SharingManager(sharingRepo, ServerConfigurationManager, LibraryManager, this));
 
             var activityLogRepo = GetActivityLogRepository();
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 206422176..64a0d889e 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -286,7 +286,10 @@ namespace Emby.Server.Implementations.Data
                         {
                             if (_connection != null)
                             {
-                                _connection.Close();
+                                using (_connection)
+                                {
+                                    
+                                }
                                 _connection = null;
                             }
 
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index d0c473777..8e6c1263d 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1504,6 +1504,20 @@ namespace Emby.Server.Implementations.Dto
             }
         }
 
+        private BaseItem GetImageDisplayParent(BaseItem item)
+        {
+            var musicAlbum = item as MusicAlbum;
+            if (musicAlbum != null)
+            {
+                var artist = musicAlbum.MusicArtist;
+                if (artist != null)
+                {
+                    return artist;
+                }
+            }
+            return item.GetParent();
+        }
+
         private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner)
         {
             if (!item.SupportsInheritedParentImages)
@@ -1528,7 +1542,7 @@ namespace Emby.Server.Implementations.Dto
             var isFirst = true;
 
             while (((!dto.HasLogo && logoLimit > 0) || (!dto.HasArtImage && artLimit > 0) || (!dto.HasThumb && thumbLimit > 0) || parent is Series) &&
-                (parent = parent ?? (isFirst ? item.GetParent() ?? owner : parent)) != null)
+                (parent = parent ?? (isFirst ? GetImageDisplayParent(item) ?? owner : parent)) != null)
             {
                 if (parent == null)
                 {
@@ -1585,7 +1599,7 @@ namespace Emby.Server.Implementations.Dto
                     break;
                 }
 
-                parent = parent.GetParent();
+                parent = GetImageDisplayParent(parent);
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 569b422cb..ffdbba6f2 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Controller.Entities.Audio
             get { return true; }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsInheritedParentImages
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public MusicArtist MusicArtist
         {
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 52fb7e281..3e6c88a85 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -202,5 +202,10 @@ namespace MediaBrowser.Controller.Entities.Movies
 
             return false;
         }
+
+        public override bool IsVisibleStandalone(User user)
+        {
+            return IsVisible(user);
+        }
     }
 }
diff --git a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
index 97537b27d..aa8679bd5 100644
--- a/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
+++ b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
@@ -47,7 +47,17 @@ namespace MediaBrowser.ServerApplication.Updates
                     product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath, MainStartup.ApplicationPath, systemPath);
 
             logger.Info("Args: {0}", args);
-            Process.Start(tempUpdater, args);
+
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = tempUpdater,
+                Arguments = args,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                ErrorDialog = false,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                WorkingDirectory = Path.GetDirectoryName(tempUpdater)
+            });
 
             // That's it.  The installer will do the work once we exit
         }
-- 
cgit v1.2.3