Merge pull request #2299 from MediaBrowser/dev

Dev

Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs

@@ -105,5 +105,10 @@ namespace Emby.Common.Implementations.EnvironmentInfo
         {
             return null;
         }
+
+        public string StackTrace
+        {
+            get { return Environment.StackTrace; }
+        }
     }
 }

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);
 

Emby.Server.Implementations/Activity/ActivityRepository.cs

@@ -27,6 +27,13 @@ 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"
+                }));
+
                 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 +58,9 @@ namespace Emby.Server.Implementations.Activity
                 throw new ArgumentNullException("entry");
             }
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -78,10 +85,10 @@ namespace Emby.Server.Implementations.Activity
         }
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
-        {
-            using (WriteLock.Read())
         {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseActivitySelectText;
                     var whereClauses = new List<string>();

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,9 @@ namespace Emby.Server.Implementations.Data
 
         private static bool _versionLogged;
 
-        protected virtual SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false)
+        private string _defaultWal;
+
+        protected SQLiteDatabaseConnection CreateConnection(bool isReadOnly = false, Action<SQLiteDatabaseConnection> onConnect = null)
         {
             if (!_versionLogged)
             {
@@ -56,7 +53,16 @@ namespace Emby.Server.Implementations.Data
 
             ConnectionFlags connectionFlags;
 
-            //isReadOnly = false;
+            if (isReadOnly)
+            {
+                //Logger.Info("Opening read connection");
+            }
+            else
+            {
+                //Logger.Info("Opening write connection");
+            }
+
+            isReadOnly = false;
 
             if (isReadOnly)
             {
@@ -70,47 +76,51 @@ namespace Emby.Server.Implementations.Data
                 connectionFlags |= ConnectionFlags.ReadWrite;
             }
 
-            if (EnableConnectionPooling)
-            {
             connectionFlags |= ConnectionFlags.SharedCached;
-            }
-            else
-            {
-                connectionFlags |= ConnectionFlags.PrivateCache;
-            }
-
             connectionFlags |= ConnectionFlags.NoMutex;
 
             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 default_temp_store=memory",
-                "PRAGMA page_size=4096",
+                "pragma temp_store = memory",
-                "PRAGMA journal_mode=WAL",
+                "PRAGMA journal_mode=WAL"
-                "PRAGMA temp_store=memory",
-                "PRAGMA synchronous=Normal",
                 //"PRAGMA cache size=-10000"
             };
 
-            var cacheSize = CacheSize;
+            //var cacheSize = CacheSize;
-            if (cacheSize.HasValue)
+            //if (cacheSize.HasValue)
-            {
+            //{
 
-            }
+            //}
 
-            if (EnableExclusiveMode)
+            ////foreach (var query in queries)
-            {
+            ////{
-                queries.Add("PRAGMA locking_mode=EXCLUSIVE");
+            ////    db.Execute(query);
-            }
+            ////}
 
-            //foreach (var query in queries)
+            //Logger.Info("synchronous: " + db.Query("PRAGMA synchronous").SelectScalarString().First());
-            //{
+            //Logger.Info("temp_store: " + db.Query("PRAGMA temp_store").SelectScalarString().First());
-            //    db.Execute(query);
-            //}
 
+            //if (!string.Equals(_defaultWal, "wal", StringComparison.OrdinalIgnoreCase) || onConnect != null)
+            {
+                using (WriteLock.Write())
+                {
                     db.ExecuteAll(string.Join(";", queries.ToArray()));
 
+                    if (onConnect != null)
+                    {
+                        onConnect(db);
+                    }
+                }
+            }
+
             return db;
         }
 
@@ -122,11 +132,6 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
-        protected virtual bool EnableExclusiveMode
-        {
-            get { return false; }
-        }
-
         internal static void CheckOk(int rc)
         {
             string msg = "";

Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs

@@ -54,6 +54,13 @@ 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 = {
 
                                "create table if not exists userdisplaypreferences (id GUID, userId GUID, client text, data BLOB)",
@@ -86,9 +93,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -130,9 +137,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -162,9 +169,9 @@ namespace Emby.Server.Implementations.Data
 
             var guidId = displayPreferencesId.GetMD5();
 
-            using (WriteLock.Read())
-            {
             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 +203,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<DisplayPreferences>();
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     using (var statement = connection.PrepareStatement("select data from userdisplaypreferences where userId=@userId"))
                     {

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 commandText = string.Format("attach @path as {0};", alias);
-            var paramList = new List<object>();
-            paramList.Add(path);
 
-            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)

Emby.Server.Implementations/Data/SqliteFileOrganizationRepository.cs

@@ -31,6 +31,13 @@ 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 = {
 
                                 "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)",

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");
@@ -127,10 +129,18 @@ namespace Emby.Server.Implementations.Data
         {
             _connection = CreateConnection(false);
 
+            _connection.ExecuteAll(string.Join(";", new[]
+            {
+                                "PRAGMA page_size=4096",
+                                "PRAGMA default_temp_store=memory",
+                                "PRAGMA temp_store=memory"
+             }));
+
             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)",
 
@@ -184,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);
 
@@ -196,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);
@@ -344,25 +352,26 @@ namespace Emby.Server.Implementations.Data
 
             _connection.RunQueries(postQueries);
 
-            SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
+            //SqliteExtensions.Attach(_connection, Path.Combine(_config.ApplicationPaths.DataPath, "userdata_v2.db"), "UserDataDb");
-            userDataRepo.Initialize(_connection, WriteLock);
+            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 =
@@ -371,7 +380,6 @@ namespace Emby.Server.Implementations.Data
             "data",
             "StartDate",
             "EndDate",
-            "IsOffline",
             "ChannelId",
             "IsMovie",
             "IsSports",
@@ -519,7 +527,6 @@ namespace Emby.Server.Implementations.Data
                 "ParentId",
                 "Genres",
                 "InheritedParentalRatingValue",
-                "SchemaVersion",
                 "SortName",
                 "RunTimeTicks",
                 "OfficialRatingDescription",
@@ -529,7 +536,6 @@ namespace Emby.Server.Implementations.Data
                 "DateCreated",
                 "DateModified",
                 "ForcedSortName",
-                "IsOffline",
                 "LocationType",
                 "PreferredMetadataLanguage",
                 "PreferredMetadataCountryCode",
@@ -635,14 +641,17 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
+            using (var connection = CreateConnection())
+            {
                 using (WriteLock.Write())
                 {
-                _connection.RunInTransaction(db =>
+                    connection.RunInTransaction(db =>
                     {
                         SaveItemsInTranscation(db, items);
                     });
                 }
             }
+        }
 
         private void SaveItemsInTranscation(IDatabaseConnection db, List<BaseItem> items)
         {
@@ -777,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);
@@ -790,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);
@@ -1169,10 +1176,12 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
-
+            //Logger.Info("Retrieving item {0}", id.ToString("N"));
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
-                using (var statement = _connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
+                    using (var statement = connection.PrepareStatement("select " + string.Join(",", _retriveItemColumns) + " from TypedBaseItems where guid = @guid"))
                     {
                         statement.TryBind("@guid", id);
 
@@ -1182,6 +1191,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
             return null;
         }
 
@@ -1353,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))
+            var index = 5;
-            {
-                item.ChannelId = reader.GetString(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))
             {
@@ -1976,9 +1994,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
                     {
                         statement.TryBind("@ItemId", id);
 
@@ -1988,6 +2008,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             return list;
         }
@@ -2007,9 +2028,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement("select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
                     {
                         statement.TryBind("@ItemId", id);
                         statement.TryBind("@ChapterIndex", index);
@@ -2020,6 +2043,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
             return null;
         }
 
@@ -2085,12 +2109,14 @@ namespace Emby.Server.Implementations.Data
 
             var index = 0;
 
+            using (var connection = CreateConnection())
+            {
                 using (WriteLock.Write())
                 {
-                _connection.RunInTransaction(db =>
+                    connection.RunInTransaction(db =>
                     {
                         // First delete chapters
-                    _connection.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", id.ToGuidParamValue());
+                        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)"))
                         {
@@ -2116,6 +2142,7 @@ namespace Emby.Server.Implementations.Data
                     });
                 }
             }
+        }
 
         protected override void CloseConnection()
         {
@@ -2343,6 +2370,8 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
+            //Logger.Info("GetItemList: " + _environmentInfo.StackTrace);
+
             var now = DateTime.UtcNow;
 
             var list = new List<BaseItem>();
@@ -2383,9 +2412,11 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
             {
-                using (var statement = _connection.PrepareStatement(commandText))
+                using (WriteLock.Read())
+                {
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2409,6 +2440,7 @@ namespace Emby.Server.Implementations.Data
 
                     LogQueryTime("GetItemList", commandText, now);
                 }
+            }
 
             // Hack for right now since we currently don't support filtering out these duplicates within a query
             if (query.EnableGroupByMetadataKey)
@@ -2505,6 +2537,7 @@ namespace Emby.Server.Implementations.Data
                     TotalRecordCount = returnList.Count
                 };
             }
+            //Logger.Info("GetItems: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2548,14 +2581,16 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            {
+                using (WriteLock.Read())
                 {
                     var totalRecordCount = 0;
                     var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
 
                     if (!isReturningZeroItems)
                     {
-                    using (var statement = _connection.PrepareStatement(commandText))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
                             if (EnableJoinUserData(query))
                             {
@@ -2592,7 +2627,7 @@ namespace Emby.Server.Implementations.Data
                     commandText += GetJoinUserDataText(query);
                     commandText += whereTextWithoutPaging;
 
-                using (var statement = _connection.PrepareStatement(commandText))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2616,6 +2651,7 @@ namespace Emby.Server.Implementations.Data
                     };
                 }
             }
+        }
 
         private string GetOrderByText(InternalItemsQuery query)
         {
@@ -2739,6 +2775,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
+            //Logger.Info("GetItemIdsList: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2774,9 +2811,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2799,6 +2838,7 @@ namespace Emby.Server.Implementations.Data
                     return list;
                 }
             }
