From 08e58886f767056c67adb7c1859f864f9a9bffea Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 2 Jul 2016 22:47:39 -0400 Subject: update metadata editor --- MediaBrowser.Server.Implementations/IO/FileRefresher.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs index 4bea6ad34..f48beacb5 100644 --- a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs +++ b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs @@ -33,13 +33,13 @@ namespace MediaBrowser.Server.Implementations.IO { logger.Debug("New file refresher created for {0}", path); Path = path; - _affectedPaths.Add(path); _fileSystem = fileSystem; ConfigurationManager = configurationManager; LibraryManager = libraryManager; TaskManager = taskManager; Logger = logger; + AddPath(path); } private void AddAffectedPath(string path) -- cgit v1.2.3 From 373448675b4209267b9fcf5e3999376c02a69e25 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 3 Jul 2016 19:05:13 -0400 Subject: update components --- MediaBrowser.Model/Configuration/ServerConfiguration.cs | 4 ++-- .../Persistence/SqliteItemRepository.cs | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index f779fcd61..6031ae88e 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -192,7 +192,7 @@ namespace MediaBrowser.Model.Configuration public int MigrationVersion { get; set; } public int SchemaVersion { get; set; } - public int SqliteCachePages { get; set; } + public int SqliteCacheSizeKb { get; set; } public bool DownloadImagesInAdvance { get; set; } @@ -212,7 +212,7 @@ namespace MediaBrowser.Model.Configuration { LocalNetworkAddresses = new string[] { }; Migrations = new string[] { }; - SqliteCachePages = 10000; + SqliteCacheSizeKb = 50000; EnableCustomPathSubFolders = true; EnableLocalizedGuids = true; diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 2a22fc537..7d7299107 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -123,7 +123,13 @@ namespace MediaBrowser.Server.Implementations.Persistence protected override async Task CreateConnection(bool isReadOnly = false) { - var connection = await DbConnector.Connect(DbFilePath, false, false, _config.Configuration.SqliteCachePages).ConfigureAwait(false); + var cacheSize = _config.Configuration.SqliteCacheSizeKb; + if (cacheSize <= 0) + { + cacheSize = Math.Min(Environment.ProcessorCount * 50000, 200000); + } + + var connection = await DbConnector.Connect(DbFilePath, false, false, 0 - cacheSize).ConfigureAwait(false); connection.RunQueries(new[] { -- cgit v1.2.3 From 986cdc429ff91d9f04f3fbc1d1c549012c264232 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 3 Jul 2016 19:54:19 -0400 Subject: update db upgrade --- .../Persistence/SqliteItemRepository.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 7d7299107..d1b23a0ae 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -2975,8 +2975,15 @@ namespace MediaBrowser.Server.Implementations.Persistence } if (query.IsVirtualItem.HasValue) { - whereClauses.Add("IsVirtualItem=@IsVirtualItem"); - cmd.Parameters.Add(cmd, "@IsVirtualItem", DbType.Boolean).Value = query.IsVirtualItem.Value; + 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'"); + } } if (query.MediaTypes.Length == 1) { -- cgit v1.2.3 From fcc64173f6528e5252079f870afbc5d80bd90bb5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 3 Jul 2016 20:14:28 -0400 Subject: update default cache size --- MediaBrowser.Model/Configuration/ServerConfiguration.cs | 4 ++-- .../Persistence/SqliteItemRepository.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 6031ae88e..081c46f0a 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -192,7 +192,7 @@ namespace MediaBrowser.Model.Configuration public int MigrationVersion { get; set; } public int SchemaVersion { get; set; } - public int SqliteCacheSizeKb { get; set; } + public int SqliteCacheSize { get; set; } public bool DownloadImagesInAdvance { get; set; } @@ -212,7 +212,7 @@ namespace MediaBrowser.Model.Configuration { LocalNetworkAddresses = new string[] { }; Migrations = new string[] { }; - SqliteCacheSizeKb = 50000; + SqliteCacheSize = 0; EnableCustomPathSubFolders = true; EnableLocalizedGuids = true; diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index d1b23a0ae..5b492c240 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -123,7 +123,7 @@ namespace MediaBrowser.Server.Implementations.Persistence protected override async Task CreateConnection(bool isReadOnly = false) { - var cacheSize = _config.Configuration.SqliteCacheSizeKb; + var cacheSize = _config.Configuration.SqliteCacheSize; if (cacheSize <= 0) { cacheSize = Math.Min(Environment.ProcessorCount * 50000, 200000); -- cgit v1.2.3