aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/CollectionFolder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-27 01:50:40 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-27 01:50:40 -0500
commitb3127f19b546f3edce959dd70cafffb3d422a673 (patch)
tree6cb84de8f1cb0ede4e787f112e9305ae64e853b1 /MediaBrowser.Controller/Entities/CollectionFolder.cs
parentf5919990c9ef80bff28ec8a590acb2f72a806678 (diff)
updated tvdb search
Diffstat (limited to 'MediaBrowser.Controller/Entities/CollectionFolder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/CollectionFolder.cs12
1 files changed, 4 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index f47a439a7..5452c63a4 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -121,12 +121,6 @@ namespace MediaBrowser.Controller.Entities
return args;
}
- // Cache this since it will be used a lot
- /// <summary>
- /// The null task result
- /// </summary>
- private static readonly Task NullTaskResult = Task.FromResult<object>(null);
-
/// <summary>
/// Compare our current children (presumably just read from the repo) with the current state of the file system and adjust for any changes
/// ***Currently does not contain logic to maintain items that are unavailable in the file system***
@@ -138,7 +132,7 @@ namespace MediaBrowser.Controller.Entities
/// <param name="refreshOptions">The refresh options.</param>
/// <param name="directoryService">The directory service.</param>
/// <returns>Task.</returns>
- protected override async Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
+ protected override Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
{
var list = PhysicalLocationsList.ToList();
@@ -146,8 +140,10 @@ namespace MediaBrowser.Controller.Entities
if (!list.SequenceEqual(PhysicalLocationsList))
{
- await UpdateToRepository(ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);
+ return UpdateToRepository(ItemUpdateType.MetadataImport, cancellationToken);
}
+
+ return Task.FromResult(true);
}
/// <summary>