+        }
 
         public List<Tuple<Guid, string>> GetItemIdsWithPath(InternalItemsQuery query)
         {
@@ -2842,9 +2882,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2872,6 +2914,7 @@ namespace Emby.Server.Implementations.Data
                     return list;
                 }
             }
+        }
 
         public QueryResult<Guid> GetItemIds(InternalItemsQuery query)
         {
@@ -2891,6 +2934,7 @@ namespace Emby.Server.Implementations.Data
                     TotalRecordCount = returnList.Count
                 };
             }
+            //Logger.Info("GetItemIds: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2928,11 +2972,13 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<Guid>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true, EnableJoinUserData(query)))
+            {
+                using (WriteLock.Read())
                 {
                     var totalRecordCount = 0;
 
-                using (var statement = _connection.PrepareStatement(commandText))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2964,7 +3010,7 @@ namespace Emby.Server.Implementations.Data
                     commandText += GetJoinUserDataText(query);
                     commandText += whereTextWithoutPaging;
 
-                using (var statement = _connection.PrepareStatement(commandText))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (EnableJoinUserData(query))
                         {
@@ -2988,6 +3034,7 @@ namespace Emby.Server.Implementations.Data
                     };
                 }
             }
+        }
 
         private List<string> GetWhereClauses(InternalItemsQuery query, IStatement statement, string paramSuffix = "")
         {
@@ -3013,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) ||
@@ -4289,9 +4328,11 @@ 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())
+            {
                 using (WriteLock.Write())
                 {
-                foreach (var row in _connection.Query(commandText))
+                    foreach (var row in connection.Query(commandText))
                     {
                         var id = row.GetGuid(0);
                         string value = row.IsDBNull(2) ? null : row.GetString(2);
@@ -4306,7 +4347,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 = connection.PrepareStatement("Update TypedBaseItems set InheritedTags=@InheritedTags where Guid=@Guid"))
                     {
                         foreach (var item in newValues)
                         {
@@ -4320,6 +4361,7 @@ namespace Emby.Server.Implementations.Data
                     }
                 }
             }
+        }
 
         private static Dictionary<string, string[]> GetTypeMapDictionary()
         {
@@ -4360,9 +4402,11 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
+            using (var connection = CreateConnection())
+            {
                 using (WriteLock.Write())
                 {
-                _connection.RunInTransaction(db =>
+                    connection.RunInTransaction(db =>
                     {
                         // Delete people
                         ExecuteWithSingleParam(db, "delete from People where ItemId=@Id", id.ToGuidParamValue());
@@ -4384,6 +4428,7 @@ namespace Emby.Server.Implementations.Data
                     });
                 }
             }
+        }
 
         private void ExecuteWithSingleParam(IDatabaseConnection db, string query, byte[] value)
         {
@@ -4417,9 +4462,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<string>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
-                using (var statement = _connection.PrepareStatement(commandText))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         // Run this again to bind the params
                         GetPeopleWhereClauses(query, statement);
@@ -4432,6 +4479,7 @@ namespace Emby.Server.Implementations.Data
                     return list;
                 }
             }
