mirror of https://github.com/jellyfin/jellyfin.git
fix: correctly pass parameters in overrides
Signed-off-by: gnattu <gnattuoc@me.com>
This commit is contained in:
parent
e4d66f35fd
commit
1b567efeb5
|
@ -274,7 +274,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
public Task ValidateChildren(IProgress<double> progress, MetadataRefreshOptions metadataRefreshOptions, bool recursive = true, bool allowRemoveRoot = false, CancellationToken cancellationToken = default)
|
public Task ValidateChildren(IProgress<double> progress, MetadataRefreshOptions metadataRefreshOptions, bool recursive = true, bool allowRemoveRoot = false, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
return ValidateChildrenInternal(progress, recursive, true, false, metadataRefreshOptions, metadataRefreshOptions.DirectoryService, cancellationToken);
|
return ValidateChildrenInternal(progress, recursive, true, allowRemoveRoot, metadataRefreshOptions, metadataRefreshOptions.DirectoryService, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Dictionary<Guid, BaseItem> GetActualChildrenDictionary()
|
private Dictionary<Guid, BaseItem> GetActualChildrenDictionary()
|
||||||
|
@ -416,9 +416,9 @@ namespace MediaBrowser.Controller.Entities
|
||||||
validChildren.Add(child);
|
validChildren.Add(child);
|
||||||
}
|
}
|
||||||
|
|
||||||
var shouldNotRemove = IsRoot && !allowRemoveRoot;
|
var shouldRemove = !IsRoot || allowRemoveRoot;
|
||||||
// If it's an AggregateFolder, don't remove
|
// If it's an AggregateFolder, don't remove
|
||||||
if (shouldNotRemove && currentChildren.Count != validChildren.Count)
|
if (shouldRemove && currentChildren.Count != validChildren.Count)
|
||||||
{
|
{
|
||||||
// That's all the new and changed ones - now see if there are any that are missing
|
// That's all the new and changed ones - now see if there are any that are missing
|
||||||
var itemsRemoved = currentChildren.Values.Except(validChildren).ToList();
|
var itemsRemoved = currentChildren.Values.Except(validChildren).ToList();
|
||||||
|
|
|
@ -121,7 +121,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
ClearCache();
|
ClearCache();
|
||||||
|
|
||||||
await base.ValidateChildrenInternal(progress, recursive, refreshChildMetadata, false, refreshOptions, directoryService, cancellationToken)
|
await base.ValidateChildrenInternal(progress, recursive, refreshChildMetadata, allowRemoveRoot, refreshOptions, directoryService, cancellationToken)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
ClearCache();
|
ClearCache();
|
||||||
|
|
Loading…
Reference in New Issue