From aac392f4cd7da4fc40a4cf948783249365bc8e0c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 9 Feb 2014 02:27:44 -0500 Subject: add audio db for artists --- MediaBrowser.Controller/Entities/Folder.cs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 019361f159..933cf758c2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -299,26 +299,24 @@ namespace MediaBrowser.Controller.Entities /// The current validation cancellation token source. private CancellationTokenSource CurrentValidationCancellationTokenSource { get; set; } + public Task ValidateChildren(IProgress progress, CancellationToken cancellationToken) + { + return ValidateChildren(progress, cancellationToken, new MetadataRefreshOptions()); + } + /// /// Validates that the children of the folder still exist /// /// The progress. /// The cancellation token. + /// The metadata refresh options. /// if set to true [recursive]. - /// if set to true [force refresh metadata]. /// Task. - public Task ValidateChildren(IProgress progress, CancellationToken cancellationToken, bool? recursive = null, bool forceRefreshMetadata = false) + public Task ValidateChildren(IProgress progress, CancellationToken cancellationToken, MetadataRefreshOptions metadataRefreshOptions, bool recursive = true) { - var directoryService = new DirectoryService(Logger); - - return ValidateChildrenWithCancellationSupport(progress, cancellationToken, recursive ?? true, true, + metadataRefreshOptions.DirectoryService = metadataRefreshOptions.DirectoryService ?? new DirectoryService(Logger); - new MetadataRefreshOptions - { - ReplaceAllMetadata = forceRefreshMetadata, - DirectoryService = directoryService - - }, directoryService); + return ValidateChildrenWithCancellationSupport(progress, cancellationToken, recursive, true, metadataRefreshOptions, metadataRefreshOptions.DirectoryService); } private async Task ValidateChildrenWithCancellationSupport(IProgress progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, DirectoryService directoryService) @@ -531,7 +529,7 @@ namespace MediaBrowser.Controller.Entities cancellationToken.ThrowIfCancellationRequested(); var innerProgress = new ActionableProgress(); - + // Avoid implicitly captured closure var currentChild = child; innerProgress.RegisterAction(p => -- cgit v1.2.3