+        }
 
         public List<PersonInfo> GetPeople(InternalPeopleQuery query)
         {
@@ -4455,9 +4503,11 @@ namespace Emby.Server.Implementations.Data
 
             var list = new List<PersonInfo>();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
-                using (var statement = _connection.PrepareStatement(commandText))
+                    using (var statement = connection.PrepareStatement(commandText))
                     {
                         // Run this again to bind the params
                         GetPeopleWhereClauses(query, statement);
@@ -4468,6 +4518,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             return list;
         }
@@ -4667,9 +4718,11 @@ namespace Emby.Server.Implementations.Data
 
             commandText += " Group By CleanValue";
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
-                foreach (var row in _connection.Query(commandText))
+                    foreach (var row in connection.Query(commandText))
                     {
                         if (!row.IsDBNull(0))
                         {
@@ -4677,6 +4730,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
             LogQueryTime("GetItemValueNames", commandText, now);
 
             return list;
@@ -4695,6 +4749,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
+            //Logger.Info("GetItemValues: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -4825,11 +4880,13 @@ 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)))
+            {
+                using (WriteLock.Read())
                 {
                     if (!isReturningZeroItems)
                     {
-                    using (var statement = _connection.PrepareStatement(commandText))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
                             statement.TryBind("@SelectType", returnType);
                             if (EnableJoinUserData(query))
@@ -4867,7 +4924,7 @@ namespace Emby.Server.Implementations.Data
                         commandText += GetJoinUserDataText(query);
                         commandText += whereText;
 
-                    using (var statement = _connection.PrepareStatement(commandText))
+                        using (var statement = connection.PrepareStatement(commandText))
                         {
                             statement.TryBind("@SelectType", returnType);
                             if (EnableJoinUserData(query))
@@ -4889,6 +4946,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             if (count == 0)
             {
@@ -5043,15 +5101,16 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                // First delete 
+                using (WriteLock.Write())
+                { // First delete 
                     // "delete from People where ItemId=?"
-                _connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue());
+                    connection.Execute("delete from People where ItemId=?", itemId.ToGuidParamValue());
 
                     var listIndex = 0;
 
-                using (var statement = _connection.PrepareStatement(
+                    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)
@@ -5074,6 +5133,7 @@ namespace Emby.Server.Implementations.Data
                     }
                 }
             }
+        }
 
         private PersonInfo GetPerson(IReadOnlyList<IResultSetValue> reader)
         {
@@ -5127,9 +5187,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement(cmdText))
                     {
                         statement.TryBind("@ItemId", query.ItemId.ToGuidParamValue());
 
@@ -5149,6 +5211,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             return list;
         }
@@ -5169,12 +5232,13 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                // First delete chapters
+                using (WriteLock.Write())
-                _connection.Execute("delete from mediastreams where ItemId=@ItemId", id.ToGuidParamValue());
+                {     // 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 = connection.PrepareStatement(string.Format("replace into mediastreams ({0}) values ({1})",
                                 string.Join(",", _mediaStreamSaveColumns),
                                 string.Join(",", _mediaStreamSaveColumns.Select(i => "@" + i).ToArray()))))
                     {
@@ -5225,6 +5289,7 @@ namespace Emby.Server.Implementations.Data
                     }
                 }
             }
+        }
 
         /// <summary>
         /// Gets the chapter.

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,14 +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;
+
+            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",
+
                                 "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",
