Merge pull request #2739 from MediaBrowser/beta

Beta

2 files changed, 6 insertions, 33 deletions

diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index e25955782..df8d1ac45 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -56,24 +56,9 @@ namespace Emby.Server.Implementations.Data
             var rootChildren = _libraryManager.RootFolder.Children.ToList();
             rootChildren = _libraryManager.GetUserRootFolder().Children.ToList();
 
-            var innerProgress = new ActionableProgress<double>();
-            innerProgress.RegisterAction(p =>
-            {
-                double newPercentCommplete = .45 * p;
-                progress.Report(newPercentCommplete);
-            });
-            await CleanDeadItems(cancellationToken, innerProgress).ConfigureAwait(false);
-            progress.Report(45);
-
-            innerProgress = new ActionableProgress<double>();
-            innerProgress.RegisterAction(p =>
-            {
-                double newPercentCommplete = 45 + .55 * p;
-                progress.Report(newPercentCommplete);
-            });
+            await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
 
-            await _itemRepo.UpdateInheritedValues(cancellationToken).ConfigureAwait(false);
-            progress.Report(100);
+            //await _itemRepo.UpdateInheritedValues(cancellationToken).ConfigureAwait(false);
         }
 
         private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index df3cecbf9..52abbae3e 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -3758,10 +3758,10 @@ namespace Emby.Server.Implementations.Data
 
             if (query.MinDateLastSavedForUser.HasValue)
             {
-                whereClauses.Add("DateLastSaved>=@MinDateLastSaved");
+                whereClauses.Add("DateLastSaved>=@MinDateLastSavedForUser");
                 if (statement != null)
                 {
-                    statement.TryBind("@MinDateLastSaved", query.MinDateLastSavedForUser.Value);
+                    statement.TryBind("@MinDateLastSavedForUser", query.MinDateLastSavedForUser.Value);
                 }
             }
 
@@ -3929,15 +3929,6 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            if (!string.IsNullOrWhiteSpace(query.SlugName))
-            {
-                whereClauses.Add("CleanName=@SlugName");
-                if (statement != null)
-                {
-                    statement.TryBind("@SlugName", GetCleanValue(query.SlugName));
-                }
-            }
-
             if (!string.IsNullOrWhiteSpace(query.MinSortName))
             {
                 whereClauses.Add("SortName>=@MinSortName");
@@ -4306,12 +4297,9 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            if (query.HasDeadParentId.HasValue)
+            if (query.HasDeadParentId.HasValue && query.HasDeadParentId.Value)
             {
-                if (query.HasDeadParentId.Value)
-                {
-                    whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)");
-                }
+                whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)");
             }
 
             if (query.Years.Length == 1)