From dff32c24047e5eaffdb0918b44df9d96c54ccd8b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Feb 2016 17:42:33 -0500 Subject: update migration --- .../Persistence/CleanDatabaseScheduledTask.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs') diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs index f7c6fe502..5c600c249 100644 --- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs @@ -10,6 +10,7 @@ using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Threading; using System.Threading.Tasks; using CommonIO; @@ -32,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.Persistence private readonly ILocalizationManager _localization; private readonly ITaskManager _taskManager; - public const int MigrationVersion = 17; + public const int MigrationVersion = 20; public static bool EnableUnavailableMessage = false; public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IHttpServer httpServer, ILocalizationManager localization, ITaskManager taskManager) @@ -66,6 +67,10 @@ namespace MediaBrowser.Server.Implementations.Persistence { OnProgress(0); + // Ensure these objects are out of the database. + var rootChildren = _libraryManager.RootFolder.Children.ToList(); + rootChildren = _libraryManager.GetUserRootFolder().Children.ToList(); + var innerProgress = new ActionableProgress(); innerProgress.RegisterAction(p => { @@ -148,8 +153,6 @@ namespace MediaBrowser.Server.Implementations.Persistence if (itemId != Guid.Empty) { - LogMessage(string.Format("Querying item {0}", itemId)); - // Somehow some invalid data got into the db. It probably predates the boundary checking var item = _libraryManager.GetItemById(itemId); @@ -157,8 +160,6 @@ namespace MediaBrowser.Server.Implementations.Persistence { try { - LogMessage(string.Format("Saving item {0}", itemId)); - await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false); } catch (OperationCanceledException) -- cgit v1.2.3