@@ -69,7 +72,7 @@ namespace Emby.Server.Implementations.Data
                                 "pragma shrink_memory"
                                };
 
-            _connection.RunQueries(queries);
+                connection.RunQueries(queries);
 
                 connection.RunInTransaction(db =>
                 {
@@ -79,6 +82,7 @@ namespace Emby.Server.Implementations.Data
                     AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
                 });
             }
+        }
 
         /// <summary>
         /// Saves the user data.
@@ -139,18 +143,21 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
+            using (var connection = CreateConnection())
+            {
                 using (WriteLock.Write())
                 {
-                _connection.RunInTransaction(db =>
+                    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,9 +214,11 @@ namespace Emby.Server.Implementations.Data
         {
             cancellationToken.ThrowIfCancellationRequested();
 
+            using (var connection = CreateConnection())
+            {
                 using (WriteLock.Write())
                 {
-                _connection.RunInTransaction(db =>
+                    connection.RunInTransaction(db =>
                     {
                         foreach (var userItemData in userDataList)
                         {
@@ -218,6 +227,7 @@ namespace Emby.Server.Implementations.Data
                     });
                 }
             }
+        }
 
         /// <summary>
         /// Gets the user data.
@@ -241,9 +251,11 @@ 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())
+                {
+                    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);
@@ -254,6 +266,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             return null;
         }
@@ -291,9 +304,11 @@ 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())
+                {
+                    using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@UserId"))
                     {
                         statement.TryBind("@UserId", userId.ToGuidParamValue());
 
@@ -303,6 +318,7 @@ namespace Emby.Server.Implementations.Data
                         }
                     }
                 }
+            }
 
             return list;
         }

