From 4ebba2b2e87e33f083c095957a2294b6f8ae3828 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 15 Feb 2014 17:42:06 -0500 Subject: change usage reporting to a timer --- MediaBrowser.Controller/Entities/Audio/MusicArtist.cs | 7 ++++--- MediaBrowser.Controller/Entities/IHasImages.cs | 6 ++++++ MediaBrowser.Controller/Providers/IProviderManager.cs | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs index e68790e61f..2583450a3b 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs @@ -142,7 +142,7 @@ namespace MediaBrowser.Controller.Entities.Audio // Refresh songs foreach (var item in songs) { - if (tasks.Count >= 2) + if (tasks.Count >= 3) { await Task.WhenAll(tasks).ConfigureAwait(false); tasks.Clear(); @@ -166,7 +166,8 @@ namespace MediaBrowser.Controller.Entities.Audio } }); - tasks.Add(RefreshItem(item, refreshOptions, innerProgress, cancellationToken)); + var taskChild = item; + tasks.Add(Task.Run(async () => await RefreshItem(taskChild, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken)); } await Task.WhenAll(tasks).ConfigureAwait(false); @@ -178,7 +179,7 @@ namespace MediaBrowser.Controller.Entities.Audio // Refresh all non-songs foreach (var item in others) { - if (tasks.Count > 4) + if (tasks.Count > 3) { await Task.WhenAll(tasks).ConfigureAwait(false); tasks.Clear(); diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs index d53eba11a1..e07db88c4e 100644 --- a/MediaBrowser.Controller/Entities/IHasImages.cs +++ b/MediaBrowser.Controller/Entities/IHasImages.cs @@ -142,6 +142,12 @@ namespace MediaBrowser.Controller.Entities /// /// true if [supports local metadata]; otherwise, false. bool SupportsLocalMetadata { get; } + + /// + /// Gets a value indicating whether this instance is in mixed folder. + /// + /// true if this instance is in mixed folder; otherwise, false. + bool IsInMixedFolder { get; } } public static class HasImagesExtensions diff --git a/MediaBrowser.Controller/Providers/IProviderManager.cs b/MediaBrowser.Controller/Providers/IProviderManager.cs index 691a5add63..4aeb86a6a0 100644 --- a/MediaBrowser.Controller/Providers/IProviderManager.cs +++ b/MediaBrowser.Controller/Providers/IProviderManager.cs @@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.Providers /// Index of the image. /// The cancellation token. /// Task. - Task SaveImage(BaseItem item, string url, SemaphoreSlim resourcePool, ImageType type, int? imageIndex, CancellationToken cancellationToken); + Task SaveImage(IHasImages item, string url, SemaphoreSlim resourcePool, ImageType type, int? imageIndex, CancellationToken cancellationToken); /// /// Saves the image. @@ -46,7 +46,7 @@ namespace MediaBrowser.Controller.Providers /// Index of the image. /// The cancellation token. /// Task. - Task SaveImage(BaseItem item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken); + Task SaveImage(IHasImages item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken); /// /// Adds the metadata providers. -- cgit v1.2.3