Emby.Server.Implementations/Data/SqliteUserRepository.cs

@@ -50,6 +50,13 @@ 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 = {
 
                                 "create table if not exists users (guid GUID primary key, data BLOB)",
@@ -83,9 +90,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -108,9 +115,9 @@ namespace Emby.Server.Implementations.Data
         {
             var list = new List<User>();
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     foreach (var row in connection.Query("select guid,data from users"))
                     {
@@ -146,9 +153,9 @@ namespace Emby.Server.Implementations.Data
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {

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();
             }
         }

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 is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
-                {
+                //{
-                    if (item.SourceType != SourceType.Library)
+                //    if (item.SourceType != SourceType.Library)
-                    {
+                //    {
-                        return;
+                //        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)
@@ -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)

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)
+            var parents = new List<BaseItem>();
-              ? new string[] { }
-              : new[] { parentId };
 
-            if (parentIds.Length == 0)
+            if (!string.IsNullOrWhiteSpace(parentId))
             {
-                parentIds = user.RootFolder.GetChildren(user, true)
+                var parent = _libraryManager.GetItemById(parentId) as Folder;
-                    .OfType<Folder>()
+                if (parent != null)
-                    .Select(i => i.Id.ToString("N"))
+                {
-                    .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i))
+                    parents.Add(parent);
-                    .ToArray();
+                }
+            }
+
+            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);
         }
     }
 }

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)
             {

Emby.Server.Implementations/Notifications/SqliteNotificationsRepository.cs

@@ -29,7 +29,15 @@ 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"
+                }));
+
                 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)"
@@ -48,9 +56,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationResult();
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                //using (WriteLock.Read())
                 {
                     var clauses = new List<string>();
                     var paramList = new List<object>();
@@ -103,9 +111,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             var result = new NotificationsSummary();
 
-            using (WriteLock.Read())
-            {
             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 +228,9 @@ namespace Emby.Server.Implementations.Notifications
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -283,9 +291,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -305,9 +313,9 @@ namespace Emby.Server.Implementations.Notifications
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {

Emby.Server.Implementations/Security/AuthenticationRepository.cs

@@ -30,6 +30,13 @@ 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"
+                }));
+
                 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)",
@@ -63,9 +70,9 @@ namespace Emby.Server.Implementations.Security
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -200,6 +207,8 @@ namespace Emby.Server.Implementations.Security
 
                 var list = new List<AuthenticationInfo>();
 
+                using (WriteLock.Read())
+                {
                     using (var statement = connection.PrepareStatement(commandText))
                     {
                         BindAuthenticationQueryParams(query, statement);
@@ -226,6 +235,7 @@ namespace Emby.Server.Implementations.Security
                     }
                 }
             }
+        }
 
         public AuthenticationInfo Get(string id)
         {
@@ -234,9 +244,9 @@ namespace Emby.Server.Implementations.Security
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseSelectText + " where Id=@Id";
 

Emby.Server.Implementations/Social/SharingRepository.cs

@@ -27,6 +27,13 @@ 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"
+                }));
+
                 string[] queries = {
 
                                 "create table if not exists Shares (Id GUID, ItemId TEXT, UserId TEXT, ExpirationDate DateTime, PRIMARY KEY (Id))",
@@ -50,9 +57,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("info.Id");
             }
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(db =>
                     {
@@ -75,9 +82,9 @@ namespace Emby.Server.Implementations.Social
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = "select Id, ItemId, UserId, ExpirationDate from Shares where id = ?";
 

Emby.Server.Implementations/Sync/SyncRepository.cs

@@ -43,6 +43,13 @@ 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"
+                }));
+
                 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 +102,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("id");
             }
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -206,9 +213,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     string commandText;
                     var paramList = new List<object>();
@@ -259,9 +266,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     connection.RunInTransaction(conn =>
                     {
@@ -281,9 +288,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobSelectText;
                     var paramList = new List<object>();
@@ -379,11 +386,11 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Read())
-            {
             var guid = new Guid(id);
 
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = BaseJobItemSelectText + " where Id=?";
                     var paramList = new List<object>();
@@ -407,9 +414,9 @@ namespace Emby.Server.Implementations.Sync
                 throw new ArgumentNullException("query");
             }
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
+            {
+                using (WriteLock.Read())
                 {
                     var commandText = baseSelectText;
                     var paramList = new List<object>();
@@ -487,8 +494,6 @@ namespace Emby.Server.Implementations.Sync
 
             var now = DateTime.UtcNow;
 
-            using (WriteLock.Read())
-            {
             using (var connection = CreateConnection(true))
             {
                 var commandText = "select ItemId,Status,Progress from SyncJobItems";
@@ -511,6 +516,8 @@ namespace Emby.Server.Implementations.Sync
                     commandText += " where " + string.Join(" AND ", whereClauses.ToArray());
                 }
 
+                using (WriteLock.Read())
+                {
                     using (var statement = connection.PrepareStatement(commandText))
                     {
                         if (!string.IsNullOrWhiteSpace(query.TargetId))
@@ -664,9 +671,9 @@ namespace Emby.Server.Implementations.Sync
 
             CheckDisposed();
 
-            using (WriteLock.Write())
-            {
             using (var connection = CreateConnection())
+            {
+                using (WriteLock.Write())
                 {
                     string commandText;
 

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);
@@ -121,17 +121,15 @@ namespace Emby.Server.Implementations.TV
 
             var allNextUp = series
                 .Select(i => GetNextUp(i, currentUser))
-                .Where(i => i.Item1 != null)
                 // Include if an episode was found, and either the series is not unwatched or the specific series was requested
-                .OrderByDescending(i => i.Item2)
+                .OrderByDescending(i => i.Item1)
-                .ThenByDescending(i => i.Item1.PremiereDate ?? DateTime.MinValue)
                 .ToList();
 
             // If viewing all next up for all series, remove first episodes
             if (string.IsNullOrWhiteSpace(request.SeriesId))
             {
                 var withoutFirstEpisode = allNextUp
-                    .Where(i => !i.Item3)
+                    .Where(i => i.Item1 != DateTime.MinValue)
                     .ToList();
 
                 // But if that returns empty, keep those first episodes (avoid completely empty view)
@@ -142,7 +140,8 @@ namespace Emby.Server.Implementations.TV
             }
 
             return allNextUp
-                .Select(i => i.Item1)
+                .Select(i => i.Item2())
+                .Where(i => i != null)
                 .Take(request.Limit ?? int.MaxValue);
         }
 
@@ -157,7 +156,7 @@ namespace Emby.Server.Implementations.TV
         /// <param name="series">The series.</param>
         /// <param name="user">The user.</param>
         /// <returns>Task{Episode}.</returns>
-        private Tuple<Episode, DateTime, bool> GetNextUp(Series series, User user)
+        private Tuple<DateTime, Func<Episode>> GetNextUp(Series series, User user)
         {
             var lastWatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -171,7 +170,9 @@ namespace Emby.Server.Implementations.TV
 
             }).FirstOrDefault();
 
-            var firstUnwatchedEpisode = _libraryManager.GetItemList(new InternalItemsQuery(user)
+            Func<Episode> getEpisode = () =>
+            {
+                return _libraryManager.GetItemList(new InternalItemsQuery(user)
                 {
                     AncestorWithPresentationUniqueKey = GetUniqueSeriesKey(series),
                     IncludeItemTypes = new[] { typeof(Episode).Name },
@@ -184,18 +185,19 @@ namespace Emby.Server.Implementations.TV
                     MinSortName = lastWatchedEpisode == null ? null : lastWatchedEpisode.SortName
 
                 }).Cast<Episode>().FirstOrDefault();
+            };
 
-            if (lastWatchedEpisode != null && firstUnwatchedEpisode != null)
+            if (lastWatchedEpisode != null)
             {
                 var userData = _userDataManager.GetUserData(user, lastWatchedEpisode);
 
                 var lastWatchedDate = userData.LastPlayedDate ?? DateTime.MinValue.AddDays(1);
 
-                return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, lastWatchedDate, false);
+                return new Tuple<DateTime, Func<Episode>>(lastWatchedDate, getEpisode);
             }
 
             // Return the first episode
-            return new Tuple<Episode, DateTime, bool>(firstUnwatchedEpisode, DateTime.MinValue, true);
+            return new Tuple<DateTime, Func<Episode>>(DateTime.MinValue, getEpisode);
         }
 
         private QueryResult<BaseItem> GetResult(IEnumerable<BaseItem> items, int? totalRecordLimit, NextUpQuery query)

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,
 

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>
+        public MoviesService(IUserManager userManager, ILibraryManager libraryManager, IDtoService dtoService, IServerConfigurationManager config, IAuthorizationContext authContext)
-        /// <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)
         {
             _userManager = userManager;
-            _userDataRepository = userDataRepository;
             _libraryManager = libraryManager;
-            _itemRepo = itemRepo;
             _dtoService = dtoService;
             _config = config;
             _authContext = authContext;

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
         {

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)
+                {
+                    if (string.Equals(view.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
                     {
                         return true;
                     }
-                if (view != null && string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+                    if (string.Equals(view.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+
+                if (GetParent() is AggregateFolder)
                 {
                     return true;
                 }

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;
+            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;
 
-            if (recursiveItemCount > 0)
-            {
                 var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100;
                 dto.PlayedPercentage = 100 - unplayedPercentage;
                 dto.Played = dto.PlayedPercentage.Value >= 100;

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; }

MediaBrowser.Controller/Entities/TV/Episode.cs

@@ -73,6 +73,12 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsInheritedParentImages
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public int? AiredSeasonNumber
         {

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
         {

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
             });

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)

MediaBrowser.Controller/Library/ILibraryManager.cs

@@ -538,10 +538,7 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Gets the items.
         /// </summary>
-        /// <param name="query">The query.</param>
+        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
-        /// <param name="parentIds">The parent ids.</param>
-        /// <returns>List&lt;BaseItem&gt;.</returns>
-        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, IEnumerable<string> parentIds);
 
         /// <summary>
         /// Gets the items result.

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);
     }
 }

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

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);
                 }
             }